- Revision
- 208027
- Author
- cdu...@apple.com
- Date
- 2016-10-27 20:55:54 -0700 (Thu, 27 Oct 2016)
Log Message
Regression(r203601): Caused crashes in iBooks
https://bugs.webkit.org/show_bug.cgi?id=164093
<rdar://problem/28745634>
Reviewed by Darin Adler.
Source/WebKit/mac:
Restore pre-r203601 behavior when calling [DOMNode compareDocumentPosition:nil],
which was to return Node::DOCUMENT_POSITION_DISCONNECTED.
* DOM/DOMNode.mm:
(-[DOMNode compareDocumentPosition:]):
Tools:
Add API test coverage.
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/Tests/mac/DOMNode.mm: Added.
(-[DOMNodeTest webView:didFinishLoadForFrame:]):
(TestWebKitAPI::TEST):
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (208026 => 208027)
--- trunk/Source/WebKit/mac/ChangeLog 2016-10-28 03:21:58 UTC (rev 208026)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-10-28 03:55:54 UTC (rev 208027)
@@ -1,3 +1,17 @@
+2016-10-27 Chris Dumez <cdu...@apple.com>
+
+ Regression(r203601): Caused crashes in iBooks
+ https://bugs.webkit.org/show_bug.cgi?id=164093
+ <rdar://problem/28745634>
+
+ Reviewed by Darin Adler.
+
+ Restore pre-r203601 behavior when calling [DOMNode compareDocumentPosition:nil],
+ which was to return Node::DOCUMENT_POSITION_DISCONNECTED.
+
+ * DOM/DOMNode.mm:
+ (-[DOMNode compareDocumentPosition:]):
+
2016-10-27 Wenson Hsieh <wenson_hs...@apple.com>
Support "insertFromDrop" and "deleteByDrag" for the InputEvent spec
Modified: trunk/Source/WebKit/mac/DOM/DOMNode.mm (208026 => 208027)
--- trunk/Source/WebKit/mac/DOM/DOMNode.mm 2016-10-28 03:21:58 UTC (rev 208026)
+++ trunk/Source/WebKit/mac/DOM/DOMNode.mm 2016-10-28 03:55:54 UTC (rev 208027)
@@ -336,7 +336,7 @@
{
JSMainThreadNullState state;
if (!other)
- raiseTypeErrorException();
+ return Node::DOCUMENT_POSITION_DISCONNECTED;
return unwrap(*self).compareDocumentPosition(*core(other));
}
Modified: trunk/Tools/ChangeLog (208026 => 208027)
--- trunk/Tools/ChangeLog 2016-10-28 03:21:58 UTC (rev 208026)
+++ trunk/Tools/ChangeLog 2016-10-28 03:55:54 UTC (rev 208027)
@@ -1,3 +1,18 @@
+2016-10-27 Chris Dumez <cdu...@apple.com>
+
+ Regression(r203601): Caused crashes in iBooks
+ https://bugs.webkit.org/show_bug.cgi?id=164093
+ <rdar://problem/28745634>
+
+ Reviewed by Darin Adler.
+
+ Add API test coverage.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/mac/DOMNode.mm: Added.
+ (-[DOMNodeTest webView:didFinishLoadForFrame:]):
+ (TestWebKitAPI::TEST):
+
2016-10-27 Sam Weinig <s...@webkit.org>
[WebIDL] Move code generators off of domSignature::type and onto domSignature::idlType
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (208026 => 208027)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-10-28 03:21:58 UTC (rev 208026)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-10-28 03:55:54 UTC (rev 208027)
@@ -102,6 +102,7 @@
37E1064C1697681800B78BD0 /* DOMHTMLTableCellElementCellAbove.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 37E1064B169767F700B78BD0 /* DOMHTMLTableCellElementCellAbove.html */; };
37FB72971DB2E82F00E41BE4 /* ContextMenuDefaultItemsHaveTags.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37FB72951DB2E82F00E41BE4 /* ContextMenuDefaultItemsHaveTags.mm */; };
3FBD1B4A1D3D66AB00E6D6FA /* FullscreenLayoutConstraints.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 3FBD1B491D39D1DB00E6D6FA /* FullscreenLayoutConstraints.html */; };
+ 46397B951DC2C850009A78AE /* DOMNode.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46397B941DC2C850009A78AE /* DOMNode.mm */; };
46C519DA1D355AB200DAA51A /* LocalStorageNullEntries.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46C519D81D355A7300DAA51A /* LocalStorageNullEntries.mm */; };
46C519E61D3563FD00DAA51A /* LocalStorageNullEntries.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 46C519E21D35629600DAA51A /* LocalStorageNullEntries.html */; };
46C519E71D3563FD00DAA51A /* LocalStorageNullEntries.localstorage in Copy Resources */ = {isa = PBXBuildFile; fileRef = 46C519E31D35629600DAA51A /* LocalStorageNullEntries.localstorage */; };
@@ -867,6 +868,7 @@
440A1D3814A0103A008A66F2 /* URL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = URL.cpp; sourceTree = "<group>"; };
442BBF681C91CAD90017087F /* RefLogger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RefLogger.cpp; sourceTree = "<group>"; };
44A622C114A0E2B60048515B /* WTFStringUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WTFStringUtilities.h; sourceTree = "<group>"; };
+ 46397B941DC2C850009A78AE /* DOMNode.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMNode.mm; sourceTree = "<group>"; };
46C519D81D355A7300DAA51A /* LocalStorageNullEntries.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LocalStorageNullEntries.mm; sourceTree = "<group>"; };
46C519E21D35629600DAA51A /* LocalStorageNullEntries.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = LocalStorageNullEntries.html; sourceTree = "<group>"; };
46C519E31D35629600DAA51A /* LocalStorageNullEntries.localstorage */ = {isa = PBXFileReference; lastKnownFileType = file; path = LocalStorageNullEntries.localstorage; sourceTree = "<group>"; };
@@ -1937,6 +1939,7 @@
939BA91614103412001A01BD /* DeviceScaleFactorOnBack.mm */,
37E1064A1697676400B78BD0 /* DOMHTMLTableCellCellAbove.mm */,
2D51A0C51C8BF00400765C45 /* DOMHTMLVideoElementWrapper.mm */,
+ 46397B941DC2C850009A78AE /* DOMNode.mm */,
3751AF7A169518F800764319 /* DOMNodeFromJSObject.mm */,
37DC678B140D7C5000ABCCDB /* DOMRangeOfString.mm */,
C07E6CAE13FD67650038B22B /* DynamicDeviceScaleFactor.mm */,
@@ -2561,6 +2564,7 @@
7CCE7F2E1A411B1000447C4C /* WKBrowsingContextGroupTest.mm in Sources */,
7CCE7F2F1A411B1000447C4C /* WKBrowsingContextLoadDelegateTest.mm in Sources */,
7C54A4BE1AA11CCA00380F78 /* WKBundleFileHandle.cpp in Sources */,
+ 46397B951DC2C850009A78AE /* DOMNode.mm in Sources */,
7CCE7F1D1A411AE600447C4C /* WKImageCreateCGImageCrash.cpp in Sources */,
7C89D2AC1A69B80D003A5FDE /* WKPageConfiguration.cpp in Sources */,
52D673EE1AFB127300FA19FE /* WKPageCopySessionStateWithFiltering.cpp in Sources */,
Added: trunk/Tools/TestWebKitAPI/Tests/mac/DOMNode.mm (0 => 208027)
--- trunk/Tools/TestWebKitAPI/Tests/mac/DOMNode.mm (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/DOMNode.mm 2016-10-28 03:55:54 UTC (rev 208027)
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "PlatformUtilities.h"
+#import "PlatformWebView.h"
+#import <WebKit/DOM.h>
+#import <WebKit/WebViewPrivate.h>
+#import <wtf/RetainPtr.h>
+
+@interface DOMNodeTest : NSObject <WebFrameLoadDelegate> {
+}
+@end
+
+static bool didFinishLoad;
+
+@implementation DOMNodeTest
+
+- (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
+{
+ didFinishLoad = true;
+}
+@end
+
+namespace TestWebKitAPI {
+
+TEST(WebKit1, DOMNodeCompareDocumentPosition)
+{
+ RetainPtr<WebView> webView = adoptNS([[WebView alloc] initWithFrame:NSMakeRect(0, 0, 120, 200) frameName:nil groupName:nil]);
+ RetainPtr<DOMNodeTest> testController = adoptNS([DOMNodeTest new]);
+
+ webView.get().frameLoadDelegate = testController.get();
+ [[webView.get() mainFrame] loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"about:blank"]]];
+
+ Util::run(&didFinishLoad);
+ didFinishLoad = false;
+
+ DOMDocument *document = webView.get().mainFrameDocument;
+ EXPECT_EQ(1, [document compareDocumentPosition:nil]);
+
+}
+
+} // namespace TestWebKitAPI
