Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (122485 => 122486)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-07-12 18:20:35 UTC (rev 122485)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-07-12 18:22:39 UTC (rev 122486)
@@ -1,5 +1,24 @@
2012-07-12 Tony Chang <[email protected]>
+ [chromium] Remove drag and drop API methods that are no longer used
+ https://bugs.webkit.org/show_bug.cgi?id=90996
+
+ Reviewed by Adam Barth.
+
+ In r117327, we added a parameter for modifier keys to these methods.
+ Chromium has since switched to using the methods that require the
+ extra parameter so we can remove these methods.
+
+ * public/WebView.h:
+ (WebView):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::dragTargetDragEnter):
+ (WebKit::WebViewImpl::dragTargetDragOver):
+ * src/WebViewImpl.h:
+ (WebViewImpl):
+
+2012-07-12 Tony Chang <[email protected]>
+
Unreviewed. Rolled DEPS.
* DEPS:
Modified: trunk/Source/WebKit/chromium/public/WebView.h (122485 => 122486)
--- trunk/Source/WebKit/chromium/public/WebView.h 2012-07-12 18:20:35 UTC (rev 122485)
+++ trunk/Source/WebKit/chromium/public/WebView.h 2012-07-12 18:22:39 UTC (rev 122486)
@@ -317,29 +317,17 @@
// Callback methods when a drag-and-drop operation is trying to drop
// something on the WebView.
- // FIXME: Remove this method after chromium changes catch up.
virtual WebDragOperation dragTargetDragEnter(
const WebDragData&,
const WebPoint& clientPoint, const WebPoint& screenPoint,
- WebDragOperationsMask operationsAllowed) = 0;
- virtual WebDragOperation dragTargetDragEnter(
- const WebDragData&,
- const WebPoint& clientPoint, const WebPoint& screenPoint,
WebDragOperationsMask operationsAllowed,
int keyModifiers) = 0;
- // FIXME: Remove this method after chromium changes catch up.
virtual WebDragOperation dragTargetDragOver(
const WebPoint& clientPoint, const WebPoint& screenPoint,
- WebDragOperationsMask operationsAllowed) = 0;
- virtual WebDragOperation dragTargetDragOver(
- const WebPoint& clientPoint, const WebPoint& screenPoint,
WebDragOperationsMask operationsAllowed,
int keyModifiers) = 0;
virtual void dragTargetDragLeave() = 0;
- // FIXME: Remove this method after chromium changes catch up.
virtual void dragTargetDrop(
- const WebPoint& clientPoint, const WebPoint& screenPoint) = 0;
- virtual void dragTargetDrop(
const WebPoint& clientPoint, const WebPoint& screenPoint,
int keyModifiers) = 0;
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (122485 => 122486)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-07-12 18:20:35 UTC (rev 122485)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-07-12 18:22:39 UTC (rev 122486)
@@ -2796,15 +2796,6 @@
const WebDragData& webDragData,
const WebPoint& clientPoint,
const WebPoint& screenPoint,
- WebDragOperationsMask operationsAllowed)
-{
- return dragTargetDragEnter(webDragData, clientPoint, screenPoint, operationsAllowed, 0);
-}
-
-WebDragOperation WebViewImpl::dragTargetDragEnter(
- const WebDragData& webDragData,
- const WebPoint& clientPoint,
- const WebPoint& screenPoint,
WebDragOperationsMask operationsAllowed,
int keyModifiers)
{
@@ -2819,14 +2810,6 @@
WebDragOperation WebViewImpl::dragTargetDragOver(
const WebPoint& clientPoint,
const WebPoint& screenPoint,
- WebDragOperationsMask operationsAllowed)
-{
- return dragTargetDragOver(clientPoint, screenPoint, operationsAllowed, 0);
-}
-
-WebDragOperation WebViewImpl::dragTargetDragOver(
- const WebPoint& clientPoint,
- const WebPoint& screenPoint,
WebDragOperationsMask operationsAllowed,
int keyModifiers)
{
@@ -2854,12 +2837,6 @@
}
void WebViewImpl::dragTargetDrop(const WebPoint& clientPoint,
- const WebPoint& screenPoint)
-{
- dragTargetDrop(clientPoint, screenPoint, 0);
-}
-
-void WebViewImpl::dragTargetDrop(const WebPoint& clientPoint,
const WebPoint& screenPoint,
int keyModifiers)
{
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.h (122485 => 122486)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-07-12 18:20:35 UTC (rev 122485)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-07-12 18:22:39 UTC (rev 122486)
@@ -239,28 +239,16 @@
const WebDragData&,
const WebPoint& clientPoint,
const WebPoint& screenPoint,
- WebDragOperationsMask operationsAllowed);
- virtual WebDragOperation dragTargetDragEnter(
- const WebDragData&,
- const WebPoint& clientPoint,
- const WebPoint& screenPoint,
WebDragOperationsMask operationsAllowed,
int keyModifiers);
virtual WebDragOperation dragTargetDragOver(
const WebPoint& clientPoint,
const WebPoint& screenPoint,
- WebDragOperationsMask operationsAllowed);
- virtual WebDragOperation dragTargetDragOver(
- const WebPoint& clientPoint,
- const WebPoint& screenPoint,
WebDragOperationsMask operationsAllowed,
int keyModifiers);
virtual void dragTargetDragLeave();
virtual void dragTargetDrop(
const WebPoint& clientPoint,
- const WebPoint& screenPoint);
- virtual void dragTargetDrop(
- const WebPoint& clientPoint,
const WebPoint& screenPoint,
int keyModifiers);
virtual unsigned long createUniqueIdentifierForRequest();
Modified: trunk/Tools/ChangeLog (122485 => 122486)
--- trunk/Tools/ChangeLog 2012-07-12 18:20:35 UTC (rev 122485)
+++ trunk/Tools/ChangeLog 2012-07-12 18:22:39 UTC (rev 122486)
@@ -1,3 +1,18 @@
+2012-07-12 Tony Chang <[email protected]>
+
+ [chromium] Remove drag and drop API methods that are no longer used
+ https://bugs.webkit.org/show_bug.cgi?id=90996
+
+ Reviewed by Adam Barth.
+
+ Migrate DRT to use the methods that take modifier keys.
+
+ * DumpRenderTree/chromium/EventSender.cpp:
+ (EventSender::doDragDrop):
+ (EventSender::doMouseUp):
+ (EventSender::doMouseMove):
+ (EventSender::beginDragWithFiles):
+
2012-07-12 Ojan Vafai <[email protected]>
Allow putting ranges in user.py list prompts
Modified: trunk/Tools/DumpRenderTree/chromium/EventSender.cpp (122485 => 122486)
--- trunk/Tools/DumpRenderTree/chromium/EventSender.cpp 2012-07-12 18:20:35 UTC (rev 122485)
+++ trunk/Tools/DumpRenderTree/chromium/EventSender.cpp 2012-07-12 18:22:39 UTC (rev 122486)
@@ -351,7 +351,7 @@
WebPoint screenPoint(event.globalX, event.globalY);
currentDragData = dragData;
currentDragEffectsAllowed = mask;
- currentDragEffect = webview()->dragTargetDragEnter(dragData, clientPoint, screenPoint, currentDragEffectsAllowed);
+ currentDragEffect = webview()->dragTargetDragEnter(dragData, clientPoint, screenPoint, currentDragEffectsAllowed, 0);
// Finish processing events.
replaySavedEvents();
@@ -466,9 +466,9 @@
WebPoint clientPoint(e.x, e.y);
WebPoint screenPoint(e.globalX, e.globalY);
- currentDragEffect = webview()->dragTargetDragOver(clientPoint, screenPoint, currentDragEffectsAllowed);
+ currentDragEffect = webview()->dragTargetDragOver(clientPoint, screenPoint, currentDragEffectsAllowed, 0);
if (currentDragEffect)
- webview()->dragTargetDrop(clientPoint, screenPoint);
+ webview()->dragTargetDrop(clientPoint, screenPoint, 0);
else
webview()->dragTargetDragLeave();
webview()->dragSourceEndedAt(clientPoint, screenPoint, currentDragEffect);
@@ -509,7 +509,7 @@
return;
WebPoint clientPoint(e.x, e.y);
WebPoint screenPoint(e.globalX, e.globalY);
- currentDragEffect = webview()->dragTargetDragOver(clientPoint, screenPoint, currentDragEffectsAllowed);
+ currentDragEffect = webview()->dragTargetDragOver(clientPoint, screenPoint, currentDragEffectsAllowed, 0);
}
void EventSender::keyDown(const CppArgumentList& arguments, CppVariant* result)
@@ -912,7 +912,7 @@
currentDragEffectsAllowed = WebKit::WebDragOperationCopy;
// Provide a drag source.
- webview()->dragTargetDragEnter(currentDragData, lastMousePos, lastMousePos, currentDragEffectsAllowed);
+ webview()->dragTargetDragEnter(currentDragData, lastMousePos, lastMousePos, currentDragEffectsAllowed, 0);
// dragMode saves events and then replays them later. We don't need/want that.
dragMode.set(false);
