Report accurate Overscroll on handleWheel.

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 7604 matching lines @@
         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 ScrollByWheel(FrameTestHelpers::WebViewHelper* webViewHelper, int windowX, int windowY, float deltaX, float deltaY)
+    {
+        WebMouseWheelEvent event;
+        event.type = WebInputEvent::MouseWheel;
+        event.deltaX = deltaX;
+        event.deltaY = deltaY;
+        event.windowX = windowX;
+        event.windowY = windowY;
+        event.canScroll = true;
+        webViewHelper->webViewImpl()->handleInputEvent(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));
     }
 
@@ skipping 190 matching lines @@
     EXPECT_CALL(client, didOverscroll(WebFloatSize(-10, 0), WebFloatSize(-20, -30), WebFloatPoint(33, 33), WebFloatSize()));
     ScrollUpdate(&webViewHelper, 30, 0);
     Mock::VerifyAndClearExpectations(&client);
 
     // Overscroll is not reported.
     EXPECT_CALL(client, didOverscroll(WebFloatSize(), WebFloatSize(), WebFloatPoint(33, 33), WebFloatSize())).Times(0);
     ScrollEnd(&webViewHelper);
     Mock::VerifyAndClearExpectations(&client);
 }
 
+TEST_F(WebFrameOverscrollTest, ReportingLatestOverscrollForElasticOverscroll)
+{
+    OverscrollWebViewClient client;
+    registerMockedHttpURLLoad("overscroll/overscroll.html");
+    FrameTestHelpers::WebViewHelper webViewHelper;
+    webViewHelper.initializeAndLoad(m_baseURL + "overscroll/overscroll.html", true, 0, &client, configureAndroid);
+
+    // On disabling elasticoverscroll, overscroll is not reported on MouseWheel.

[bokan, 2015/06/26 17:40:41]

Nit: s/elasticoverscroll/reportsWheelOverscroll

[MuVen, 2015/06/29 13:27:17]

Done.

+    webViewHelper.webView()->settings()->setReportWheelOverscroll(false);
+    EXPECT_CALL(client, didOverscroll(WebFloatSize(), WebFloatSize(), WebFloatPoint(), WebFloatSize())).Times(0);
+    ScrollByWheel(&webViewHelper, 10, 10, 1000, 1000);
+    Mock::VerifyAndClearExpectations(&client);
+
+    // On enabling elasticoverscroll, overscroll is reported on MouseWheel.
+    webViewHelper.webView()->settings()->setReportWheelOverscroll(true);
+    EXPECT_CALL(client, didOverscroll(WebFloatSize(1000, 1000), WebFloatSize(1000, 1000), WebFloatPoint(), WebFloatSize()));
+    ScrollByWheel(&webViewHelper, 10, 10, 1000, 1000);
+    Mock::VerifyAndClearExpectations(&client);
+}
+
 TEST_F(WebFrameTest, OrientationFrameDetach)
 {
     RuntimeEnabledFeatures::setOrientationEventEnabled(true);
     registerMockedHttpURLLoad("orientation-frame-detach.html");
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "orientation-frame-detach.html", true);
     webViewImpl->mainFrameImpl()->sendOrientationChangeEvent();
 }
 
 TEST_F(WebFrameTest, MaxFramesDetach)
 {
     registerMockedHttpURLLoad("max-frames-detach.html");
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "max-frames-detach.html", true);
     webViewImpl->mainFrameImpl()->collectGarbage();
 }
 
 } // namespace blink