Add canScroll bit to WebMouseWheelEvent

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 695 matching lines @@
         EXPECT_FLOAT_EQ(10.4f, webTouchEvent.touches[0].position.y);
 
         PlatformTouchEventBuilder platformTouchBuilder(view, webTouchEvent);
         EXPECT_FLOAT_EQ(10.6f, platformTouchBuilder.touchPoints()[0].screenPos().x());
         EXPECT_FLOAT_EQ(10.4f, platformTouchBuilder.touchPoints()[0].screenPos().y());
         EXPECT_FLOAT_EQ(5.3f + pinchOffset.x(), platformTouchBuilder.touchPoints()[0].pos().x());
         EXPECT_FLOAT_EQ(5.2f + pinchOffset.y(), platformTouchBuilder.touchPoints()[0].pos().y());
     }
 }
 
+TEST(WebInputEventConversionTest, CtrlWheelScroll)

[tdresser, 2014/11/27 15:06:06]

You should either modify an existing test, or add a new one, which looks at the
case where control is not held.

[Rick Byers, 2014/11/27 15:55:15]

Lan and I took a quick look together last night and I was surprised not to find
an existing test for wheel events (other than a pinch-specific one), so I asked
her to add a new one.
Right, I'd just make this a simple generic test of PlatformWheelEventBuilder. 
The code in PlatformWheelEventBuilder is trivial enough that I don't think we
need to test a variety of possible states, just verify that each field is
getting propagated.

[lanwei, 2014/12/02 06:28:22]

Done.

[lanwei, 2014/12/02 06:28:22]

Done.

+{
+    const std::string baseURL("http://www.test4.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);
+    int pageWidth = 640;
+    int pageHeight = 480;
+    webViewImpl->resize(WebSize(pageWidth, pageHeight));
+    webViewImpl->layout();
+
+    FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
+
+    {
+        WebMouseWheelEvent webMouseWheelEvent;
+        webMouseWheelEvent.type = WebInputEvent::MouseWheel;
+        webMouseWheelEvent.x = 10;
+        webMouseWheelEvent.y = 10;
+        webMouseWheelEvent.deltaX = 5;
+        webMouseWheelEvent.deltaY = 5;
+        webMouseWheelEvent.modifiers = WebInputEvent::ControlKey;
+        webMouseWheelEvent.hasPreciseScrollingDeltas = true;
+        webMouseWheelEvent.suppressScroll = true;
+
+        PlatformWheelEventBuilder platformWheelBuilder(view, webMouseWheelEvent);
+        EXPECT_EQ(10, platformWheelBuilder.position().x());
+        EXPECT_EQ(10, platformWheelBuilder.position().y());
+        EXPECT_EQ(5, platformWheelBuilder.deltaX());
+        EXPECT_EQ(5, platformWheelBuilder.deltaY());
+        EXPECT_TRUE(platformWheelBuilder.hasPreciseScrollingDeltas());
+        EXPECT_TRUE(platformWheelBuilder.suppressScroll());
+        EXPECT_EQ(WebInputEvent::ControlKey, platformWheelBuilder.modifiers());
+    }
+}
+
 } // anonymous namespace