Plumb event flags (shift/alt/ctrl modifiers) for drag/drop events to WebKit.

content/browser/web_contents/web_contents_view_aura.cc

 // Copyright (c) 2012 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 "content/browser/web_contents/web_contents_view_aura.h"
 
 #include "base/utf_string_conversions.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/web_contents/interstitial_page_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_view_delegate.h"
 #include "content/public/browser/web_drag_dest_delegate.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/drag_drop_delegate.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/clipboard/custom_data_helper.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_aura.h"
 #include "ui/base/hit_test.h"
@@ skipping 131 matching lines @@
   int web_drag_op = WebKit::WebDragOperationNone;
   if (drag_op & ui::DragDropTypes::DRAG_COPY)
     web_drag_op |= WebKit::WebDragOperationCopy;
   if (drag_op & ui::DragDropTypes::DRAG_MOVE)
     web_drag_op |= WebKit::WebDragOperationMove;
   if (drag_op & ui::DragDropTypes::DRAG_LINK)
     web_drag_op |= WebKit::WebDragOperationLink;
   return (WebKit::WebDragOperationsMask) web_drag_op;
 }
 
+int ConvertAuraEventFlagsToWebInputEventModifiers(int aura_event_flags) {
+  int web_input_event_modifiers = 0;
+  if (aura_event_flags & ui::EF_SHIFT_DOWN)
+    web_input_event_modifiers |= WebKit::WebInputEvent::ShiftKey;
+  if (aura_event_flags & ui::EF_CONTROL_DOWN)
+    web_input_event_modifiers |= WebKit::WebInputEvent::ControlKey;
+  if (aura_event_flags & ui::EF_ALT_DOWN)
+    web_input_event_modifiers |= WebKit::WebInputEvent::AltKey;
+  if (aura_event_flags & ui::EF_COMMAND_DOWN)
+    web_input_event_modifiers |= WebKit::WebInputEvent::MetaKey;
+  return web_input_event_modifiers;
+}
+
 }  // namespace
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsViewAura, public:
 
 WebContentsViewAura::WebContentsViewAura(
     WebContentsImpl* web_contents,
     content::WebContentsViewDelegate* delegate)
     : web_contents_(web_contents),
@@ skipping 403 matching lines @@
     drag_dest_delegate_->DragInitialize(web_contents_);
 
   WebDropData drop_data;
   PrepareWebDropData(&drop_data, event.data());
   WebKit::WebDragOperationsMask op = ConvertToWeb(event.source_operations());
 
   gfx::Point screen_pt =
       GetNativeView()->GetRootWindow()->last_mouse_location();
   current_rvh_for_drag_ = web_contents_->GetRenderViewHost();
   web_contents_->GetRenderViewHost()->DragTargetDragEnter(
-      drop_data, event.location(), screen_pt, op);
+      drop_data, event.location(), screen_pt, op,
+      ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
 
   if (drag_dest_delegate_) {
     drag_dest_delegate_->OnReceiveDragData(event.data());
     drag_dest_delegate_->OnDragEnter();
   }
 }
 
 int WebContentsViewAura::OnDragUpdated(const aura::DropTargetEvent& event) {
   DCHECK(current_rvh_for_drag_);
   if (current_rvh_for_drag_ != web_contents_->GetRenderViewHost())
     OnDragEntered(event);
 
   WebKit::WebDragOperationsMask op = ConvertToWeb(event.source_operations());
   gfx::Point screen_pt =
       GetNativeView()->GetRootWindow()->last_mouse_location();
   web_contents_->GetRenderViewHost()->DragTargetDragOver(
-      event.location(), screen_pt, op);
+      event.location(), screen_pt, op,
+      ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
 
   if (drag_dest_delegate_)
     drag_dest_delegate_->OnDragOver();
 
   return ConvertFromWeb(current_drag_op_);
 }
 
 void WebContentsViewAura::OnDragExited() {
   DCHECK(current_rvh_for_drag_);
   if (current_rvh_for_drag_ != web_contents_->GetRenderViewHost())
     return;
 
   web_contents_->GetRenderViewHost()->DragTargetDragLeave();
   if (drag_dest_delegate_)
     drag_dest_delegate_->OnDragLeave();
 }
 
 int WebContentsViewAura::OnPerformDrop(const aura::DropTargetEvent& event) {
   DCHECK(current_rvh_for_drag_);
   if (current_rvh_for_drag_ != web_contents_->GetRenderViewHost())
     OnDragEntered(event);
 
   web_contents_->GetRenderViewHost()->DragTargetDrop(
       event.location(),
-      GetNativeView()->GetRootWindow()->last_mouse_location());
+      GetNativeView()->GetRootWindow()->last_mouse_location(),
+      ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
   if (drag_dest_delegate_)
     drag_dest_delegate_->OnDrop();
   return current_drag_op_;
 }