Rename classes related to top controls

third_party/WebKit/Source/web/tests/VisualViewportTest.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 "core/frame/VisualViewport.h"
 
 #include "core/dom/Document.h"
+#include "core/frame/BrowserControls.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
-#include "core/frame/TopControls.h"
 #include "core/html/HTMLBodyElement.h"
 #include "core/html/HTMLElement.h"
 #include "core/input/EventHandler.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/page/Page.h"
 #include "platform/PlatformGestureEvent.h"
 #include "platform/geometry/DoublePoint.h"
 #include "platform/geometry/DoubleRect.h"
@@ skipping 1260 matching lines @@
     VisualViewport& visualViewport,
     FrameView& frameView) {
   float aspectRatio = visualViewport.visibleRect().width() /
                       visualViewport.visibleRect().height();
   float newHeight = frameView.frameRect().width() / aspectRatio;
   return ScrollOffset(
       frameView.contentsSize().width() - frameView.frameRect().width(),
       frameView.contentsSize().height() - newHeight);
 }
 
-TEST_F(VisualViewportTest, TestTopControlsAdjustment) {
+TEST_F(VisualViewportTest, TestBrowserControlsAdjustment) {
   initializeWithAndroidSettings();
-  webViewImpl()->resizeWithTopControls(IntSize(500, 450), 20, false);
+  webViewImpl()->resizeWithBrowserControls(IntSize(500, 450), 20, false);
 
   registerMockedHttpURLLoad("content-width-1000.html");
   navigateTo(m_baseURL + "content-width-1000.html");
 
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
   visualViewport.setScale(1);
   EXPECT_SIZE_EQ(IntSize(500, 450), visualViewport.visibleRect().size());
   EXPECT_SIZE_EQ(IntSize(1000, 900), frameView.frameRect().size());
 
-  // Simulate bringing down the top controls by 20px.
+  // Simulate bringing down the browser controls by 20px.
   webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
                                      WebFloatSize(), 1, 1);
   EXPECT_SIZE_EQ(IntSize(500, 430), visualViewport.visibleRect().size());
 
   // Test that the scroll bounds are adjusted appropriately: the visual viewport
   // should be shrunk by 20px to 430px. The outer viewport was shrunk to
   // maintain the
   // aspect ratio so it's height is 860px.
   visualViewport.move(ScrollOffset(10000, 10000));
   EXPECT_SIZE_EQ(FloatSize(500, 860 - 430), visualViewport.scrollOffset());
 
   // The outer viewport (FrameView) should be affected as well.
   frameView.scrollBy(ScrollOffset(10000, 10000), UserScroll);
   EXPECT_SIZE_EQ(expectedMaxFrameViewScrollOffset(visualViewport, frameView),
                  frameView.scrollOffset());
 
-  // Simulate bringing up the top controls by 10.5px.
+  // Simulate bringing up the browser controls by 10.5px.
   webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
                                      WebFloatSize(), 1, -10.5f / 20);
   EXPECT_FLOAT_SIZE_EQ(FloatSize(500, 440.5f),
                        visualViewport.visibleRect().size());
 
-  // maximumScrollPosition |ceil|s the top controls adjustment.
+  // maximumScrollPosition |ceil|s the browser controls adjustment.
   visualViewport.move(ScrollOffset(10000, 10000));
   EXPECT_FLOAT_SIZE_EQ(FloatSize(500, 881 - 441),
                        visualViewport.scrollOffset());
 
   // The outer viewport (FrameView) should be affected as well.
   frameView.scrollBy(ScrollOffset(10000, 10000), UserScroll);
   EXPECT_SIZE_EQ(expectedMaxFrameViewScrollOffset(visualViewport, frameView),
                  frameView.scrollOffset());
 }
 
-TEST_F(VisualViewportTest, TestTopControlsAdjustmentWithScale) {
+TEST_F(VisualViewportTest, TestBrowserControlsAdjustmentWithScale) {
   initializeWithAndroidSettings();
-  webViewImpl()->resizeWithTopControls(IntSize(500, 450), 20, false);
+  webViewImpl()->resizeWithBrowserControls(IntSize(500, 450), 20, false);
 
   registerMockedHttpURLLoad("content-width-1000.html");
   navigateTo(m_baseURL + "content-width-1000.html");
 
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
   visualViewport.setScale(2);
   EXPECT_SIZE_EQ(IntSize(250, 225), visualViewport.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.
+  // Simulate bringing down the browser controls by 20px. Since we're zoomed in,
+  // the browser controls take up half as much space (in document-space) than
+  // they do at an unzoomed level.
   webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
                                      WebFloatSize(), 1, 1);
   EXPECT_SIZE_EQ(IntSize(250, 215), visualViewport.visibleRect().size());
 
   // Test that the scroll bounds are adjusted appropriately.
   visualViewport.move(ScrollOffset(10000, 10000));
   EXPECT_SIZE_EQ(FloatSize(750, 860 - 215), visualViewport.scrollOffset());
 
   // The outer viewport (FrameView) should be affected as well.
   frameView.scrollBy(ScrollOffset(10000, 10000), UserScroll);
@@ skipping 12 matching lines @@
 
   EXPECT_SIZE_EQ(FloatSize(500, 860 - 430), visualViewport.scrollOffset());
   visualViewport.move(ScrollOffset(10000, 10000));
   EXPECT_SIZE_EQ(FloatSize(500, 860 - 430), visualViewport.scrollOffset());
 
   // Scale out, use a scale that causes fractional rects.
   webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
                                      WebFloatSize(), 0.8f, -1);
   EXPECT_SIZE_EQ(FloatSize(625, 562.5), visualViewport.visibleRect().size());
 
-  // Bring out the top controls by 11
+  // Bring out the browser controls by 11
   webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
                                      WebFloatSize(), 1, 11 / 20.f);
   EXPECT_SIZE_EQ(FloatSize(625, 548.75), visualViewport.visibleRect().size());
 
   // Ensure max scroll offsets are updated properly.
   visualViewport.move(ScrollOffset(10000, 10000));
   EXPECT_FLOAT_SIZE_EQ(FloatSize(375, 877.5 - 548.75),
                        visualViewport.scrollOffset());
 
   frameView.scrollBy(ScrollOffset(10000, 10000), UserScroll);
   EXPECT_SIZE_EQ(expectedMaxFrameViewScrollOffset(visualViewport, frameView),
                  frameView.scrollOffset());
 }
 
 // Tests that a scroll all the way to the bottom of the page, while hiding the
-// top controls doesn't cause a clamp in the viewport scroll offset when the top
-// controls initiated resize occurs.
-TEST_F(VisualViewportTest, TestTopControlsAdjustmentAndResize) {
-  int topControlsHeight = 20;
+// browser controls doesn't cause a clamp in the viewport scroll offset when the
+// top controls initiated resize occurs.
+TEST_F(VisualViewportTest, TestBrowserControlsAdjustmentAndResize) {
+  int browserControlsHeight = 20;
   int visualViewportHeight = 450;
   int layoutViewportHeight = 900;
   float pageScale = 2;
   float minPageScale = 0.5;
 
   initializeWithAndroidSettings();
 
-  // Initialize with top controls showing and shrinking the Blink size.
-  webViewImpl()->resizeWithTopControls(
-      WebSize(500, visualViewportHeight - topControlsHeight), 20, true);
-  webViewImpl()->topControls().setShownRatio(1);
+  // Initialize with browser controls showing and shrinking the Blink size.
+  webViewImpl()->resizeWithBrowserControls(
+      WebSize(500, visualViewportHeight - browserControlsHeight), 20, true);
+  webViewImpl()->browserControls().setShownRatio(1);
 
   registerMockedHttpURLLoad("content-width-1000.html");
   navigateTo(m_baseURL + "content-width-1000.html");
 
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
   visualViewport.setScale(pageScale);
   EXPECT_SIZE_EQ(
-      IntSize(250, (visualViewportHeight - topControlsHeight) / pageScale),
+      IntSize(250, (visualViewportHeight - browserControlsHeight) / pageScale),
       visualViewport.visibleRect().size());
-  EXPECT_SIZE_EQ(
-      IntSize(1000, layoutViewportHeight - topControlsHeight / minPageScale),
-      frameView.frameRect().size());
-  EXPECT_SIZE_EQ(IntSize(500, visualViewportHeight - topControlsHeight),
+  EXPECT_SIZE_EQ(IntSize(1000, layoutViewportHeight -
+                                   browserControlsHeight / minPageScale),
+                 frameView.frameRect().size());
+  EXPECT_SIZE_EQ(IntSize(500, visualViewportHeight - browserControlsHeight),
                  visualViewport.size());
 
-  // Scroll all the way to the bottom, hiding the top controls in the process.
+  // Scroll all the way to the bottom, hiding the browser controls in the
+  // process.
   visualViewport.move(ScrollOffset(10000, 10000));
   frameView.scrollBy(ScrollOffset(10000, 10000), UserScroll);
-  webViewImpl()->topControls().setShownRatio(0);
+  webViewImpl()->browserControls().setShownRatio(0);
 
   EXPECT_SIZE_EQ(IntSize(250, visualViewportHeight / pageScale),
                  visualViewport.visibleRect().size());
 
   ScrollOffset frameViewExpected =
       expectedMaxFrameViewScrollOffset(visualViewport, frameView);
   ScrollOffset visualViewportExpected = ScrollOffset(
       750, layoutViewportHeight - visualViewportHeight / pageScale);
 
   EXPECT_SIZE_EQ(visualViewportExpected, visualViewport.scrollOffset());
   EXPECT_SIZE_EQ(frameViewExpected, frameView.scrollOffset());
 
   ScrollOffset totalExpected = visualViewportExpected + frameViewExpected;
 
-  // Resize the widget to match the top controls adjustment. Ensure that the
+  // Resize the widget to match the browser controls adjustment. Ensure that the
   // total offset (i.e. what the user sees) doesn't change because of clamping
   // the offsets to valid values.
-  webViewImpl()->resizeWithTopControls(WebSize(500, visualViewportHeight), 20,
-                                       false);
+  webViewImpl()->resizeWithBrowserControls(WebSize(500, visualViewportHeight),
+                                           20, false);
 
   EXPECT_SIZE_EQ(IntSize(500, visualViewportHeight), visualViewport.size());
   EXPECT_SIZE_EQ(IntSize(250, visualViewportHeight / pageScale),
                  visualViewport.visibleRect().size());
   EXPECT_SIZE_EQ(IntSize(1000, layoutViewportHeight),
                  frameView.frameRect().size());
   EXPECT_SIZE_EQ(totalExpected,
                  visualViewport.scrollOffset() + frameView.scrollOffset());
 }
 
-// Tests that a scroll all the way to the bottom while showing the top controls
-// doesn't cause a clamp to the viewport scroll offset when the top controls
-// initiated resize occurs.
-TEST_F(VisualViewportTest, TestTopControlsShrinkAdjustmentAndResize) {
-  int topControlsHeight = 20;
+// Tests that a scroll all the way to the bottom while showing the browser
+// controls doesn't cause a clamp to the viewport scroll offset when the browser
+// controls initiated resize occurs.
+TEST_F(VisualViewportTest, TestBrowserControlsShrinkAdjustmentAndResize) {
+  int browserControlsHeight = 20;
   int visualViewportHeight = 500;
   int layoutViewportHeight = 1000;
   int contentHeight = 2000;
   float pageScale = 2;
   float minPageScale = 0.5;
 
   initializeWithAndroidSettings();
 
-  // Initialize with top controls hidden and not shrinking the Blink size.
-  webViewImpl()->resizeWithTopControls(IntSize(500, visualViewportHeight), 20,
-                                       false);
-  webViewImpl()->topControls().setShownRatio(0);
+  // Initialize with browser controls hidden and not shrinking the Blink size.
+  webViewImpl()->resizeWithBrowserControls(IntSize(500, visualViewportHeight),
+                                           20, false);
+  webViewImpl()->browserControls().setShownRatio(0);
 
   registerMockedHttpURLLoad("content-width-1000.html");
   navigateTo(m_baseURL + "content-width-1000.html");
 
   VisualViewport& visualViewport =
       frame()->page()->frameHost().visualViewport();
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
   visualViewport.setScale(pageScale);
   EXPECT_SIZE_EQ(IntSize(250, visualViewportHeight / pageScale),
                  visualViewport.visibleRect().size());
   EXPECT_SIZE_EQ(IntSize(1000, layoutViewportHeight),
                  frameView.frameRect().size());
   EXPECT_SIZE_EQ(IntSize(500, visualViewportHeight), visualViewport.size());
 
-  // Scroll all the way to the bottom, showing the the top controls in the
+  // Scroll all the way to the bottom, showing the the browser controls in the
   // process. (This could happen via window.scrollTo during a scroll, for
   // example).
-  webViewImpl()->topControls().setShownRatio(1);
+  webViewImpl()->browserControls().setShownRatio(1);
   visualViewport.move(ScrollOffset(10000, 10000));
   frameView.scrollBy(ScrollOffset(10000, 10000), UserScroll);
 
   EXPECT_SIZE_EQ(
-      IntSize(250, (visualViewportHeight - topControlsHeight) / pageScale),
+      IntSize(250, (visualViewportHeight - browserControlsHeight) / pageScale),
       visualViewport.visibleRect().size());
 
   ScrollOffset frameViewExpected(
       0, contentHeight -
-             (layoutViewportHeight - topControlsHeight / minPageScale));
+             (layoutViewportHeight - browserControlsHeight / minPageScale));
   ScrollOffset visualViewportExpected = ScrollOffset(
-      750, (layoutViewportHeight - topControlsHeight / minPageScale -
+      750, (layoutViewportHeight - browserControlsHeight / minPageScale -
             visualViewport.visibleRect().height()));
 
   EXPECT_SIZE_EQ(visualViewportExpected, visualViewport.scrollOffset());
   EXPECT_SIZE_EQ(frameViewExpected, frameView.scrollOffset());
 
   ScrollOffset totalExpected = visualViewportExpected + frameViewExpected;
 
-  // Resize the widget to match the top controls adjustment. Ensure that the
+  // Resize the widget to match the browser controls adjustment. Ensure that the
   // total offset (i.e. what the user sees) doesn't change because of clamping
   // the offsets to valid values.
-  webViewImpl()->resizeWithTopControls(
-      WebSize(500, visualViewportHeight - topControlsHeight), 20, true);
+  webViewImpl()->resizeWithBrowserControls(
+      WebSize(500, visualViewportHeight - browserControlsHeight), 20, true);
 
-  EXPECT_SIZE_EQ(IntSize(500, visualViewportHeight - topControlsHeight),
+  EXPECT_SIZE_EQ(IntSize(500, visualViewportHeight - browserControlsHeight),
                  visualViewport.size());
   EXPECT_SIZE_EQ(
-      IntSize(250, (visualViewportHeight - topControlsHeight) / pageScale),
+      IntSize(250, (visualViewportHeight - browserControlsHeight) / pageScale),
       visualViewport.visibleRect().size());
-  EXPECT_SIZE_EQ(
-      IntSize(1000, layoutViewportHeight - topControlsHeight / minPageScale),
-      frameView.frameRect().size());
+  EXPECT_SIZE_EQ(IntSize(1000, layoutViewportHeight -
+                                   browserControlsHeight / minPageScale),
+                 frameView.frameRect().size());
   EXPECT_SIZE_EQ(totalExpected,
                  visualViewport.scrollOffset() + frameView.scrollOffset());
 }
 
-// Tests that a resize due to top controls hiding doesn't incorrectly clamp the
-// main frame's scroll offset. crbug.com/428193.
+// Tests that a resize due to browser controls hiding doesn't incorrectly clamp
+// the main frame's scroll offset. crbug.com/428193.
 TEST_F(VisualViewportTest, TestTopControlHidingResizeDoesntClampMainFrame) {
   initializeWithAndroidSettings();
-  webViewImpl()->resizeWithTopControls(webViewImpl()->size(), 500, false);
+  webViewImpl()->resizeWithBrowserControls(webViewImpl()->size(), 500, false);
   webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
                                      WebFloatSize(), 1, 1);
-  webViewImpl()->resizeWithTopControls(WebSize(1000, 1000), 500, true);
+  webViewImpl()->resizeWithBrowserControls(WebSize(1000, 1000), 500, true);
 
   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.
+  // Scroll the FrameView to the bottom of the page but "hide" the browser
+  // controls on the compositor side so the max scroll position should account
+  // for the full viewport height.
   webViewImpl()->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
                                      WebFloatSize(), 1, -1);
   FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
   frameView.setScrollOffset(ScrollOffset(0, 10000), ProgrammaticScroll);
   EXPECT_EQ(500, frameView.scrollOffset().height());
 
   // Now send the resize, make sure the scroll offset doesn't change.
-  webViewImpl()->resizeWithTopControls(WebSize(1000, 1500), 500, false);
+  webViewImpl()->resizeWithBrowserControls(WebSize(1000, 1500), 500, false);
   EXPECT_EQ(500, frameView.scrollOffset().height());
 }
 
 static void configureHiddenScrollbarsSettings(WebSettings* settings) {
   VisualViewportTest::configureAndroidSettings(settings);
   settings->setHideScrollbars(true);
 }
 
 // Tests that scrollbar layers are not attached to the inner viewport container
 // layer when hideScrollbars WebSetting is true.
@@ skipping 423 matching lines @@
   frameView.layoutViewportScrollableArea()->setScrollOffset(
       ScrollOffset(700, 500), ProgrammaticScroll);
 
   webViewImpl()->resize(IntSize(800, 300));
   EXPECT_SIZE_EQ(ScrollOffset(700, 200),
                  frameView.layoutViewportScrollableArea()->scrollOffset());
 
   RuntimeEnabledFeatures::setScrollAnchoringEnabled(wasScrollAnchoringEnabled);
 }
 
-// Ensure that resize anchoring as happens when top controls hide/show affects
-// the scrollable area that's currently set as the root scroller.
+// Ensure that resize anchoring as happens when browser controls hide/show
+// affects the scrollable area that's currently set as the root scroller.
 TEST_P(ParameterizedVisualViewportTest, ResizeAnchoringWithRootScroller) {
   bool wasRootScrollerEnabled =
       RuntimeEnabledFeatures::setRootScrollerEnabled();
   RuntimeEnabledFeatures::setSetRootScrollerEnabled(true);
 
   initializeWithAndroidSettings();
   webViewImpl()->resize(IntSize(800, 600));
 
   registerMockedHttpURLLoad("root-scroller-div.html");
   navigateTo(m_baseURL + "root-scroller-div.html");
@@ skipping 45 matching lines @@
   webViewImpl()->resize(IntSize(600, 800));
 
   EXPECT_SIZE_EQ(ScrollOffset(),
                  frameView.layoutViewportScrollableArea()->scrollOffset());
   EXPECT_EQ(600, scroller->scrollTop());
 
   RuntimeEnabledFeatures::setSetRootScrollerEnabled(wasRootScrollerEnabled);
 }
 
 }  // namespace