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

content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
index b6c9b0d4ed86d1b2f17450bded94b640673fe236..06d904e6f1d69cdb101c59ce458040d131a53b2d 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
@@ -5275,6 +5275,36 @@ TEST_F(RenderWidgetHostViewAuraTest, ForwardMouseEvent) {
   view_ = nullptr;
 }
 
+TEST_F(RenderWidgetHostViewAuraTest, GestureTapFromStylusHasPointerType) {
+  view_->InitAsFullscreen(parent_view_);
+  view_->Show();
+
+  aura::Window* root = view_->GetNativeView()->GetRootWindow();
+  root->SetTargetHandler(view_);

[chongz, 2017/06/14 19:09:07]

For unknown reason |root->target_handler_| is NULL and I have to set it to
|view_| to receive events.
I'm not sure but is this the expected way of dispatching events?

+
+  ui::test::EventGenerator generator(root, root->bounds().CenterPoint());
+
+  // Simulate touch press and release to generate a GestureTap.
+  sink_->ClearMessages();
+  generator.EnterPenPointerMode();
+  generator.PressTouch();
+  AckLastSentInputEventIfNecessary(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
+  generator.ReleaseTouch();
+  AckLastSentInputEventIfNecessary(INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
+
+  // GestureTap event should have correct pointer type.
+  EXPECT_EQ(5U, sink_->message_count());
+  const WebInputEvent* input_event = GetInputEventFromMessage(
+      *sink_->GetMessageAt(sink_->message_count() - 1));
+  EXPECT_EQ(WebInputEvent::kGestureTap, input_event->GetType());
+  const WebGestureEvent* geture_event =
+      static_cast<const WebGestureEvent*>(input_event);
+  EXPECT_EQ(blink::WebPointerProperties::PointerType::kPen,
+            geture_event->primary_pointer_type);
+
+  sink_->ClearMessages();
+}
+
 // This class provides functionality to test a RenderWidgetHostViewAura
 // instance which has been hooked up to a test RenderViewHost instance and
 // a WebContents instance.