Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (117559 => 117560)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-05-18 07:48:05 UTC (rev 117559)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-05-18 08:12:03 UTC (rev 117560)
@@ -1,3 +1,20 @@
+2012-05-18 Jochen Eisinger <[email protected]>
+
+ [chromium] plumb the frame for which a drag was initiated to the WebViewClient
+ https://bugs.webkit.org/show_bug.cgi?id=86670
+
+ Reviewed by Kent Tamura.
+
+ * public/WebViewClient.h:
+ (WebKit::WebViewClient::startDragging):
+ (WebViewClient):
+ * src/DragClientImpl.cpp:
+ (WebKit::DragClientImpl::startDrag):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::startDragging):
+ * src/WebViewImpl.h:
+ (WebViewImpl):
+
2012-05-17 Mark Pilgrim <[email protected]>
[Chromium] Move Web Workers methods to Platform.h
Modified: trunk/Source/WebKit/chromium/public/WebViewClient.h (117559 => 117560)
--- trunk/Source/WebKit/chromium/public/WebViewClient.h 2012-05-18 07:48:05 UTC (rev 117559)
+++ trunk/Source/WebKit/chromium/public/WebViewClient.h 2012-05-18 08:12:03 UTC (rev 117560)
@@ -250,6 +250,8 @@
virtual void showContextMenu(WebFrame*, const WebContextMenuData&) { }
// Called when a drag-n-drop operation should begin.
+ virtual void startDragging(WebFrame*, const WebDragData& dragData, WebDragOperationsMask mask, const WebImage& dragImage, const WebPoint& dragImageOffset) { startDragging(dragData, mask, dragImage, dragImageOffset); }
+ // FIXME: Remove once the chromium side has landed.
virtual void startDragging(
const WebDragData&, WebDragOperationsMask, const WebImage&, const WebPoint&) { }
Modified: trunk/Source/WebKit/chromium/src/DragClientImpl.cpp (117559 => 117560)
--- trunk/Source/WebKit/chromium/src/DragClientImpl.cpp 2012-05-18 07:48:05 UTC (rev 117559)
+++ trunk/Source/WebKit/chromium/src/DragClientImpl.cpp 2012-05-18 08:12:03 UTC (rev 117560)
@@ -87,10 +87,7 @@
IntSize offsetSize(eventPos - dragImageOrigin);
WebPoint offsetPoint(offsetSize.width(), offsetSize.height());
- m_webView->startDragging(
- dragData, static_cast<WebDragOperationsMask>(dragOperationMask),
- dragImage ? WebImage(*dragImage) : WebImage(),
- offsetPoint);
+ m_webView->startDragging(frame, dragData, static_cast<WebDragOperationsMask>(dragOperationMask), dragImage ? WebImage(*dragImage) : WebImage(), offsetPoint);
}
void DragClientImpl::dragControllerDestroyed()
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (117559 => 117560)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-05-18 07:48:05 UTC (rev 117559)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-05-18 08:12:03 UTC (rev 117560)
@@ -3134,7 +3134,8 @@
return true;
}
-void WebViewImpl::startDragging(const WebDragData& dragData,
+void WebViewImpl::startDragging(Frame* frame,
+ const WebDragData& dragData,
WebDragOperationsMask mask,
const WebImage& dragImage,
const WebPoint& dragImageOffset)
@@ -3143,7 +3144,7 @@
return;
ASSERT(!m_doingDragAndDrop);
m_doingDragAndDrop = true;
- m_client->startDragging(dragData, mask, dragImage, dragImageOffset);
+ m_client->startDragging(WebFrameImpl::fromFrame(frame), dragData, mask, dragImage, dragImageOffset);
}
void WebViewImpl::observeNewNavigation()
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.h (117559 => 117560)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-05-18 07:48:05 UTC (rev 117559)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-05-18 08:12:03 UTC (rev 117560)
@@ -448,6 +448,7 @@
// Start a system drag and drop operation.
void startDragging(
+ WebCore::Frame*,
const WebDragData& dragData,
WebDragOperationsMask mask,
const WebImage& dragImage,
Modified: trunk/Tools/ChangeLog (117559 => 117560)
--- trunk/Tools/ChangeLog 2012-05-18 07:48:05 UTC (rev 117559)
+++ trunk/Tools/ChangeLog 2012-05-18 08:12:03 UTC (rev 117560)
@@ -1,3 +1,16 @@
+2012-05-18 Jochen Eisinger <[email protected]>
+
+ [chromium] plumb the frame for which a drag was initiated to the WebViewClient
+
+ https://bugs.webkit.org/show_bug.cgi?id=86670
+
+ Reviewed by Kent Tamura.
+
+ * DumpRenderTree/chromium/WebViewHost.cpp:
+ (WebViewHost::startDragging):
+ * DumpRenderTree/chromium/WebViewHost.h:
+ (WebViewHost):
+
2012-05-18 Christophe Dumez <[email protected]>
[EFL] appcache tests are flaky
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp (117559 => 117560)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-05-18 07:48:05 UTC (rev 117559)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-05-18 08:12:03 UTC (rev 117560)
@@ -548,7 +548,7 @@
printf("UI DELEGATE STATUS CALLBACK: setStatusText:%s\n", text.utf8().data());
}
-void WebViewHost::startDragging(const WebDragData& data, WebDragOperationsMask mask, const WebImage&, const WebPoint&)
+void WebViewHost::startDragging(WebFrame*, const WebDragData& data, WebDragOperationsMask mask, const WebImage&, const WebPoint&)
{
WebDragData mutableDragData = data;
if (layoutTestController()->shouldAddFileToPasteboard()) {
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.h (117559 => 117560)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2012-05-18 07:48:05 UTC (rev 117559)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2012-05-18 08:12:03 UTC (rev 117560)
@@ -156,7 +156,7 @@
virtual bool runModalBeforeUnloadDialog(WebKit::WebFrame*, const WebKit::WebString&);
virtual void showContextMenu(WebKit::WebFrame*, const WebKit::WebContextMenuData&);
virtual void setStatusText(const WebKit::WebString&);
- virtual void startDragging(const WebKit::WebDragData&, WebKit::WebDragOperationsMask, const WebKit::WebImage&, const WebKit::WebPoint&);
+ virtual void startDragging(WebKit::WebFrame*, const WebKit::WebDragData&, WebKit::WebDragOperationsMask, const WebKit::WebImage&, const WebKit::WebPoint&);
virtual void didUpdateLayout();
virtual void navigateBackForwardSoon(int offset);
virtual int historyBackListCount();
