Articulate the cancel behavior in WebMouseWheelEvent.

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

Index: third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp b/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
index d06e32a3b1bcc8e2b55bd8a10b0a00959a18c8a4..7ddc1833a1535d18cfe8a41dcd1014cd9093967b 100644
--- a/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
@@ -904,23 +904,34 @@ TEST(WebInputEventConversionTest, WebMouseWheelEventBuilder)
     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)