[Touch Adjustment] Pass primary_pointer_type to WebGestureEvent and disable adjustment for stylus

content/shell/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/test_runner/event_sender.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 64 matching lines @@
 
 const int kRawMousePointerId = -1;
 const char* const kPointerTypeStringUnknown = "";
 const char* const kPointerTypeStringMouse = "mouse";
 const char* const kPointerTypeStringTouch = "touch";
 const char* const kPointerTypeStringPen = "pen";
 const char* const kPointerTypeStringEraser = "eraser";
 
 // Assigns |pointerType| from the provided |args|. Returns false if there was
 // any error.
-bool getPointerType(gin::Arguments* args,
+bool GetPointerType(gin::Arguments* args,
                     bool isOnlyMouseAndPenAllowed,
                     WebPointerProperties::PointerType& pointerType) {
   if (args->PeekNext().IsEmpty())
     return true;
   std::string pointer_type_string;
   if (!args->GetNext(&pointer_type_string)) {
     args->ThrowError();
     return false;
   }
   if (isOnlyMouseAndPenAllowed &&
@@ skipping 29 matching lines @@
     float& pressure,
     int& tiltX,
     int& tiltY) {
   pointerType = WebPointerProperties::PointerType::kMouse;
   rawPointerId = kRawMousePointerId;
   pressure = std::numeric_limits<float>::quiet_NaN();
   tiltX = 0;
   tiltY = 0;
 
   // Only allow pen or mouse through this API.
-  if (!getPointerType(args, false, pointerType))
+  if (!GetPointerType(args, false, pointerType))
     return false;
   if (!args->PeekNext().IsEmpty()) {
     if (!args->GetNext(&rawPointerId)) {
       args->ThrowError();
       return false;
     }
 
     // Parse optional params
     if (!args->PeekNext().IsEmpty()) {
       if (!args->GetNext(&pressure)) {
@@ skipping 870 matching lines @@
 
 void EventSenderBindings::MouseLeave(gin::Arguments* args) {
   if (!sender_)
     return;
 
   WebPointerProperties::PointerType pointerType =
       WebPointerProperties::PointerType::kMouse;
   int pointerId = kRawMousePointerId;
 
   // Only allow pen or mouse through this API.
-  if (!getPointerType(args, false, pointerType))
+  if (!GetPointerType(args, false, pointerType))
     return;
   if (!args->PeekNext().IsEmpty()) {
     if (!args->GetNext(&pointerId)) {
       args->ThrowError();
       return;
     }
   }
   sender_->MouseLeave(pointerType, pointerId);
 }
 
@@ skipping 1481 matching lines @@
           }
           event.data.two_finger_tap.first_finger_height = first_finger_height;
         }
       }
       break;
     default:
       NOTREACHED();
   }
 
   event.unique_touch_event_id = GetUniqueTouchEventId(args);
+  if (!GetPointerType(args, false, event.primary_pointer_type))
+    return;
 
   event.global_x = event.x;
   event.global_y = event.y;
 
   if (force_layout_on_events_)
     widget()->UpdateAllLifecyclePhases();
 
   WebInputEventResult result = HandleInputEventOnViewOrPopup(event);
 
   // Long press might start a drag drop session. Complete it if so.
@@ skipping 129 matching lines @@
   if (!args->PeekNext().IsEmpty()) {
     int tiltX, tiltY;
     if (!args->GetNext(&tiltX) || !args->GetNext(&tiltY)) {
       args->ThrowError();
       return;
     }
     e->tilt_x = tiltX;
     e->tilt_y = tiltY;
   }
 
-  if (!getPointerType(args, false, e->pointer_type))
+  if (!GetPointerType(args, false, e->pointer_type))
     return;
 }
 
 void EventSender::FinishDragAndDrop(const WebMouseEvent& raw_event,
                                     blink::WebDragOperation drag_effect) {
   std::unique_ptr<WebInputEvent> widget_event =
       TransformScreenToWidgetCoordinates(raw_event);
   const WebMouseEvent* event =
       widget_event.get() ? static_cast<WebMouseEvent*>(widget_event.get())
                          : &raw_event;
@@ skipping 228 matching lines @@
   return view()->MainFrame()->ToWebLocalFrame()->FrameWidget();
 }
 
 std::unique_ptr<WebInputEvent> EventSender::TransformScreenToWidgetCoordinates(
     const WebInputEvent& event) {
   return delegate()->TransformScreenToWidgetCoordinates(
       web_widget_test_proxy_base_, event);
 }
 
 }  // namespace test_runner