Plumb gesture source value through Blink.

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 1582 matching lines @@
 
     IntPoint hitPoint = IntPoint(30, 30); // button size is 100x100
 
     WebLocalFrameImpl* frame = toWebLocalFrameImpl(webViewHelper.webView()->mainFrame());
     Document* document = frame->frame()->document();
     Element* element = document->getElementById("tap_button");
 
     ASSERT_NE(nullptr, element);
     EXPECT_EQ(String("oldValue"), element->innerText());
 
-    PlatformGestureEvent gestureEvent(PlatformEvent::Type::GestureTap, hitPoint, hitPoint, IntSize(0, 0), 0, PlatformEvent::NoModifiers);
+    PlatformGestureEvent gestureEvent(PlatformEvent::Type::GestureTap, hitPoint, hitPoint, IntSize(0, 0), 0, PlatformEvent::NoModifiers, PlatformGestureSourceTouchpad);

[Rick Byers, 2015/10/19 18:20:29]

Tap should only ever be touchscreen

[wjmaclean, 2015/10/19 18:58:49]

Done.

     webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().handleGestureEvent(gestureEvent);
     // when pressed, the button changes its own text to "updatedValue"
     EXPECT_EQ(String("updatedValue"), element->innerText());
 }
 
 TEST_P(ParameterizedWebFrameTest, SetForceZeroLayoutHeightWorksAcrossNavigations)
 {
     UseMockScrollbarSettings mockScrollbarSettings;
     registerMockedHttpURLLoad("200-by-300.html");
     registerMockedHttpURLLoad("large-div.html");
@@ skipping 3137 matching lines @@
 
     bool triggered() const { return m_triggered; }
     void resetTriggered() { m_triggered = false; }
     bool m_triggered;
 };
 
 static WebGestureEvent fatTap(int x, int y)
 {
     WebGestureEvent event;
     event.type = WebInputEvent::GestureTap;
+    event.sourceDevice = WebGestureDeviceTouchpad;

[Rick Byers, 2015/10/19 18:20:29]

ditto

[wjmaclean, 2015/10/19 18:58:49]

Done.

     event.x = x;
     event.y = y;
     event.data.tap.width = 50;
     event.data.tap.height = 50;
     return event;
 }
 
 TEST_P(ParameterizedWebFrameTest, DisambiguationPopup)
 {
     const std::string htmlFile = "disambiguation_popup.html";
@@ skipping 3213 matching lines @@
 public:
     MOCK_METHOD4(didOverscroll, void(const WebFloatSize&, const WebFloatSize&, const WebFloatPoint&, const WebFloatSize&));
 };
 
 class WebFrameOverscrollTest : public WebFrameTest {
 protected:
     WebGestureEvent generateEvent(WebInputEvent::Type type, float deltaX = 0.0, float deltaY = 0.0)
     {
         WebGestureEvent event;
         event.type = type;
+        event.sourceDevice = WebGestureDeviceTouchpad;
         event.x = 100;
         event.y = 100;
         if (type == WebInputEvent::GestureScrollUpdate) {
             event.data.scrollUpdate.deltaX = deltaX;
             event.data.scrollUpdate.deltaY = deltaY;
         }
         return event;
     }
 
     void ScrollByWheel(FrameTestHelpers::WebViewHelper* webViewHelper, int windowX, int windowY, float deltaX, float deltaY)
@@ skipping 281 matching lines @@
     EXPECT_TRUE(resource);
     EXPECT_NE(0, resource->loadFinishTime());
 
     DocumentLoader* loader = document->loader();
 
     EXPECT_TRUE(loader);
     EXPECT_EQ(loader->timing().responseEnd(), resource->loadFinishTime());
 }
 
 } // namespace blink