Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index dc176876650a155d6f13fea9fa24958b43c2b4b1..0ddc3c76f5df56047cc39387752ec78f52e4fa78 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -426,6 +426,9 @@ class WebWidgetLockTarget : public MouseLockDispatcher::LockTarget { |
}; |
WebDragData DropDataToWebDragData(const DropData& drop_data) { |
+ if (!drop_data.is_valid) |
+ return WebDragData(); |
+ |
std::vector<WebDragData::Item> item_list; |
// These fields are currently unused when dragging into WebKit. |
@@ -2438,10 +2441,12 @@ void RenderViewImpl::OnDragTargetDragLeave() { |
webview()->dragTargetDragLeave(); |
} |
-void RenderViewImpl::OnDragTargetDrop(const gfx::Point& client_point, |
+void RenderViewImpl::OnDragTargetDrop(const DropData& drop_data, |
+ const gfx::Point& client_point, |
const gfx::Point& screen_point, |
int key_modifiers) { |
- webview()->dragTargetDrop(client_point, screen_point, key_modifiers); |
+ webview()->dragTargetDrop(DropDataToWebDragData(drop_data), client_point, |
+ screen_point, key_modifiers); |
} |
void RenderViewImpl::OnDragSourceEnded(const gfx::Point& client_point, |