Title: [211494] branches/safari-604.1.5-branch/Source/WebKit/mac
- Revision
- 211494
- Author
- matthew_han...@apple.com
- Date
- 2017-02-01 10:20:41 -0800 (Wed, 01 Feb 2017)
Log Message
Merge r211492. rdar://problem/30305390
Modified Paths
Diff
Modified: branches/safari-604.1.5-branch/Source/WebKit/mac/ChangeLog (211493 => 211494)
--- branches/safari-604.1.5-branch/Source/WebKit/mac/ChangeLog 2017-02-01 18:17:13 UTC (rev 211493)
+++ branches/safari-604.1.5-branch/Source/WebKit/mac/ChangeLog 2017-02-01 18:20:41 UTC (rev 211494)
@@ -1,3 +1,22 @@
+2017-02-01 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r211492. rdar://problem/30305390
+
+ 2017-02-01 Wenson Hsieh <wenson_hs...@apple.com>
+
+ [WK1] Allow the drag client to be initialized on platforms that do not support drag and drop
+ https://bugs.webkit.org/show_bug.cgi?id=167695
+ <rdar://problem/30305390>
+
+ Reviewed by Sam Weinig.
+
+ Due to the common codepath for destroying the drag client, we need to ensure that the drag client actually
+ exists, even on platforms that do not support drag and drop, in order to avoid crashing when the DragController
+ is destroyed.
+
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+
2017-01-30 Matthew Hanson <matthew_han...@apple.com>
Merge r211323. rdar://problem/30107776
Modified: branches/safari-604.1.5-branch/Source/WebKit/mac/WebView/WebView.mm (211493 => 211494)
--- branches/safari-604.1.5-branch/Source/WebKit/mac/WebView/WebView.mm 2017-02-01 18:17:13 UTC (rev 211493)
+++ branches/safari-604.1.5-branch/Source/WebKit/mac/WebView/WebView.mm 2017-02-01 18:20:41 UTC (rev 211494)
@@ -1354,9 +1354,6 @@
pageConfiguration.contextMenuClient = new WebContextMenuClient(self);
// FIXME: We should enable this on iOS as well.
pageConfiguration.validationMessageClient = std::make_unique<WebValidationMessageClient>(self);
-#if ENABLE(DRAG_SUPPORT)
- pageConfiguration.dragClient = new WebDragClient(self);
-#endif
pageConfiguration.inspectorClient = new WebInspectorClient(self);
#else
pageConfiguration.chromeClient = new WebChromeClientIOS(self);
@@ -1363,6 +1360,10 @@
pageConfiguration.inspectorClient = new WebInspectorClient(self);
#endif
+#if ENABLE(DRAG_SUPPORT)
+ pageConfiguration.dragClient = new WebDragClient(self);
+#endif
+
pageConfiguration.backForwardClient = BackForwardList::create(self);
#if ENABLE(APPLE_PAY)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
