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

content/browser/web_contents/web_drag_dest_mac.mm

 // 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.
 
 #import "content/browser/web_contents/web_drag_dest_mac.h"
 
+#import <Carbon/Carbon.h>
+
 #include "base/sys_string_conversions.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/web_drag_dest_delegate.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 #include "ui/base/clipboard/custom_data_helper.h"
 #import "ui/base/dragdrop/cocoa_dnd_util.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/window_open_disposition.h"
 
 using WebKit::WebDragOperationsMask;
 using content::OpenURLParams;
 using content::Referrer;
 
+- (int)GetModifierFlags {

[dcheng, 2012/05/16 00:13:28]

This should just be a regular C method declaration, otherwise it's a compile
error. It probably belongs in an unnamed namespace as well.

[varunjain, 2012/05/16 01:30:23]

Done.

+  int modifier_state = 0;
+  UInt32 currentModifiers = GetCurrentKeyModifiers();
+  if (currentModifiers & ::shiftKey)
+    modifier_state |= WebKit::WebInputEvent::ShiftKey;
+  if (currentModifiers & ::controlKey)
+    modifier_state |= WebKit::WebInputEvent::ControlKey;
+  if (currentModifiers & ::optionKey)
+    modifier_state |= WebKit::WebInputEvent::AltKey;
+  if (currentModifiers & ::cmdKey)
+      modifier_state |= WebKit::WebInputEvent::MetaKey;
+  return modifier_state;
+}
+
 @implementation WebDragDest
 
 // |contents| is the WebContentsImpl representing this tab, used to communicate
 // drag&drop messages to WebCore and handle navigation on a successful drop
 // (if necessary).
 - (id)initWithWebContentsImpl:(WebContentsImpl*)contents {
   if ((self = [super init])) {
     webContents_ = contents;
   }
   return self;
@@ skipping 73 matching lines @@
   // Create the appropriate mouse locations for WebCore. The draggingLocation
   // is in window coordinates. Both need to be flipped.
   NSPoint windowPoint = [info draggingLocation];
   NSPoint viewPoint = [self flipWindowPointToView:windowPoint view:view];
   NSPoint screenPoint = [self flipWindowPointToScreen:windowPoint view:view];
   NSDragOperation mask = [info draggingSourceOperationMask];
   webContents_->GetRenderViewHost()->DragTargetDragEnter(
       *dropData_,
       gfx::Point(viewPoint.x, viewPoint.y),
       gfx::Point(screenPoint.x, screenPoint.y),
-      static_cast<WebDragOperationsMask>(mask));
+      static_cast<WebDragOperationsMask>(mask),
+      GetModifierFlags());
 
   // We won't know the true operation (whether the drag is allowed) until we
   // hear back from the renderer. For now, be optimistic:
   currentOperation_ = NSDragOperationCopy;
   return currentOperation_;
 }
 
 - (void)draggingExited:(id<NSDraggingInfo>)info {
   DCHECK(currentRVH_);
   if (currentRVH_ != webContents_->GetRenderViewHost())
@@ skipping 22 matching lines @@
 
   // Create the appropriate mouse locations for WebCore. The draggingLocation
   // is in window coordinates.
   NSPoint windowPoint = [info draggingLocation];
   NSPoint viewPoint = [self flipWindowPointToView:windowPoint view:view];
   NSPoint screenPoint = [self flipWindowPointToScreen:windowPoint view:view];
   NSDragOperation mask = [info draggingSourceOperationMask];
   webContents_->GetRenderViewHost()->DragTargetDragOver(
       gfx::Point(viewPoint.x, viewPoint.y),
       gfx::Point(screenPoint.x, screenPoint.y),
-      static_cast<WebDragOperationsMask>(mask));
+      static_cast<WebDragOperationsMask>(mask),
+      GetModifierFlags());
 
   if (delegate_)
     delegate_->OnDragOver();
 
   return currentOperation_;
 }
 
 - (BOOL)performDragOperation:(id<NSDraggingInfo>)info
                               view:(NSView*)view {
   if (currentRVH_ != webContents_->GetRenderViewHost())
@@ skipping 19 matching lines @@
 
   currentRVH_ = NULL;
 
   // Create the appropriate mouse locations for WebCore. The draggingLocation
   // is in window coordinates. Both need to be flipped.
   NSPoint windowPoint = [info draggingLocation];
   NSPoint viewPoint = [self flipWindowPointToView:windowPoint view:view];
   NSPoint screenPoint = [self flipWindowPointToScreen:windowPoint view:view];
   webContents_->GetRenderViewHost()->DragTargetDrop(
       gfx::Point(viewPoint.x, viewPoint.y),
-      gfx::Point(screenPoint.x, screenPoint.y));
+      gfx::Point(screenPoint.x, screenPoint.y),
+      GetModifierFlags());
 
   dropData_.reset();
 
   return result;
 }
 
 // Given |data|, which should not be nil, fill it in using the contents of the
 // given pasteboard.
 - (void)populateWebDropData:(WebDropData*)data
              fromPasteboard:(NSPasteboard*)pboard {
@@ skipping 46 matching lines @@
   // Get custom MIME data.
   if ([types containsObject:ui::kWebCustomDataPboardType]) {
     NSData* customData = [pboard dataForType:ui::kWebCustomDataPboardType];
     ui::ReadCustomDataIntoMap([customData bytes],
                               [customData length],
                               &data->custom_data);
   }
 }
 
 @end