Add argument to pass elastic overscroll delta to Blink (Blink side)

Source/web/tests/PinchViewportTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "core/frame/PinchViewport.h"
 
 #include "core/frame/FrameHost.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 1050 matching lines @@
     navigateTo(m_baseURL + "content-width-1000.html");
 
     PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
     FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
     pinchViewport.setScale(1);
     EXPECT_SIZE_EQ(IntSize(100, 150), pinchViewport.visibleRect().size());
     EXPECT_SIZE_EQ(IntSize(1000, 1500), frameView.frameRect().size());
 
     // Simulate bringing down the top controls by 20px.
-    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), 1, 20);
+    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), WebFloatSize(), 1, 20);
     EXPECT_SIZE_EQ(IntSize(100, 130), pinchViewport.visibleRect().size());
 
     // Test that the scroll bounds are adjusted appropriately: the pinch viewport
     // should be shrunk by 20px to 130px. The outer viewport was shrunk to maintain the
     // aspect ratio so it's height is 1300px.
     pinchViewport.move(FloatPoint(10000, 10000));
     EXPECT_POINT_EQ(FloatPoint(900, 1300 - 130), pinchViewport.location());
 
     // The outer viewport (FrameView) should be affected as well.
     frameView.scrollBy(IntSize(10000, 10000));
     EXPECT_POINT_EQ(
         expectedMaxFrameViewScrollOffset(pinchViewport, frameView),
         frameView.scrollPosition());
 
     // Simulate bringing up the top controls by 10.5px.
-    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), 1, -10.5f);
+    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), WebFloatSize(), 1, -10.5f);
     EXPECT_SIZE_EQ(FloatSize(100, 140.5f), pinchViewport.visibleRect().size());
 
     // maximumScrollPosition floors the final values.
     pinchViewport.move(FloatPoint(10000, 10000));
     EXPECT_POINT_EQ(FloatPoint(900, floor(1405 - 140.5f)), pinchViewport.location());
 
     // The outer viewport (FrameView) should be affected as well.
     frameView.scrollBy(IntSize(10000, 10000));
     EXPECT_POINT_EQ(
         expectedMaxFrameViewScrollOffset(pinchViewport, frameView),
@@ skipping 11 matching lines @@
     PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
     FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
     pinchViewport.setScale(2);
     EXPECT_SIZE_EQ(IntSize(50, 75), pinchViewport.visibleRect().size());
     EXPECT_SIZE_EQ(IntSize(1000, 1500), frameView.frameRect().size());
 
     // Simulate bringing down the top controls by 20px. Since we're zoomed in,
     // the top controls take up half as much space (in document-space) than
     // they do at an unzoomed level.
-    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), 1, 20);
+    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), WebFloatSize(), 1, 20);
     EXPECT_SIZE_EQ(IntSize(50, 65), pinchViewport.visibleRect().size());
 
     // Test that the scroll bounds are adjusted appropriately.
     pinchViewport.move(FloatPoint(10000, 10000));
     EXPECT_POINT_EQ(FloatPoint(950, 1300 - 65), pinchViewport.location());
 
     // The outer viewport (FrameView) should be affected as well.
     frameView.scrollBy(IntSize(10000, 10000));
     IntPoint expected = expectedMaxFrameViewScrollOffset(pinchViewport, frameView);
     EXPECT_POINT_EQ(expected, frameView.scrollPosition());
 
     // Scale back out, FrameView max scroll shouldn't have changed. Pinch
     // viewport should be moved up to accomodate larger view.
-    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), 0.5f, 0);
+    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), WebFloatSize(), 0.5f, 0);
     EXPECT_EQ(1, pinchViewport.scale());
     EXPECT_POINT_EQ(expected, frameView.scrollPosition());
     frameView.scrollBy(IntSize(10000, 10000));
     EXPECT_POINT_EQ(expected, frameView.scrollPosition());
 
     EXPECT_POINT_EQ(FloatPoint(900, 1300 - 130), pinchViewport.location());
     pinchViewport.move(FloatPoint(10000, 10000));
     EXPECT_POINT_EQ(FloatPoint(900, 1300 - 130), pinchViewport.location());
 
     // Scale out, use a scale that causes fractional rects.
-    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), 0.8f, -20);
+    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), WebFloatSize(), 0.8f, -20);
     EXPECT_SIZE_EQ(FloatSize(125, 187.5), pinchViewport.visibleRect().size());
 
     // Bring out the top controls by 11px.
-    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), 1, 11);
+    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), WebFloatSize(), 1, 11);
     EXPECT_SIZE_EQ(FloatSize(125, 173.75), pinchViewport.visibleRect().size());
 
     // Ensure max scroll offsets are updated properly.
     pinchViewport.move(FloatPoint(10000, 10000));
     EXPECT_POINT_EQ(FloatPoint(875, floor(1390 - 173.75)), pinchViewport.location());
 
     frameView.scrollBy(IntSize(10000, 10000));
     EXPECT_POINT_EQ(
         expectedMaxFrameViewScrollOffset(pinchViewport, frameView),
         frameView.scrollPosition());
 
 }
 
 TEST_F(PinchViewportTest, TestTopControlsAdjustmentAndResize)
 {
     initializeWithAndroidSettings();
     webViewImpl()->resize(IntSize(100, 150));
 
     registerMockedHttpURLLoad("content-width-1000.html");
     navigateTo(m_baseURL + "content-width-1000.html");
 
     PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
     FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
     pinchViewport.setScale(2);
     EXPECT_SIZE_EQ(IntSize(50, 75), pinchViewport.visibleRect().size());
     EXPECT_SIZE_EQ(IntSize(1000, 1500), frameView.frameRect().size());
 
-    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), 1, 20);
+    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), WebFloatSize(), 1, 20);
     EXPECT_SIZE_EQ(IntSize(100, 150), pinchViewport.size());
     EXPECT_SIZE_EQ(IntSize(50, 65), pinchViewport.visibleRect().size());
 
     // Scroll all the way to the bottom.
     pinchViewport.move(FloatPoint(10000, 10000));
     frameView.scrollBy(IntSize(10000, 10000));
     IntPoint frameViewExpected = expectedMaxFrameViewScrollOffset(pinchViewport, frameView);
     FloatPoint pinchViewportExpected = FloatPoint(950, 1300 - 65);
     EXPECT_POINT_EQ(pinchViewportExpected, pinchViewport.location());
     EXPECT_POINT_EQ(frameViewExpected, frameView.scrollPosition());
@@ skipping 28 matching lines @@
     frameView.updateLayoutAndStyleForPainting();
 
     EXPECT_SIZE_EQ(IntSize(1500, 2400), IntSize(scrollLayer->bounds()));
 }
 
 // Tests that a resize due to top controls hiding doesn't incorrectly clamp the
 // main frame's scroll offset. crbug.com/428193.
 TEST_F(PinchViewportTest, TestTopControlHidingResizeDoesntClampMainFrame)
 {
     initializeWithAndroidSettings();
-    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), 1, 500);
+    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), WebFloatSize(), 1, 500);
     webViewImpl()->setTopControlsLayoutHeight(500);
     webViewImpl()->resize(IntSize(1000, 1000));
 
     registerMockedHttpURLLoad("content-width-1000.html");
     navigateTo(m_baseURL + "content-width-1000.html");
 
     // Scroll the FrameView to the bottom of the page but "hide" the top
     // controls on the compositor side so the max scroll position should account
     // for the full viewport height.
-    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), 1, -500);
+    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), WebFloatSize(), 1, -500);
     FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
     frameView.setScrollPosition(IntPoint(0, 10000));
     EXPECT_EQ(500, frameView.scrollPositionDouble().y());
 
     // Now send the resize, make sure the scroll offset doesn't change.
     webViewImpl()->setTopControlsLayoutHeight(0);
     webViewImpl()->resize(IntSize(1000, 1500));
     EXPECT_EQ(500, frameView.scrollPositionDouble().y());
 }
 
@@ skipping 58 matching lines @@
     navigateTo(m_baseURL + "content-width-1000.html");
 
     WebLocalFrameImpl* localFrame = webViewImpl()->mainFrameImpl();
     FrameView& frameView = *localFrame->frameView();
     localFrame->createFrameView();
 
     EXPECT_SIZE_EQ(IntSize(200, 400), frameView.frameRect().size());
 }
 
 } // namespace