Support buttons attribute for drag event (chromium side).

content/shell/renderer/test_runner/event_sender.cc

 // Copyright 2014 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/shell/renderer/test_runner/event_sender.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 1077 matching lines @@
 
 void EventSenderBindings::SetWmSysDeadChar(int sys_dead_char) {
   if (sender_)
     sender_->set_wm_sys_dead_char(sys_dead_char);
 }
 #endif
 
 // EventSender -----------------------------------------------------------------
 
 WebMouseEvent::Button EventSender::pressed_button_ = WebMouseEvent::ButtonNone;
+int EventSender::modifiers_ = 0;
 
 WebPoint EventSender::last_mouse_pos_;
 
 WebMouseEvent::Button EventSender::last_button_type_ =
     WebMouseEvent::ButtonNone;
 
 EventSender::SavedEvent::SavedEvent()
     : type(TYPE_UNSPECIFIED),
       button_type(WebMouseEvent::ButtonNone),
       milliseconds(0),
@@ skipping 84 matching lines @@
 }
 
 void EventSender::DoDragDrop(const WebDragData& drag_data,
                               WebDragOperationsMask mask) {
   WebMouseEvent event;
   InitMouseEvent(WebInputEvent::MouseDown,
                  pressed_button_,
                  last_mouse_pos_,
                  GetCurrentEventTimeSec(),
                  click_count_,
-                 0,
+                 modifiers_,
                  &event);
   WebPoint client_point(event.x, event.y);
   WebPoint screen_point(event.globalX, event.globalY);
   current_drag_data_ = drag_data;
   current_drag_effects_allowed_ = mask;
   current_drag_effect_ = view_->dragTargetDragEnter(
-      drag_data, client_point, screen_point, current_drag_effects_allowed_, 0);
+      drag_data,
+      client_point,
+      screen_point,
+      current_drag_effects_allowed_,
+      modifiers_);
 
   // Finish processing events.
   ReplaySavedEvents();
 }
 
 void EventSender::MouseDown(int button_number, int modifiers) {
   if (force_layout_on_events_)
     view_->layout();
 
   DCHECK_NE(-1, button_number);
 
   WebMouseEvent::Button button_type =
       GetButtonTypeFromButtonNumber(button_number);
 
   UpdateClickCountForButton(button_type);
 
   pressed_button_ = button_type;
+  modifiers_ = modifiers;
 
   WebMouseEvent event;
   InitMouseEvent(WebInputEvent::MouseDown,
                  button_type,
                  last_mouse_pos_,
                  GetCurrentEventTimeSec(),
                  click_count_,
                  modifiers,
                  &event);
   HandleInputEventOnViewOrPopup(event);
@@ skipping 1174 matching lines @@
 
   // If we're in a drag operation, complete it.
   if (current_drag_data_.isNull())
     return;
 
   WebPoint client_point(e.x, e.y);
   WebPoint screen_point(e.globalX, e.globalY);
   FinishDragAndDrop(
       e,
       view_->dragTargetDragOver(
-          client_point, screen_point, current_drag_effects_allowed_, 0));
+          client_point,
+          screen_point,
+          current_drag_effects_allowed_,
+          e.modifiers));
 }
 
 void EventSender::DoMouseMove(const WebMouseEvent& e) {
   last_mouse_pos_ = WebPoint(e.x, e.y);
 
   HandleInputEventOnViewOrPopup(e);
 
   if (pressed_button_ == WebMouseEvent::ButtonNone ||
       current_drag_data_.isNull()) {
     return;
   }
 
   WebPoint client_point(e.x, e.y);
   WebPoint screen_point(e.globalX, e.globalY);
   current_drag_effect_ = view_->dragTargetDragOver(
-      client_point, screen_point, current_drag_effects_allowed_, 0);
+      client_point, screen_point, current_drag_effects_allowed_, e.modifiers);
 }
 
 void EventSender::ReplaySavedEvents() {
   replaying_saved_events_ = true;
   while (!mouse_event_queue_.empty()) {
     SavedEvent e = mouse_event_queue_.front();
     mouse_event_queue_.pop_front();
 
     switch (e.type) {
       case SavedEvent::TYPE_MOUSE_MOVE: {
@@ skipping 33 matching lines @@
 
 bool EventSender::HandleInputEventOnViewOrPopup(const WebInputEvent& event) {
   if (WebPagePopup* popup = view_->pagePopup()) {
     if (!WebInputEvent::isKeyboardEventType(event.type))
       return popup->handleInputEvent(event);
   }
   return view_->handleInputEvent(event);
 }
 
 }  // namespace content