Title: [213660] trunk/Source/WebKit/mac
- Revision
- 213660
- Author
- [email protected]
- Date
- 2017-03-09 13:19:34 -0800 (Thu, 09 Mar 2017)
Log Message
Fix DataInteraction guards
https://bugs.webkit.org/show_bug.cgi?id=169404
Reviewed by Wenson Hsieh.
* WebCoreSupport/WebDragClient.mm:
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (213659 => 213660)
--- trunk/Source/WebKit/mac/ChangeLog 2017-03-09 21:18:25 UTC (rev 213659)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-03-09 21:19:34 UTC (rev 213660)
@@ -1,3 +1,12 @@
+2017-03-08 Megan Gardner <[email protected]>
+
+ Fix DataInteraction guards
+ https://bugs.webkit.org/show_bug.cgi?id=169404
+
+ Reviewed by Wenson Hsieh.
+
+ * WebCoreSupport/WebDragClient.mm:
+
2017-03-08 Wenson Hsieh <[email protected]>
Add plumbing for WebCore to notify WebKit2 when an edit drag has concluded
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm (213659 => 213660)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm 2017-03-09 21:18:25 UTC (rev 213659)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm 2017-03-09 21:19:34 UTC (rev 213660)
@@ -179,7 +179,7 @@
}
#endif
-#else
+#elif !ENABLE(DATA_INTERACTION)
bool WebDragClient::useLegacyDragClient()
{
@@ -202,11 +202,11 @@
void WebDragClient::willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::DataTransfer&)
{
}
-#if !ENABLE(DATA_INTERACTION)
+
void WebDragClient::startDrag(WebCore::DragImage, const IntPoint&, const IntPoint&, const FloatPoint&, DataTransfer&, Frame&, WebCore::DragSourceAction)
{
}
-#endif
+
void WebDragClient::beginDrag(DragItem, Frame&, const IntPoint&, const IntPoint&, DataTransfer&, DragSourceAction)
{
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
