OverscrollGlow for mainThread-{BLINK CHANGES}

Source/web/tests/WebFrameTest.cpp

Index: Source/web/tests/WebFrameTest.cpp
diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
index a9b8a62910172d7c6ce7b7f96546b23979721e0e..b1961d070eee9d182b9cfd8d19eb85b26a996d95 100644
--- a/Source/web/tests/WebFrameTest.cpp
+++ b/Source/web/tests/WebFrameTest.cpp
@@ -7341,4 +7341,148 @@ TEST_F(WebFrameTest, CreateLocalChildWithPreviousSibling)
     view->close();
 }
 
+class WebFrameOverscrollTest : public WebFrameTest {
+protected:
+    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));
+    }
+
+    void CompareUnusedDeltaAndAccumulatedRootOverscroll(FrameTestHelpers::WebViewHelper* webViewHelper, float unUsedWidth, float unUsedHeight, float accumulatedWidth, float accumulatedHeight)
+    {
+        FloatSize unUsedDelta = webViewHelper->webViewImpl()->mainFrameImpl()->frame()->eventHandler().unusedDeltaForTesting();
+        FloatSize accumulatedRootOverscroll = webViewHelper->webViewImpl()->mainFrameImpl()->frame()->eventHandler().accumulatedRootOverscrollForTesting();
+        EXPECT_FLOAT_EQ(unUsedWidth, unUsedDelta.width());

[majidvp, 2015/05/29 19:14:19]

Having the assertions in this function which is called from multiple places
makes the failure line number useless because they all point to this line
number. 

I think it is best to use inline assertions like other tests. You can use
EXPECT_FLOAT_POINT_EQ with helper function that return unused and accumulated
values as float points to cut the duplication.

[MuVen, 2015/06/01 13:29:26]

Done.

[majidvp, 2015/06/01 15:58:29]

Thanks.

+        EXPECT_FLOAT_EQ(unUsedHeight, unUsedDelta.height());
+        EXPECT_FLOAT_EQ(accumulatedWidth, accumulatedRootOverscroll.width());
+        EXPECT_FLOAT_EQ(accumulatedHeight, accumulatedRootOverscroll.height());
+    }
+};
+
+TEST_F(WebFrameOverscrollTest, AccumulatedRootOverscrollAndUnsedDeltaSetAndUnset)
+{
+    FakeCompositingWebViewClient client;
+    registerMockedHttpURLLoad("overscroll/overscroll.html");
+    FrameTestHelpers::WebViewHelper webViewHelper;
+    WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "overscroll/overscroll.html", true, 0, &client, configureAndroid);
+    webViewImpl->layout();
+
+    // Resets accumulatedRootOverscroll and unusedDelta on scroll end.
+    ScrollBegin(&webViewHelper);
+    ScrollUpdate(&webViewHelper, 0, -13);
+    ScrollEnd(&webViewHelper);
+    CompareUnusedDeltaAndAccumulatedRootOverscroll(&webViewHelper, 0, 0, 0, 0);
+
+    // Calculation of accumulatedRootOverscroll and unusedDelta on Single scrollUpdate.
+    ScrollBegin(&webViewHelper);
+    ScrollUpdate(&webViewHelper, 0, -13);
+    CompareUnusedDeltaAndAccumulatedRootOverscroll(&webViewHelper, 0, 13, 0, 13);
+    ScrollEnd(&webViewHelper);
+
+    // Calculation of accumulatedRootOverscroll and unusedDelta on multiple scrollUpdate.
+    ScrollBegin(&webViewHelper);
+    ScrollUpdate(&webViewHelper, 0, -13);
+    CompareUnusedDeltaAndAccumulatedRootOverscroll(&webViewHelper, 0, 13, 0, 13);
+    ScrollUpdate(&webViewHelper, -20, -13);
+    CompareUnusedDeltaAndAccumulatedRootOverscroll(&webViewHelper, 20, 13, 20, 26);
+    ScrollUpdate(&webViewHelper, 0, 26);
+    CompareUnusedDeltaAndAccumulatedRootOverscroll(&webViewHelper, 0, -26, 20, 0);

[majidvp, 2015/05/29 19:14:19]

Why is the unused value not 0? If the frame is being scrolled vertically both
the unused and accumulated values should be 0 at the same time.

This looks incorrect to me. I think accumulated value is 0 here because you are
scrolling an amount equal to accumulated value in reverse. The correct reset
logic should reset the accumulated value regardless of how much it is being
scrolled.

[MuVen, 2015/06/01 13:29:26]

the current reset logic fixes the issue.

[MuVen, 2015/06/01 13:29:26]

current reset logic fixes this.

[majidvp, 2015/06/01 15:58:29]

Maybe the issue is fixed but this test is not verifying that (see my original
comment again). The correct test should be:

ScrollUpdate(&webViewHelper, 0, 1); // do NOT use 26 as it masks the issue
EXPECT_FLOAT_SIZE_EQ(FloatSize(0, 0), UnusedDelta(&webViewHelper));  // unused
value should be ZERO.

EXPECT_FLOAT_SIZE_EQ(FloatSize(20, 0), AccumulatedRootOverscroll(&webViewHel
      per));

[MuVen, 2015/06/02 09:04:00]

Done.

+    ScrollUpdate(&webViewHelper, 20, 0);
+    CompareUnusedDeltaAndAccumulatedRootOverscroll(&webViewHelper, -20, 0, 0, 0);
+    ScrollEnd(&webViewHelper);
+    CompareUnusedDeltaAndAccumulatedRootOverscroll(&webViewHelper, 0, 0, 0, 0);
+}
+
+TEST_F(WebFrameOverscrollTest, RootLayerOverscrolledOnInnerDivOverScroll)
+{
+    FakeCompositingWebViewClient client;
+    registerMockedHttpURLLoad("overscroll/div-overscroll.html");
+    FrameTestHelpers::WebViewHelper webViewHelper;
+    WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "overscroll/div-overscroll.html", true, 0, &client, configureAndroid);
+    webViewImpl->layout();
+
+    ScrollBegin(&webViewHelper);
+
+    // Scroll the Div to the end.
+    ScrollUpdate(&webViewHelper, 0, -316);
+    CompareUnusedDeltaAndAccumulatedRootOverscroll(&webViewHelper, 0, 0, 0, 0);
+
+    // Now On Scrolling DIV, scroll is bubbled and root layer is over-scrolled.
+    ScrollUpdate(&webViewHelper, 0, -50);
+    CompareUnusedDeltaAndAccumulatedRootOverscroll(&webViewHelper, 0, 50, 0, 50);
+
+    ScrollEnd(&webViewHelper);
+    CompareUnusedDeltaAndAccumulatedRootOverscroll(&webViewHelper, 0, 0, 0, 0);
+}
+
+TEST_F(WebFrameOverscrollTest, RootLayerOverscrolledOnInnerIFrameOverScroll)
+{
+    FakeCompositingWebViewClient client;
+    registerMockedHttpURLLoad("overscroll/iframe-overscroll.html");
+    registerMockedHttpURLLoad("overscroll/scrollable-iframe.html");
+    FrameTestHelpers::WebViewHelper webViewHelper;
+    WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "overscroll/iframe-overscroll.html", true, 0, &client, configureAndroid);
+    webViewImpl->layout();
+
+    ScrollBegin(&webViewHelper);
+
+    // Scroll the IFrame to the end.
+    ScrollUpdate(&webViewHelper, 0, -320);
+    CompareUnusedDeltaAndAccumulatedRootOverscroll(&webViewHelper, 0, 0, 0, 0);
+
+    // Now On Scrolling IFrame, scroll is bubbled and root layer is over-scrolled.
+    ScrollUpdate(&webViewHelper, 0, -50);
+    CompareUnusedDeltaAndAccumulatedRootOverscroll(&webViewHelper, 0, 50, 0, 50);
+}
+
+TEST_F(WebFrameOverscrollTest, ScaledPageRootLayerOverscrolled)
+{
+    FakeCompositingWebViewClient client;
+    registerMockedHttpURLLoad("overscroll/overscroll.html");
+    FrameTestHelpers::WebViewHelper webViewHelper;
+    WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "overscroll/overscroll.html", true, 0, &client, configureAndroid);
+    webViewImpl->setPageScaleFactor(3.f);
+    webViewImpl->layout();
+
+    // Calculation of accumulatedRootOverscroll and unusedDelta on scaled page.
+    ScrollBegin(&webViewHelper);
+    ScrollUpdate(&webViewHelper, 0, 30);
+    CompareUnusedDeltaAndAccumulatedRootOverscroll(&webViewHelper, 0, -10, 0, -10);
+
+    ScrollUpdate(&webViewHelper, 0, 30);
+    CompareUnusedDeltaAndAccumulatedRootOverscroll(&webViewHelper, 0, -10, 0, -20);
+
+    ScrollUpdate(&webViewHelper, 30, 30);
+    CompareUnusedDeltaAndAccumulatedRootOverscroll(&webViewHelper, -10, -10, -10, -30);
+
+    ScrollUpdate(&webViewHelper, 30, 0);
+    CompareUnusedDeltaAndAccumulatedRootOverscroll(&webViewHelper, -10, 0, -20, -30);
+
+    ScrollEnd(&webViewHelper);
+    CompareUnusedDeltaAndAccumulatedRootOverscroll(&webViewHelper, 0, 0, 0, 0);
+}
+
 } // namespace blink