Normalize top controls offset to (0, 1), 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 1039 matching lines @@
     webViewImpl()->resizePinchViewport(IntSize(100, 100));
     webViewImpl()->setPageScaleFactor(1.5f);
     frame()->view()->scrollTo(IntPoint(50, 50));
     pinchViewport.setLocation(FloatPoint(0, 10));
 
     pinchViewport.scrollIntoView(LayoutRect(pinchViewport.visibleRectInDocument()));
     EXPECT_POINT_EQ(IntPoint(50, 50), frame()->view()->scrollPosition());
     EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 10), pinchViewport.visibleRect().location());
 }
 
-#if OS(ANDROID)
-
 // Top controls can make an unscrollable page temporarily scrollable, causing
 // a scroll clamp when the page is resized. Make sure this bug is fixed.
 // crbug.com/437620
 TEST_F(PinchViewportTest, TestResizeDoesntChangeScrollOffset)
 {
     initializeWithAndroidSettings();
     webViewImpl()->resize(IntSize(980, 650));
 
     navigateTo("about:blank");
 
     PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
     FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
+    webViewImpl()->setTopControlsHeight(20, false);
+
     // Outer viewport isn't scrollable
     EXPECT_SIZE_EQ(IntSize(980, 650), frameView.visibleContentRect().size());
 
     pinchViewport.setScale(2);
     pinchViewport.move(FloatPoint(0, 40));
 
     // Simulate bringing down the top controls by 20px but counterscrolling the outer viewport.
-    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(0, 20), WebFloatSize(), 1, 20);
+    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(0, 20), WebFloatSize(), 1, 1);
 
     EXPECT_EQ(20, frameView.scrollPosition().y());
 
-    webViewImpl()->setTopControlsLayoutHeight(20);
+    webViewImpl()->setTopControlsHeight(20, true);
     webViewImpl()->resize(WebSize(980, 630));
 
     EXPECT_EQ(0, frameView.scrollPosition().y());
     EXPECT_EQ(60, pinchViewport.location().y());
 }
 
 static IntPoint expectedMaxFrameViewScrollOffset(PinchViewport& pinchViewport, FrameView& frameView)
 {
     float aspectRatio = pinchViewport.visibleRect().width() / pinchViewport.visibleRect().height();
     float newHeight = frameView.frameRect().width() / aspectRatio;
     return IntPoint(
         frameView.contentsSize().width() - frameView.frameRect().width(),
         frameView.contentsSize().height() - newHeight);
 }
 
 TEST_F(PinchViewportTest, TestTopControlsAdjustment)
 {
     initializeWithAndroidSettings();
     webViewImpl()->resize(IntSize(500, 450));
 
     registerMockedHttpURLLoad("content-width-1000.html");
     navigateTo(m_baseURL + "content-width-1000.html");
 
     PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
     FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
+    webViewImpl()->setTopControlsHeight(20, false);
+
     pinchViewport.setScale(1);
     EXPECT_SIZE_EQ(IntSize(500, 450), pinchViewport.visibleRect().size());
     EXPECT_SIZE_EQ(IntSize(1000, 900), frameView.frameRect().size());
 
     // Simulate bringing down the top controls by 20px.
-    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), WebFloatSize(), 1, 20);
+    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), WebFloatSize(), 1, 1);
     EXPECT_SIZE_EQ(IntSize(500, 430), pinchViewport.visibleRect().size());
 
     // Test that the scroll bounds are adjusted appropriately: the pinch viewport
     // should be shrunk by 20px to 430px. The outer viewport was shrunk to maintain the
     // aspect ratio so it's height is 860px.
     pinchViewport.move(FloatPoint(10000, 10000));
     EXPECT_POINT_EQ(FloatPoint(500, 860 - 430), 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(), WebFloatSize(), 1, -10.5f);
+    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), WebFloatSize(), 1, -10.5f / 20);
     EXPECT_SIZE_EQ(FloatSize(500, 440.5f), pinchViewport.visibleRect().size());
 
     // maximumScrollPosition floors the final values.
     pinchViewport.move(FloatPoint(10000, 10000));
     EXPECT_POINT_EQ(FloatPoint(500, floor(881 - 440.5f)), pinchViewport.location());
 
     // The outer viewport (FrameView) should be affected as well.
     frameView.scrollBy(IntSize(10000, 10000));
     EXPECT_POINT_EQ(
         expectedMaxFrameViewScrollOffset(pinchViewport, frameView),
         frameView.scrollPosition());
 }
 
 TEST_F(PinchViewportTest, TestTopControlsAdjustmentWithScale)
 {
     initializeWithAndroidSettings();
     webViewImpl()->resize(IntSize(500, 450));
 
     registerMockedHttpURLLoad("content-width-1000.html");
     navigateTo(m_baseURL + "content-width-1000.html");
 
     PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
     FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
+    webViewImpl()->setTopControlsHeight(20, false);
+
     pinchViewport.setScale(2);
     EXPECT_SIZE_EQ(IntSize(250, 225), pinchViewport.visibleRect().size());
     EXPECT_SIZE_EQ(IntSize(1000, 900), 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(), WebFloatSize(), 1, 20);
+    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), WebFloatSize(), 1, 1);
     EXPECT_SIZE_EQ(IntSize(250, 215), pinchViewport.visibleRect().size());
 
     // Test that the scroll bounds are adjusted appropriately.
     pinchViewport.move(FloatPoint(10000, 10000));
     EXPECT_POINT_EQ(FloatPoint(750, 860 - 215), 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(), 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(500, 860 - 430), pinchViewport.location());
     pinchViewport.move(FloatPoint(10000, 10000));
     EXPECT_POINT_EQ(FloatPoint(500, 860 - 430), pinchViewport.location());
 
     // Scale out, use a scale that causes fractional rects.
-    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), WebFloatSize(), 0.8f, -20);
+    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), WebFloatSize(), 0.8f, -1);
     EXPECT_SIZE_EQ(FloatSize(625, 562.5), pinchViewport.visibleRect().size());
 
     // Bring out the top controls by 11
-    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), WebFloatSize(), 1, 11);
+    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), WebFloatSize(), 1, 11 / 20.f);
     EXPECT_SIZE_EQ(FloatSize(625, 548.75), pinchViewport.visibleRect().size());
 
     // Ensure max scroll offsets are updated properly.
     pinchViewport.move(FloatPoint(10000, 10000));
     EXPECT_POINT_EQ(FloatPoint(375, floor(877 - 548.75)), pinchViewport.location());
 
     frameView.scrollBy(IntSize(10000, 10000));
     EXPECT_POINT_EQ(
         expectedMaxFrameViewScrollOffset(pinchViewport, frameView),
         frameView.scrollPosition());
 
 }
 
 TEST_F(PinchViewportTest, TestTopControlsAdjustmentAndResize)
 {
     initializeWithAndroidSettings();
     webViewImpl()->resize(IntSize(500, 450));
 
     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(250, 225), pinchViewport.visibleRect().size());
     EXPECT_SIZE_EQ(IntSize(1000, 900), frameView.frameRect().size());
 
-    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), WebFloatSize(), 1, 20);
+    webViewImpl()->setTopControlsHeight(20, false);
+
+    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), WebFloatSize(), 1, 1);
     EXPECT_SIZE_EQ(IntSize(500, 450), pinchViewport.size());
     EXPECT_SIZE_EQ(IntSize(250, 215), 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(750, 860 - 215);
     EXPECT_POINT_EQ(pinchViewportExpected, pinchViewport.location());
     EXPECT_POINT_EQ(frameViewExpected, frameView.scrollPosition());
 
     // Resize the widget to match the top controls adjustment. Ensure that scroll
     // offsets don't get clamped in the the process.
-    webViewImpl()->setTopControlsLayoutHeight(20);
+    webViewImpl()->setTopControlsHeight(20, true);
     webViewImpl()->resize(WebSize(500, 430));
 
     EXPECT_SIZE_EQ(IntSize(500, 430), pinchViewport.size());
     EXPECT_SIZE_EQ(IntSize(250, 215), pinchViewport.visibleRect().size());
     EXPECT_SIZE_EQ(IntSize(1000, 860), frameView.frameRect().size());
 
     EXPECT_POINT_EQ(frameViewExpected, frameView.scrollPosition());
     EXPECT_POINT_EQ(pinchViewportExpected, pinchViewport.location());
 }
 
 // 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(), WebFloatSize(), 1, 500);
-    webViewImpl()->setTopControlsLayoutHeight(500);
+    webViewImpl()->setTopControlsHeight(500, false);
+    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), WebFloatSize(), 1, 1);
+    webViewImpl()->setTopControlsHeight(500, true);
     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(), WebFloatSize(), 1, -500);
+    webViewImpl()->applyViewportDeltas(WebSize(), WebSize(), WebFloatSize(), 1, -1);
     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()->setTopControlsHeight(500, false);
     webViewImpl()->resize(IntSize(1000, 1500));
     EXPECT_EQ(500, frameView.scrollPositionDouble().y());
 }
-#endif
 
 // Tests that the layout viewport's scroll layer bounds are updated in a compositing
 // change update. crbug.com/423188.
 TEST_F(PinchViewportTest, TestChangingContentSizeAffectsScrollBounds)
 {
     initializeWithAndroidSettings();
     webViewImpl()->resize(IntSize(100, 150));
 
     registerMockedHttpURLLoad("content-width-1000.html");
     navigateTo(m_baseURL + "content-width-1000.html");
@@ skipping 70 matching lines @@
     navigateTo(m_baseURL + "content-width-1000-min-scale.html");
 
     WebLocalFrameImpl* localFrame = webViewImpl()->mainFrameImpl();
     localFrame->createFrameView();
 
     FrameView& frameView = *localFrame->frameView();
     EXPECT_SIZE_EQ(IntSize(200, 400), frameView.frameRect().size());
 }
 
 } // namespace