Plumb the DragOperation through all the layers between the platform DnD code ...

chrome/renderer/render_view.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 90 matching lines @@
 using base::TimeDelta;
 using webkit_glue::AltErrorPageResourceFetcher;
 using webkit_glue::AutofillForm;
 using webkit_glue::PasswordForm;
 using webkit_glue::PasswordFormDomManager;
 using webkit_glue::SearchableFormData;
 using WebKit::WebConsoleMessage;
 using WebKit::WebData;
 using WebKit::WebDataSource;
 using WebKit::WebDragData;
+using WebKit::WebDragOperation;
+using WebKit::WebDragOperationsMask;
 using WebKit::WebForm;
 using WebKit::WebFrame;
 using WebKit::WebHistoryItem;
 using WebKit::WebNavigationPolicy;
 using WebKit::WebNavigationType;
 using WebKit::WebPopupMenuInfo;
 using WebKit::WebRect;
 using WebKit::WebScriptSource;
 using WebKit::WebSettings;
 using WebKit::WebSize;
@@ skipping 2016 matching lines @@
   params.misspelled_word = misspelled_word;
   params.spellcheck_enabled =
       webview->GetFocusedFrame()->isContinuousSpellCheckingEnabled();
   params.edit_flags = edit_flags;
   params.security_info = security_info;
   params.frame_charset = frame_charset;
   Send(new ViewHostMsg_ContextMenu(routing_id_, params));
 }
 
 void RenderView::StartDragging(WebView* webview,
-                               const WebDragData& drag_data) {
-  Send(new ViewHostMsg_StartDragging(routing_id_, WebDropData(drag_data)));
+                               const WebKit::WebPoint &mouseCoords,
+                               const WebDragData& drag_data,
+                               WebDragOperationsMask allowed_ops) {
+  Send(new ViewHostMsg_StartDragging(routing_id_,
+                                     WebDropData(drag_data),
+                                     allowed_ops));
 }
 
 void RenderView::TakeFocus(WebView* webview, bool reverse) {
   Send(new ViewHostMsg_TakeFocus(routing_id_, reverse));
 }
 
 void RenderView::DidDownloadImage(int id,
                                   const GURL& image_url,
                                   bool errored,
                                   const SkBitmap& image) {
@@ skipping 486 matching lines @@
   DCHECK(BindingsPolicy::is_dom_ui_enabled(enabled_bindings_));
   dom_ui_bindings_.SetProperty(name, value);
 }
 
 void RenderView::OnReservePageIDRange(int size_of_range) {
   next_page_id_ += size_of_range + 1;
 }
 
 void RenderView::OnDragSourceEndedOrMoved(const gfx::Point& client_point,
                                           const gfx::Point& screen_point,
-                                          bool ended, bool cancelled) {
+                                          bool ended,
+                                          WebDragOperation op) {
   if (ended) {
-    if (cancelled)
-      webview()->DragSourceCancelledAt(client_point, screen_point);
-    else
-      webview()->DragSourceEndedAt(client_point, screen_point);
+    webview()->DragSourceEndedAt(client_point, screen_point, op);
   } else {
     webview()->DragSourceMovedTo(client_point, screen_point);
   }
 }
 
 void RenderView::OnDragSourceSystemDragEnded() {
   webview()->DragSourceSystemDragEnded();
 }
 
 void RenderView::OnUploadFileRequest(const ViewMsg_UploadFile_Params& p) {
@@ skipping 36 matching lines @@
   webkit_glue::FillForm(this->webview(), form);
 }
 
 void RenderView::OnFillPasswordForm(
     const webkit_glue::PasswordFormDomManager::FillData& form_data) {
   webkit_glue::FillPasswordForm(this->webview(), form_data);
 }
 
 void RenderView::OnDragTargetDragEnter(const WebDropData& drop_data,
                                        const gfx::Point& client_point,
-                                       const gfx::Point& screen_point) {
-  bool is_drop_target = webview()->DragTargetDragEnter(
+                                       const gfx::Point& screen_point,
+                                       WebDragOperationsMask ops) {
+  WebDragOperation operation = webview()->DragTargetDragEnter(
       drop_data.ToDragData(),
       drop_data.identity,
       client_point,
-      screen_point);
+      screen_point,
+      ops);
 
-  Send(new ViewHostMsg_UpdateDragCursor(routing_id_, is_drop_target));
+  Send(new ViewHostMsg_UpdateDragCursor(routing_id_, operation));
 }
 
 void RenderView::OnDragTargetDragOver(const gfx::Point& client_point,
-                                      const gfx::Point& screen_point) {
-  bool is_drop_target =
-      webview()->DragTargetDragOver(client_point, screen_point);
+                                      const gfx::Point& screen_point,
+                                      WebDragOperationsMask ops) {
+  WebDragOperation operation = webview()->DragTargetDragOver(
+      client_point,
+      screen_point,
+      ops);
 
-  Send(new ViewHostMsg_UpdateDragCursor(routing_id_, is_drop_target));
+  Send(new ViewHostMsg_UpdateDragCursor(routing_id_, operation));
 }
 
 void RenderView::OnDragTargetDragLeave() {
   webview()->DragTargetDragLeave();
 }
 
 void RenderView::OnDragTargetDrop(const gfx::Point& client_point,
                                   const gfx::Point& screen_point) {
   webview()->DragTargetDrop(client_point, screen_point);
 }
@@ skipping 589 matching lines @@
     Send(new ViewHostMsg_PasswordFormsSeen(routing_id_, password_forms));
 }
 
 void RenderView::Print(WebFrame* frame, bool script_initiated) {
   DCHECK(frame);
   if (print_helper_.get() == NULL) {
     print_helper_.reset(new PrintWebViewHelper(this));
   }
   print_helper_->Print(frame, script_initiated);
 }