Touch emulator: clear mouse buttons modifiers on emulated touch events.

content/browser/renderer_host/input/touch_emulator_unittest.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/browser/renderer_host/input/touch_emulator.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <vector>
@@ skipping 45 matching lines @@
   void ForwardEmulatedGestureEvent(
       const blink::WebGestureEvent& event) override {
     forwarded_events_.push_back(event.type);
   }
 
   void ForwardEmulatedTouchEvent(const blink::WebTouchEvent& event) override {
     forwarded_events_.push_back(event.type);
     EXPECT_EQ(1U, event.touchesLength);
     EXPECT_EQ(last_mouse_x_, event.touches[0].position.x);
     EXPECT_EQ(last_mouse_y_, event.touches[0].position.y);
+    const int all_buttons = WebInputEvent::LeftButtonDown |
+        WebInputEvent::MiddleButtonDown | WebInputEvent::RightButtonDown;
+    EXPECT_EQ(0, event.modifiers & all_buttons);
     WebInputEvent::DispatchType expected_dispatch_type =
         event.type == WebInputEvent::TouchCancel
             ? WebInputEvent::EventNonBlocking
             : WebInputEvent::Blocking;
     EXPECT_EQ(expected_dispatch_type, event.dispatchType);
     if (ack_touches_synchronously_) {
       emulator()->HandleTouchEventAck(
           event, INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS);
     }
   }
 
   void SetCursor(const WebCursor& cursor) override {}
 
   void ShowContextMenuAtPoint(const gfx::Point& point) override {}
 
  protected:
   TouchEmulator* emulator() const {
     return emulator_.get();
   }
 
   int modifiers() const {
-    return shift_pressed_ ? WebInputEvent::ShiftKey : 0;
+    return (shift_pressed_ ? WebInputEvent::ShiftKey : 0) |
+        (mouse_pressed_ ? WebInputEvent::LeftButtonDown : 0);
   }
 
   std::string ExpectedEvents() {
     std::string result;
     for (size_t i = 0; i < forwarded_events_.size(); ++i) {
       if (i != 0)
         result += " ";
       result += WebInputEventTraits::GetName(forwarded_events_[i]);
     }
     forwarded_events_.clear();
@@ skipping 461 matching lines @@
   emulator()->Disable();
   EXPECT_EQ("TouchStart TouchCancel", ExpectedEvents());
   emulator()->CancelTouch();
 }
 
 TEST_F(TouchEmulatorTest, ConstructorWithHighDeviceScaleDoesNotCrash) {
   TouchEmulator(this, 4.0f);
 }
 
 }  // namespace content