Index: content/browser/renderer_host/render_view_host_impl.cc |
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc |
index 5aa3313f278c865aab9af9280ba91a1ab0569b27..bc1ab61b212157e404c841a5bcb9277104cca975 100644 |
--- a/content/browser/renderer_host/render_view_host_impl.cc |
+++ b/content/browser/renderer_host/render_view_host_impl.cc |
@@ -595,6 +595,7 @@ void RenderViewHostImpl::DragTargetDragEnter( |
const gfx::Point& screen_pt, |
WebDragOperationsMask operations_allowed, |
int key_modifiers) { |
+ DCHECK(drop_data.is_valid); |
const int renderer_id = GetProcess()->GetID(); |
ChildProcessSecurityPolicyImpl* policy = |
ChildProcessSecurityPolicyImpl::GetInstance(); |
@@ -704,13 +705,14 @@ void RenderViewHostImpl::DragTargetDragLeave() { |
Send(new DragMsg_TargetDragLeave(GetRoutingID())); |
} |
-void RenderViewHostImpl::DragTargetDrop( |
- const gfx::Point& client_pt, |
- const gfx::Point& screen_pt, |
- int key_modifiers) { |
+void RenderViewHostImpl::DragTargetDrop(const DropData& drop_data, |
+ const gfx::Point& client_pt, |
+ const gfx::Point& screen_pt, |
+ int key_modifiers) { |
const gfx::Point client_pt_in_viewport = ConvertDIPToViewport(client_pt); |
- Send(new DragMsg_TargetDrop(GetRoutingID(), client_pt_in_viewport, screen_pt, |
- key_modifiers)); |
+ // TODO(hush): filter the drop_data if drop data is valid. |
no sievers
2016/03/08 01:22:15
nit: This comment's meaning is not evident.
dcheng
2016/03/08 01:44:08
Can we just extract the logic from DragTargetEnter
hush (inactive)
2016/03/08 18:23:06
I've done it in a follow up CL that builds on top
|
+ Send(new DragMsg_TargetDrop(GetRoutingID(), drop_data, client_pt_in_viewport, |
+ screen_pt, key_modifiers)); |
} |
void RenderViewHostImpl::DragSourceEndedAt( |