Articulate the cancel behavior in WebMouseWheelEvent.

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

 /*
  * Copyright (C) 2012 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 886 matching lines @@
 
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL.c_str()), WebString::fromUTF8("fixed_layout.html"));
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(baseURL + fileName, true);
     int pageWidth = 640;
     int pageHeight = 480;
     webViewImpl->resize(WebSize(pageWidth, pageHeight));
     webViewImpl->updateAllLifecyclePhases();
 
     Document* document = toLocalFrame(webViewImpl->page()->mainFrame())->document();
-    WheelEvent* event = WheelEvent::create(FloatPoint(1, 3), FloatPoint(5, 10),
-        WheelEvent::DOM_DELTA_PAGE, document->domWindow(), IntPoint(2, 6), IntPoint(10, 30),
-        PlatformEvent::CtrlKey, 0, 0, true, -1 /* null plugin id */, true /* hasPreciseScrollingDeltas */, Event::RailsModeHorizontal);
-    WebMouseWheelEventBuilder webMouseWheel(toLocalFrame(webViewImpl->page()->mainFrame())->view(), document->layoutView(), *event);
-    EXPECT_EQ(1, webMouseWheel.wheelTicksX);
-    EXPECT_EQ(3, webMouseWheel.wheelTicksY);
-    EXPECT_EQ(5, webMouseWheel.deltaX);
-    EXPECT_EQ(10, webMouseWheel.deltaY);
-    EXPECT_EQ(2, webMouseWheel.globalX);
-    EXPECT_EQ(6, webMouseWheel.globalY);
-    EXPECT_EQ(10, webMouseWheel.windowX);
-    EXPECT_EQ(30, webMouseWheel.windowY);
-    EXPECT_TRUE(webMouseWheel.scrollByPage);
-    EXPECT_EQ(WebInputEvent::ControlKey, webMouseWheel.modifiers);
-    EXPECT_TRUE(webMouseWheel.canScroll);
-    EXPECT_EQ(WebInputEvent::RailsModeHorizontal, webMouseWheel.railsMode);
-    EXPECT_TRUE(webMouseWheel.hasPreciseScrollingDeltas);
+    {
+        WheelEvent* event = WheelEvent::create(FloatPoint(1, 3), FloatPoint(5, 10),
+            WheelEvent::DOM_DELTA_PAGE, document->domWindow(), IntPoint(2, 6), IntPoint(10, 30),
+            PlatformEvent::CtrlKey, 0, 0, true, -1 /* null plugin id */, true /* hasPreciseScrollingDeltas */, Event::RailsModeHorizontal, true);

[tdresser, 2016/04/20 13:20:10]

Add comment indicating what this flag indicates.

[dtapuska, 2016/04/20 14:03:04]

Done.

+        WebMouseWheelEventBuilder webMouseWheel(toLocalFrame(webViewImpl->page()->mainFrame())->view(), document->layoutView(), *event);
+        EXPECT_EQ(1, webMouseWheel.wheelTicksX);
+        EXPECT_EQ(3, webMouseWheel.wheelTicksY);
+        EXPECT_EQ(5, webMouseWheel.deltaX);
+        EXPECT_EQ(10, webMouseWheel.deltaY);
+        EXPECT_EQ(2, webMouseWheel.globalX);
+        EXPECT_EQ(6, webMouseWheel.globalY);
+        EXPECT_EQ(10, webMouseWheel.windowX);
+        EXPECT_EQ(30, webMouseWheel.windowY);
+        EXPECT_TRUE(webMouseWheel.scrollByPage);
+        EXPECT_EQ(WebInputEvent::ControlKey, webMouseWheel.modifiers);
+        EXPECT_TRUE(webMouseWheel.canScroll);
+        EXPECT_EQ(WebInputEvent::RailsModeHorizontal, webMouseWheel.railsMode);
+        EXPECT_TRUE(webMouseWheel.hasPreciseScrollingDeltas);
+        EXPECT_EQ(WebInputEvent::Blocking, webMouseWheel.dispatchType);
+    }
+
+    {
+        WheelEvent* event = WheelEvent::create(FloatPoint(1, 3), FloatPoint(5, 10),
+            WheelEvent::DOM_DELTA_PAGE, document->domWindow(), IntPoint(2, 6), IntPoint(10, 30),
+            PlatformEvent::CtrlKey, 0, 0, true, -1 /* null plugin id */, true /* hasPreciseScrollingDeltas */, Event::RailsModeHorizontal, false);
+        WebMouseWheelEventBuilder webMouseWheel(toLocalFrame(webViewImpl->page()->mainFrame())->view(), document->layoutView(), *event);
+        EXPECT_EQ(WebInputEvent::EventNonBlocking, webMouseWheel.dispatchType);
+    }
 }
 
 TEST(WebInputEventConversionTest, PlatformWheelEventBuilder)
 {
     const std::string baseURL("http://www.test8.com/");
     const std::string fileName("fixed_layout.html");
 
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL.c_str()), WebString::fromUTF8("fixed_layout.html"));
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(baseURL + fileName, true);
@@ skipping 138 matching lines @@
         EXPECT_EQ(5, platformGestureBuilder.position().y());
         EXPECT_EQ(10, platformGestureBuilder.globalPosition().x());
         EXPECT_EQ(15, platformGestureBuilder.globalPosition().y());
         EXPECT_FALSE(platformGestureBuilder.inertial());
         EXPECT_TRUE(platformGestureBuilder.synthetic());
         EXPECT_EQ(ScrollGranularity::ScrollByPage, platformGestureBuilder.deltaUnits());
     }
 }
 
 } // namespace blink