OverscrollGlow for mainThread-{BLINK CHANGES}

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 219 matching lines @@
         registerMockedHttpURLLoad("nodeimage.html");
         webViewHelper->initializeAndLoad(m_baseURL + "nodeimage.html");
         webViewHelper->webView()->resize(WebSize(640, 480));
         webViewHelper->webView()->layout();
         RefPtrWillBeRawPtr<LocalFrame> frame = toLocalFrame(webViewHelper->webViewImpl()->page()->mainFrame());
         ASSERT(frame);
         Element* element = frame->document()->getElementById(testcase.c_str());
         return frame->nodeImage(*element);
     }
 
+    WebGestureEvent generateEvent(WebInputEvent::Type type, int deltaX = 0, int deltaY = 0)
+    {
+        WebGestureEvent event;
+        event.type = type;
+        event.x = 100;
+        event.y = 100;
+        if (type == WebInputEvent::GestureScrollUpdate) {
+            event.data.scrollUpdate.deltaX = deltaX;
+            event.data.scrollUpdate.deltaY = deltaY;
+        }
+        return event;
+    }
+
+    void ScrollBegin(FrameTestHelpers::WebViewHelper* webViewHelper)
+    {
+        webViewHelper->webViewImpl()->handleInputEvent(generateEvent(WebInputEvent::GestureScrollBegin));
+    }
+
+    void ScrollUpdate(FrameTestHelpers::WebViewHelper* webViewHelper, float deltaX, float deltaY)
+    {
+        webViewHelper->webViewImpl()->handleInputEvent(generateEvent(WebInputEvent::GestureScrollUpdate, deltaX, deltaY));
+    }
+
+    void ScrollEnd(FrameTestHelpers::WebViewHelper* webViewHelper)
+    {
+        webViewHelper->webViewImpl()->handleInputEvent(generateEvent(WebInputEvent::GestureScrollEnd));
+    }
+
     std::string m_baseURL;
     std::string m_notBaseURL;
     std::string m_chromeURL;
 };
 
 TEST_F(WebFrameTest, ContentText)
 {
     registerMockedHttpURLLoad("iframes_test.html");
     registerMockedHttpURLLoad("visible_iframe.html");
     registerMockedHttpURLLoad("invisible_iframe.html");
@@ skipping 5958 matching lines @@
 
     // Verify that the main frame is scrollable upon exiting fullscreen.
     webViewImpl->didExitFullScreen();
     webViewImpl->layout();
     ASSERT_FALSE(Fullscreen::isFullScreen(*document));
     webScrollLayer = webViewImpl->compositor()->scrollLayer()->platformLayer();
     ASSERT_TRUE(webScrollLayer->userScrollableHorizontal());
     ASSERT_TRUE(webScrollLayer->userScrollableVertical());
 }
 
+TEST_F(WebFrameTest, OverscrollGlowAnimation)
+{
+    FakeCompositingWebViewClient client;
+    registerMockedHttpURLLoad("mainthread-scrolling.html");
+    FrameTestHelpers::WebViewHelper webViewHelper;
+    WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "mainthread-scrolling.html", true, 0, &client, configureAndroid);
+    webViewImpl->settings()->setThreadedScrollingEnabled(false);

[majidvp, 2015/05/14 21:08:39]

Do you really need this?

[MuVen, 2015/05/26 09:58:35]

Not requried. 

+    webViewImpl->layout();
+
+    ScrollBegin(&webViewHelper);
+
+    ScrollUpdate(&webViewHelper, 0, -13);
+    FloatSize unUsedDelta = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().unusedDeltaForTesting();
+    FloatSize accumulatedRootOverscroll = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().accumulatedRootOverscrollForTesting();
+    EXPECT_EQ(0, unUsedDelta.width());
+    EXPECT_EQ(13, unUsedDelta.height());
+    EXPECT_EQ(0, accumulatedRootOverscroll.width());
+    EXPECT_EQ(13, accumulatedRootOverscroll.height());
+
+    ScrollUpdate(&webViewHelper, 0, -13);
+    unUsedDelta = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().unusedDeltaForTesting();
+    accumulatedRootOverscroll = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().accumulatedRootOverscrollForTesting();
+    EXPECT_EQ(0, unUsedDelta.width());
+    EXPECT_EQ(13, unUsedDelta.height());
+    EXPECT_EQ(0, accumulatedRootOverscroll.width());
+    EXPECT_EQ(26, accumulatedRootOverscroll.height());
+
+    ScrollUpdate(&webViewHelper, -20, -13);
+    unUsedDelta = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().unusedDeltaForTesting();
+    accumulatedRootOverscroll = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().accumulatedRootOverscrollForTesting();
+    EXPECT_EQ(20, unUsedDelta.width());
+    EXPECT_EQ(13, unUsedDelta.height());
+    EXPECT_EQ(20, accumulatedRootOverscroll.width());
+    EXPECT_EQ(39, accumulatedRootOverscroll.height());
+
+    ScrollEnd(&webViewHelper);
+    unUsedDelta = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().unusedDeltaForTesting();
+    accumulatedRootOverscroll = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().accumulatedRootOverscrollForTesting();
+    EXPECT_EQ(0, unUsedDelta.width());
+    EXPECT_EQ(0, unUsedDelta.height());
+    EXPECT_EQ(0, accumulatedRootOverscroll.width());
+    EXPECT_EQ(0, accumulatedRootOverscroll.height());
+}
+
+TEST_F(WebFrameTest, OverscrollGlowAnimationForInnerScroll)
+{
+    FakeCompositingWebViewClient client;
+    registerMockedHttpURLLoad("mainthread-inner-overscroll.html");
+    FrameTestHelpers::WebViewHelper webViewHelper;
+    WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "mainthread-inner-overscroll.html", true, 0, &client, configureAndroid);
+    webViewImpl->settings()->setThreadedScrollingEnabled(false);
+    webViewImpl->layout();
+
+    ScrollBegin(&webViewHelper);
+
+    ScrollUpdate(&webViewHelper, 0, 13);
+    FloatSize unUsedDelta = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().unusedDeltaForTesting();
+    FloatSize accumulatedRootOverscroll = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().accumulatedRootOverscrollForTesting();
+    EXPECT_EQ(0, unUsedDelta.width());
+    EXPECT_EQ(-13, unUsedDelta.height());
+    EXPECT_EQ(0, accumulatedRootOverscroll.width());
+    EXPECT_EQ(-13, accumulatedRootOverscroll.height());
+
+    ScrollUpdate(&webViewHelper, 0, 13);
+    unUsedDelta = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().unusedDeltaForTesting();
+    accumulatedRootOverscroll = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().accumulatedRootOverscrollForTesting();
+    EXPECT_EQ(0, unUsedDelta.width());
+    EXPECT_EQ(-13, unUsedDelta.height());
+    EXPECT_EQ(0, accumulatedRootOverscroll.width());
+    EXPECT_EQ(-26, accumulatedRootOverscroll.height());
+
+    ScrollUpdate(&webViewHelper, 13, 13);
+    unUsedDelta = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().unusedDeltaForTesting();
+    accumulatedRootOverscroll = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().accumulatedRootOverscrollForTesting();
+    EXPECT_EQ(-13, unUsedDelta.width());
+    EXPECT_EQ(-13, unUsedDelta.height());
+    EXPECT_EQ(-13, accumulatedRootOverscroll.width());
+    EXPECT_EQ(-39, accumulatedRootOverscroll.height());
+
+    ScrollUpdate(&webViewHelper, 13, 0);
+    unUsedDelta = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().unusedDeltaForTesting();
+    accumulatedRootOverscroll = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().accumulatedRootOverscrollForTesting();
+    EXPECT_EQ(-13, unUsedDelta.width());
+    EXPECT_EQ(0, unUsedDelta.height());
+    EXPECT_EQ(-26, accumulatedRootOverscroll.width());
+    EXPECT_EQ(-39, accumulatedRootOverscroll.height());
+
+    ScrollEnd(&webViewHelper);
+    unUsedDelta = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().unusedDeltaForTesting();
+    accumulatedRootOverscroll = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->eventHandler().accumulatedRootOverscrollForTesting();
+    EXPECT_EQ(0, unUsedDelta.width());
+    EXPECT_EQ(0, unUsedDelta.height());
+    EXPECT_EQ(0, accumulatedRootOverscroll.width());
+    EXPECT_EQ(0, accumulatedRootOverscroll.height());
+}
+
 TEST_F(WebFrameTest, FullscreenMainFrame)
 {
     FakeCompositingWebViewClient client;
     registerMockedHttpURLLoad("fullscreen_div.html");
     FrameTestHelpers::WebViewHelper webViewHelper;
     int viewportWidth = 640;
     int viewportHeight = 480;
     WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_div.html", true, 0, &client, configureAndroid);
     webViewImpl->resize(WebSize(viewportWidth, viewportHeight));
     webViewImpl->layout();
@@ skipping 1177 matching lines @@
 
     EXPECT_EQ(parent, firstFrame->parent());
     EXPECT_EQ(parent, secondFrame->parent());
     EXPECT_EQ(parent, thirdFrame->parent());
     EXPECT_EQ(parent, fourthFrame->parent());
 
     view->close();
 }
 
 } // namespace blink