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 20 matching lines @@
 #include "config.h"
 
 #include "web/WebInputEventConversion.h"
 
 #include "core/dom/Touch.h"
 #include "core/dom/TouchList.h"
 #include "core/events/GestureEvent.h"
 #include "core/events/KeyboardEvent.h"
 #include "core/events/MouseEvent.h"
 #include "core/events/TouchEvent.h"
+#include "core/events/WheelEvent.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/page/Page.h"
 #include "core/rendering/RenderView.h"
 #include "core/testing/URLTestHelpers.h"
 #include "public/web/WebFrame.h"
 #include "public/web/WebSettings.h"
 #include "web/WebViewImpl.h"
 #include "web/tests/FrameTestHelpers.h"
@@ skipping 655 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, WebMouseWheelEventBuilder)
+{
+    const std::string baseURL("http://www.test5.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();
+
+    RefPtrWillBeRawPtr<Document> document = toLocalFrame(webViewImpl->page()->mainFrame())->document();
+    RefPtrWillBeRawPtr<WheelEvent> event = WheelEvent::create(FloatPoint(1, 3), FloatPoint(5, 10),
+        WheelEvent::DOM_DELTA_PAGE, document.get()->domWindow(),  IntPoint(2, 6), IntPoint(10, 30),
+        true, false, false, false, true);
+    WebMouseWheelEventBuilder webMouseWheel(toLocalFrame(webViewImpl->page()->mainFrame())->view(), document.get()->renderView(), *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_NE(WebInputEvent::AltKey, webMouseWheel.modifiers);
+    EXPECT_NE(WebInputEvent::ShiftKey, webMouseWheel.modifiers);
+    EXPECT_NE(WebInputEvent::MetaKey, webMouseWheel.modifiers);

[Rick Byers, 2014/12/03 14:03:04]

nit: these three EXPECT_NE are unnecessary.  modifiers is a set of flags and
we're checking equality of the whole value, so checking modifiers==ControlKey
means that modifiers can't possibly have any other value (eg. ControlKey |
AltKey wouldn't pass the EQ test).

[lanwei, 2014/12/09 05:16:49]

Done.

+    EXPECT_TRUE(webMouseWheel.canScroll);
+}
+
+TEST(WebInputEventConversionTest, PlatformWheelEventBuilder)
+{
+    const std::string baseURL("http://www.test6.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 = 0;
+        webMouseWheelEvent.y = 5;
+        webMouseWheelEvent.deltaX = 10;
+        webMouseWheelEvent.deltaY = 15;
+        webMouseWheelEvent.modifiers = WebInputEvent::ControlKey;
+        webMouseWheelEvent.hasPreciseScrollingDeltas = true;
+        webMouseWheelEvent.canScroll = true;
+
+        PlatformWheelEventBuilder platformWheelBuilder(view, webMouseWheelEvent);
+        EXPECT_EQ(0, platformWheelBuilder.position().x());
+        EXPECT_EQ(5, platformWheelBuilder.position().y());
+        EXPECT_EQ(10, platformWheelBuilder.deltaX());
+        EXPECT_EQ(15, platformWheelBuilder.deltaY());
+        EXPECT_EQ(WebInputEvent::ControlKey, platformWheelBuilder.modifiers());
+        EXPECT_TRUE(platformWheelBuilder.hasPreciseScrollingDeltas());
+        EXPECT_TRUE(platformWheelBuilder.canScroll());
+    }
+}
 } // anonymous namespace