Title: [216470] trunk/Source/WebCore
- Revision
- 216470
- Author
- wenson_hs...@apple.com
- Date
- 2017-05-08 18:45:20 -0700 (Mon, 08 May 2017)
Log Message
Guard DragController::cleanupAfterSystemDrag to only clear drag state on Mac
https://bugs.webkit.org/show_bug.cgi?id=171771
<rdar://problem/32019149>
Reviewed by Tim Horton.
The call to dragEnded here seems to have been added because a client could override Mac WK1
WebUIDelegate methods to cause this cleanup to never be performed. Since this limitation only
applies to Mac, guard it as such.
* page/mac/DragControllerMac.mm:
(WebCore::DragController::cleanupAfterSystemDrag):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (216469 => 216470)
--- trunk/Source/WebCore/ChangeLog 2017-05-09 01:41:58 UTC (rev 216469)
+++ trunk/Source/WebCore/ChangeLog 2017-05-09 01:45:20 UTC (rev 216470)
@@ -1,3 +1,18 @@
+2017-05-08 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Guard DragController::cleanupAfterSystemDrag to only clear drag state on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=171771
+ <rdar://problem/32019149>
+
+ Reviewed by Tim Horton.
+
+ The call to dragEnded here seems to have been added because a client could override Mac WK1
+ WebUIDelegate methods to cause this cleanup to never be performed. Since this limitation only
+ applies to Mac, guard it as such.
+
+ * page/mac/DragControllerMac.mm:
+ (WebCore::DragController::cleanupAfterSystemDrag):
+
2017-05-08 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r216262.
Modified: trunk/Source/WebCore/page/mac/DragControllerMac.mm (216469 => 216470)
--- trunk/Source/WebCore/page/mac/DragControllerMac.mm 2017-05-09 01:41:58 UTC (rev 216469)
+++ trunk/Source/WebCore/page/mac/DragControllerMac.mm 2017-05-09 01:45:20 UTC (rev 216470)
@@ -90,6 +90,7 @@
void DragController::cleanupAfterSystemDrag()
{
+#if PLATFORM(MAC)
// Drag has ended, dragEnded *should* have been called, however it is possible
// for the UIDelegate to take over the drag, and fail to send the appropriate
// drag termination event. As dragEnded just resets drag variables, we just
@@ -98,6 +99,7 @@
// is asynchronous.
if (m_page.mainFrame().view()->platformWidget())
dragEnded();
+#endif
}
#if ENABLE(DATA_INTERACTION)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
