Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1913)

Unified Diff: content/browser/web_contents/web_contents_view_aura.cc

Issue 1723763002: Add WebDragData to blink::WebView::dragtargetDrop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix compile on aura Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/web_contents/web_contents_view_aura.cc
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index 98efc51cbca27630cf64b965849ebfb11b124180..7797bb30411f464932d937422affbc34dc7a75f5 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -1042,6 +1042,9 @@ void WebContentsViewAura::OnDragEntered(const ui::DropTargetEvent& event) {
current_drop_data_.reset(new DropData());
PrepareDropData(current_drop_data_.get(), event.data());
+
+ web_contents_->GetRenderViewHost()->FilterDropData(current_drop_data_.get());
+
blink::WebDragOperationsMask op = ConvertToWeb(event.source_operations());
// Give the delegate an opportunity to cancel the drag.
@@ -1057,7 +1060,7 @@ void WebContentsViewAura::OnDragEntered(const ui::DropTargetEvent& event) {
gfx::Point screen_pt = display::Screen::GetScreen()->GetCursorScreenPoint();
web_contents_->GetRenderViewHost()->DragTargetDragEnter(
- *current_drop_data_.get(), event.location(), screen_pt, op,
+ *current_drop_data_, event.location(), screen_pt, op,
ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
if (drag_dest_delegate_) {
@@ -1110,7 +1113,8 @@ int WebContentsViewAura::OnPerformDrop(const ui::DropTargetEvent& event) {
return ui::DragDropTypes::DRAG_NONE;
web_contents_->GetRenderViewHost()->DragTargetDrop(
- event.location(), display::Screen::GetScreen()->GetCursorScreenPoint(),
+ *current_drop_data_, event.location(),
+ display::Screen::GetScreen()->GetCursorScreenPoint(),
ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
if (drag_dest_delegate_)
drag_dest_delegate_->OnDrop();

Powered by Google App Engine
This is Rietveld 408576698