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

third_party/WebKit/public/platform/WebGestureEvent.h

 // Copyright 2016 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.
 
 #ifndef WebGestureEvent_h
 #define WebGestureEvent_h
 
 #include "WebFloatSize.h"
 #include "WebGestureDevice.h"
 #include "WebInputEvent.h"
@@ skipping 20 matching lines @@
   };
 
   // TODO(mustaq): Make these coordinates private & fractional, as in
   // WebMouseEvent.h .
   int x;
   int y;
   int global_x;
   int global_y;
   WebGestureDevice source_device;
 
+  // |primary_pointer_type| is used to distinguish between finger-generated and
+  // stylus-generated gestures. This is important for touch adjustment.
+  WebPointerProperties::PointerType primary_pointer_type;

[mustaq, 2017/06/14 20:37:48]

Please drop "primary_", there is only one type for an event.

[chongz, 2017/06/14 23:53:23]

dtapuska@ Are you ok with dropping "primary_"?

The original reason is we have |primary_tool_type| in |GestureEventData| and
Dave suggested adding "primary_".

[dtapuska, 2017/06/15 14:47:23]

Probably we should indicate that for a multi-contact gesture this is the pointer
type of the *first* point no?

[chongz, 2017/06/15 21:40:08]

Updated comments.

+
   // If the WebGestureEvent has sourceDevice=WebGestureDeviceTouchscreen, this
   // field contains the unique identifier for the touch event that released
   // this event at TouchDispositionGestureFilter. If the WebGestureEvents was
   // not released through a touch event (e.g. timer-released gesture events or
   // gesture events with sourceDevice!=WebGestureDeviceTouchscreen), the field
   // contains 0. See crbug.com/618738.
   uint32_t unique_touch_event_id;
 
   // This field exists to allow BrowserPlugin to mark GestureScroll events as
   // 'resent' to handle the case where an event is not consumed when first
@@ skipping 106 matching lines @@
       float scale;
     } pinch_update;
   } data;
 
   WebGestureEvent(Type type, int modifiers, double time_stamp_seconds)
       : WebInputEvent(sizeof(WebGestureEvent),
                       type,
                       modifiers,
                       time_stamp_seconds),
         source_device(kWebGestureDeviceUninitialized),
+        primary_pointer_type(WebPointerProperties::PointerType::kUnknown),
         resending_plugin_id(-1) {}
 
   WebGestureEvent()
       : WebInputEvent(sizeof(WebGestureEvent)),
         source_device(kWebGestureDeviceUninitialized),
+        primary_pointer_type(WebPointerProperties::PointerType::kUnknown),
         resending_plugin_id(-1) {}
 
 #if INSIDE_BLINK
   BLINK_PLATFORM_EXPORT float DeltaXInRootFrame() const;
   BLINK_PLATFORM_EXPORT float DeltaYInRootFrame() const;
   BLINK_PLATFORM_EXPORT ScrollUnits DeltaUnits() const;
   BLINK_PLATFORM_EXPORT WebFloatPoint PositionInRootFrame() const;
   BLINK_PLATFORM_EXPORT float PinchScale() const;
   BLINK_PLATFORM_EXPORT InertialPhaseState InertialPhase() const;
   BLINK_PLATFORM_EXPORT bool Synthetic() const;
@@ skipping 58 matching lines @@
         return false;
     }
   }
 };
 
 #pragma pack(pop)
 
 }  // namespace blink
 
 #endif  // WebGestureEvent_h