Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (122394 => 122395)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-07-12 00:45:58 UTC (rev 122394)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-07-12 00:54:11 UTC (rev 122395)
@@ -1,3 +1,21 @@
+2012-07-11 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r122358.
+ http://trac.webkit.org/changeset/122358
+ https://bugs.webkit.org/show_bug.cgi?id=91037
+
+ Build break on WebKit Win (Requested by hayato on #webkit).
+
+ * public/WebView.h:
+ (WebView):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::dragTargetDragEnter):
+ (WebKit):
+ (WebKit::WebViewImpl::dragTargetDragOver):
+ (WebKit::WebViewImpl::dragTargetDrop):
+ * src/WebViewImpl.h:
+ (WebViewImpl):
+
2012-07-11 Alexandre Elias <[email protected]>
[chromium] Move compositor quads to Platform/chromium/public
Modified: trunk/Source/WebKit/chromium/public/WebView.h (122394 => 122395)
--- trunk/Source/WebKit/chromium/public/WebView.h 2012-07-12 00:45:58 UTC (rev 122394)
+++ trunk/Source/WebKit/chromium/public/WebView.h 2012-07-12 00:54:11 UTC (rev 122395)
@@ -317,17 +317,29 @@
// 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 (122394 => 122395)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-07-12 00:45:58 UTC (rev 122394)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-07-12 00:54:11 UTC (rev 122395)
@@ -2796,6 +2796,15 @@
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)
{
@@ -2810,6 +2819,14 @@
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)
{
@@ -2837,6 +2854,12 @@
}
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 (122394 => 122395)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-07-12 00:45:58 UTC (rev 122394)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-07-12 00:54:11 UTC (rev 122395)
@@ -239,16 +239,28 @@
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 (122394 => 122395)
--- trunk/Tools/ChangeLog 2012-07-12 00:45:58 UTC (rev 122394)
+++ trunk/Tools/ChangeLog 2012-07-12 00:54:11 UTC (rev 122395)
@@ -1,3 +1,17 @@
+2012-07-11 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r122358.
+ http://trac.webkit.org/changeset/122358
+ https://bugs.webkit.org/show_bug.cgi?id=91037
+
+ Build break on WebKit Win (Requested by hayato on #webkit).
+
+ * DumpRenderTree/chromium/EventSender.cpp:
+ (EventSender::doDragDrop):
+ (EventSender::doMouseUp):
+ (EventSender::doMouseMove):
+ (EventSender::beginDragWithFiles):
+
2012-07-03 Dirk Pranke <[email protected]>
nrwt: add a MessagePool abstraction that the manager will call to replace the broker
Modified: trunk/Tools/DumpRenderTree/chromium/EventSender.cpp (122394 => 122395)
--- trunk/Tools/DumpRenderTree/chromium/EventSender.cpp 2012-07-12 00:45:58 UTC (rev 122394)
+++ trunk/Tools/DumpRenderTree/chromium/EventSender.cpp 2012-07-12 00:54:11 UTC (rev 122395)
@@ -351,7 +351,7 @@
WebPoint screenPoint(event.globalX, event.globalY);
currentDragData = dragData;
currentDragEffectsAllowed = mask;
- currentDragEffect = webview()->dragTargetDragEnter(dragData, clientPoint, screenPoint, currentDragEffectsAllowed, 0);
+ currentDragEffect = webview()->dragTargetDragEnter(dragData, clientPoint, screenPoint, currentDragEffectsAllowed);
// 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, 0);
+ currentDragEffect = webview()->dragTargetDragOver(clientPoint, screenPoint, currentDragEffectsAllowed);
if (currentDragEffect)
- webview()->dragTargetDrop(clientPoint, screenPoint, 0);
+ webview()->dragTargetDrop(clientPoint, screenPoint);
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, 0);
+ currentDragEffect = webview()->dragTargetDragOver(clientPoint, screenPoint, currentDragEffectsAllowed);
}
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, 0);
+ webview()->dragTargetDragEnter(currentDragData, lastMousePos, lastMousePos, currentDragEffectsAllowed);
// dragMode saves events and then replays them later. We don't need/want that.
dragMode.set(false);