RootLayerScrolling: Fix scroll-related tests in BrowserControlsTest

third_party/WebKit/Source/web/tests/BrowserControlsTest.cpp

 /*
  * Copyright (C) 2015 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 151 matching lines @@
   webView->resizeWithBrowserControls(webView->size(), 50.f, true);
   webView->browserControls().setShownRatio(1);
 
   webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollBegin));
   EXPECT_FLOAT_EQ(50.f, webView->browserControls().contentOffset());
 
   // Browser controls should be scrolled partially and page should not scroll.
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, -25.f));
   EXPECT_FLOAT_EQ(25.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 0), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 0),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   // Browser controls should consume 25px and become hidden. Excess scroll
   // should be
   // consumed by the page.
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, -40.f));
   EXPECT_FLOAT_EQ(0.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 15), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 15),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   // Only page should consume scroll
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, -20.f));
   EXPECT_FLOAT_EQ(0.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 35), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 35),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 }
 
 // Scrolling up should show browser controls.
 TEST_F(BrowserControlsTest, MAYBE(ShowOnScrollUp)) {
   WebViewImpl* webView = initialize();
   // initialize browser controls to be hidden.
   webView->resizeWithBrowserControls(webView->size(), 50.f, false);
   webView->browserControls().setShownRatio(0);
 
   webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollBegin));
   EXPECT_FLOAT_EQ(0.f, webView->browserControls().contentOffset());
 
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, 10.f));
   EXPECT_FLOAT_EQ(10.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 0), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 0),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, 50.f));
   EXPECT_FLOAT_EQ(50.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 0), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 0),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 }
 
 // Scrolling up after previous scroll downs should cause browser controls to be
 // shown only after all previously scrolled down amount is compensated.
 TEST_F(BrowserControlsTest, MAYBE(ScrollDownThenUp)) {
   WebViewImpl* webView = initialize();
   // initialize browser controls to be shown and position page at 100px.
   webView->resizeWithBrowserControls(webView->size(), 50.f, true);
   webView->browserControls().setShownRatio(1);
   frame()->view()->getScrollableArea()->setScrollOffset(ScrollOffset(0, 100),
                                                         ProgrammaticScroll);
 
   webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollBegin));
   EXPECT_FLOAT_EQ(50.f, webView->browserControls().contentOffset());
 
   // Scroll down to completely hide browser controls. Excess deltaY (100px)
   // should be consumed by the page.
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, -150.f));
   EXPECT_FLOAT_EQ(0.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 200), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 200),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   // Scroll up and ensure the browser controls does not move until we recover
   // 100px previously scrolled.
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, 40.f));
   EXPECT_FLOAT_EQ(0.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 160), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 160),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, 60.f));
   EXPECT_FLOAT_EQ(0.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 100), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 100),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   // Now we have hit the threshold so further scroll up should be consumed by
   // browser controls.
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, 30.f));
   EXPECT_FLOAT_EQ(30.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 100), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 100),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   // Once top control is fully shown then page should consume any excess scroll.
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, 70.f));
   EXPECT_FLOAT_EQ(50.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 50), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 50),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 }
 
 // Scrolling down should always cause visible browser controls to start hiding
 // even if we have been scrolling up previously.
 TEST_F(BrowserControlsTest, MAYBE(ScrollUpThenDown)) {
   WebViewImpl* webView = initialize();
   // initialize browser controls to be hidden and position page at 100px.
   webView->resizeWithBrowserControls(webView->size(), 50.f, false);
   webView->browserControls().setShownRatio(0);
   frame()->view()->getScrollableArea()->setScrollOffset(ScrollOffset(0, 100),
                                                         ProgrammaticScroll);
 
   webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollBegin));
   EXPECT_FLOAT_EQ(0.f, webView->browserControls().contentOffset());
 
   // Scroll up to completely show browser controls. Excess deltaY (50px) should
   // be consumed by the page.
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, 100.f));
   EXPECT_FLOAT_EQ(50.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 50), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 50),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   // Scroll down and ensure only browser controls is scrolled
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, -40.f));
   EXPECT_FLOAT_EQ(10.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 50), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 50),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, 0, -60.f));
   EXPECT_FLOAT_EQ(0.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 100), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 100),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 }
 
 // Browser controls should not consume horizontal scroll.
 TEST_F(BrowserControlsTest, MAYBE(HorizontalScroll)) {
   WebViewImpl* webView = initialize();
   // initialize browser controls to be shown.
   webView->resizeWithBrowserControls(webView->size(), 50.f, true);
   webView->browserControls().setShownRatio(1);
 
   webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollBegin));
   EXPECT_FLOAT_EQ(50.f, webView->browserControls().contentOffset());
 
   // Browser controls should not consume horizontal scroll.
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, -110.f, -100.f));
   EXPECT_FLOAT_EQ(0.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(110, 50), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(110, 50),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   webView->handleInputEvent(
       generateEvent(WebInputEvent::GestureScrollUpdate, -40.f, 0));
   EXPECT_FLOAT_EQ(0.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(150, 50), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(150, 50),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 }
 
 // Page scale should not impact browser controls scrolling
 TEST_F(BrowserControlsTest, MAYBE(PageScaleHasNoImpact)) {
   WebViewImpl* webView = initialize();
   webViewImpl()->setDefaultPageScaleLimits(0.25f, 5);
   webView->setPageScaleFactor(2.0);
 
   // Initialize browser controls to be shown.
   webView->resizeWithBrowserControls(webView->size(), 50.f, true);
@@ skipping 71 matching lines @@
   webView->resizeWithBrowserControls(webView->size(), 50.f, true);
   webView->browserControls().setShownRatio(1);
   frame()->view()->getScrollableArea()->setScrollOffset(ScrollOffset(0, 50),
                                                         ProgrammaticScroll);
 
   // Test scroll down
   // Scroll down should scroll the overflow div first but browser controls and
   // main frame should not scroll.
   verticalScroll(-800.f);
   EXPECT_FLOAT_EQ(50.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 50), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 50),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   // Continued scroll down should start hiding browser controls but main frame
   // should not scroll.
   verticalScroll(-40.f);
   EXPECT_FLOAT_EQ(10.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 50), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 50),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   // Continued scroll down should scroll down the main frame
   verticalScroll(-40.f);
   EXPECT_FLOAT_EQ(0.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 80), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 80),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   // Test scroll up
   // scroll up should scroll overflow div first
   verticalScroll(800.f);
   EXPECT_FLOAT_EQ(0.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 80), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 80),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   // Continued scroll up should start showing browser controls but main frame
   // should not scroll.
   verticalScroll(40.f);
   EXPECT_FLOAT_EQ(40.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 80), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 80),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   // Continued scroll down up scroll up the main frame
   verticalScroll(40.f);
   EXPECT_FLOAT_EQ(50.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 50), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 50),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 }
 
 // Scrollable iframes should scroll before browser controls
 TEST_F(BrowserControlsTest, MAYBE(ScrollableIframeScrollFirst)) {
   WebViewImpl* webView = initialize("iframe-scrolling.html");
   webView->resizeWithBrowserControls(webView->size(), 50.f, true);
   webView->browserControls().setShownRatio(1);
   frame()->view()->getScrollableArea()->setScrollOffset(ScrollOffset(0, 50),
                                                         ProgrammaticScroll);
 
   // Test scroll down
   // Scroll down should scroll the iframe first but browser controls and main
   // frame should not scroll.
   verticalScroll(-800.f);
   EXPECT_FLOAT_EQ(50.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 50), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 50),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   // Continued scroll down should start hiding browser controls but main frame
   // should not scroll.
   verticalScroll(-40.f);
   EXPECT_FLOAT_EQ(10.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 50), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 50),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   // Continued scroll down should scroll down the main frame
   verticalScroll(-40.f);
   EXPECT_FLOAT_EQ(0.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 80), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 80),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   // Test scroll up
   // scroll up should scroll iframe first
   verticalScroll(800.f);
   EXPECT_FLOAT_EQ(0.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 80), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 80),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   // Continued scroll up should start showing browser controls but main frame
   // should not scroll.
   verticalScroll(40.f);
   EXPECT_FLOAT_EQ(40.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 80), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 80),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   // Continued scroll down up scroll up the main frame
   verticalScroll(40.f);
   EXPECT_FLOAT_EQ(50.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 50), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 50),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 }
 
 // Browser controls visibility should remain consistent when height is changed.
 TEST_F(BrowserControlsTest, MAYBE(HeightChangeMaintainsVisibility)) {
   WebViewImpl* webView = initialize();
   webView->resizeWithBrowserControls(webView->size(), 20.f, false);
   webView->browserControls().setShownRatio(0);
 
   webView->resizeWithBrowserControls(webView->size(), 20.f, false);
   EXPECT_FLOAT_EQ(0.f, webView->browserControls().contentOffset());
@@ skipping 16 matching lines @@
   WebViewImpl* webView = initialize();
   webView->resizeWithBrowserControls(webView->size(), 0, false);
   webView->browserControls().setShownRatio(0);
   frame()->view()->getScrollableArea()->setScrollOffset(ScrollOffset(0, 100),
                                                         ProgrammaticScroll);
 
   EXPECT_FLOAT_EQ(0.f, webView->browserControls().contentOffset());
 
   verticalScroll(20.f);
   EXPECT_FLOAT_EQ(0.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 80), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 80),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   verticalScroll(-30.f);
   EXPECT_FLOAT_EQ(0.f, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 110), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 110),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   webView->browserControls().setShownRatio(1);
   EXPECT_FLOAT_EQ(0.f, webView->browserControls().contentOffset());
 }
 
 // Browser controls should not hide when scrolling up past limit
 TEST_F(BrowserControlsTest, MAYBE(ScrollUpPastLimitDoesNotHide)) {
   WebViewImpl* webView = initialize();
   // Initialize browser controls to be shown
   webView->resizeWithBrowserControls(webView->size(), 50.f, true);
@@ skipping 34 matching lines @@
 
   // Setting permitted state should change the content offset to match the
   // constraint.
   webView->updateBrowserControlsState(WebBrowserControlsShown,
                                       WebBrowserControlsShown, false);
   EXPECT_FLOAT_EQ(50.f, webView->browserControls().contentOffset());
 
   // Only shown state is permitted so controls cannot hide
   verticalScroll(-20.f);
   EXPECT_FLOAT_EQ(50, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 120), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 120),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   // Setting permitted state should change content offset to match the
   // constraint.
   webView->updateBrowserControlsState(WebBrowserControlsHidden,
                                       WebBrowserControlsHidden, false);
   EXPECT_FLOAT_EQ(0, webView->browserControls().contentOffset());
 
   // Only hidden state is permitted so controls cannot show
   verticalScroll(30.f);
   EXPECT_FLOAT_EQ(0, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 90), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 90),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   // Setting permitted state to "both" should not change content offset.
   webView->updateBrowserControlsState(WebBrowserControlsBoth,
                                       WebBrowserControlsBoth, false);
   EXPECT_FLOAT_EQ(0, webView->browserControls().contentOffset());
 
   // Both states are permitted so controls can either show or hide
   verticalScroll(50.f);
   EXPECT_FLOAT_EQ(50, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 90), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 90),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   verticalScroll(-50.f);
   EXPECT_FLOAT_EQ(0, webView->browserControls().contentOffset());
-  EXPECT_SIZE_EQ(ScrollOffset(0, 90), frame()->view()->getScrollOffset());
+  EXPECT_SIZE_EQ(
+      ScrollOffset(0, 90),
+      frame()->view()->layoutViewportScrollableArea()->getScrollOffset());
 
   // Setting permitted state to "both" should not change an in-flight offset.
   verticalScroll(20.f);
   EXPECT_FLOAT_EQ(20, webView->browserControls().contentOffset());
   webView->updateBrowserControlsState(WebBrowserControlsBoth,
                                       WebBrowserControlsBoth, false);
   EXPECT_FLOAT_EQ(20, webView->browserControls().contentOffset());
 
   // An animated state change shouldn't cause a change to the content offset
   // since it'll be driven from the compositor.
@@ skipping 250 matching lines @@
     view->setScrollOffset(view->getScrollOffset(), ProgrammaticScroll);
 
     ASSERT_EQ(80.f, webView->browserControls().contentOffset());
     EXPECT_EQ(expectedRootOffset, rootViewport->getScrollOffset().height());
 
     webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollEnd));
   }
 }
 
 }  // namespace blink