Move Get/SetScrollOffset methods from WebFrame to WebLocalFrame.

third_party/WebKit/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 3032 matching lines @@
       ASSERT_EQ(initial_page_scale_factor,
                 web_view_helper.WebView()->PageScaleFactor());
       web_view_helper.Resize(
           WebSize(viewport_size.height, viewport_size.width));
       float expected_page_scale_factor =
           initial_page_scale_factor *
           (should_scale_relative_to_viewport_width ? 1 / aspect_ratio : 1);
       EXPECT_NEAR(expected_page_scale_factor,
                   web_view_helper.WebView()->PageScaleFactor(), 0.05f);
       EXPECT_EQ(WebSize(),
-                web_view_helper.WebView()->MainFrame()->GetScrollOffset());
+                web_view_helper.WebView()->MainFrameImpl()->GetScrollOffset());
     }
 
     // Resizing just the height should not affect pageScaleFactor or
     // scrollOffset.
     {
       web_view_helper.Resize(
           WebSize(viewport_size.width, viewport_size.height));
       web_view_helper.WebView()->SetPageScaleFactor(initial_page_scale_factor);
-      web_view_helper.WebView()->MainFrame()->SetScrollOffset(scroll_offset);
+      web_view_helper.WebView()->MainFrameImpl()->SetScrollOffset(
+          scroll_offset);
       web_view_helper.WebView()->UpdateAllLifecyclePhases();
       const WebSize expected_scroll_offset =
-          web_view_helper.WebView()->MainFrame()->GetScrollOffset();
+          web_view_helper.WebView()->MainFrameImpl()->GetScrollOffset();
       web_view_helper.Resize(
           WebSize(viewport_size.width, viewport_size.height * 0.8f));
       EXPECT_EQ(initial_page_scale_factor,
                 web_view_helper.WebView()->PageScaleFactor());
       EXPECT_EQ(expected_scroll_offset,
-                web_view_helper.WebView()->MainFrame()->GetScrollOffset());
+                web_view_helper.WebView()->MainFrameImpl()->GetScrollOffset());
       web_view_helper.Resize(
           WebSize(viewport_size.width, viewport_size.height * 0.8f));
       EXPECT_EQ(initial_page_scale_factor,
                 web_view_helper.WebView()->PageScaleFactor());
       EXPECT_EQ(expected_scroll_offset,
-                web_view_helper.WebView()->MainFrame()->GetScrollOffset());
+                web_view_helper.WebView()->MainFrameImpl()->GetScrollOffset());
     }
   }
 };
 
 INSTANTIATE_TEST_CASE_P(All, WebFrameResizeTest, ::testing::Bool());
 
 TEST_P(WebFrameResizeTest,
        ResizeYieldsCorrectScrollAndScaleForWidthEqualsDeviceWidth) {
   // With width=device-width, pageScaleFactor is preserved across resizes as
   // long as the content adjusts according to the device-width.
@@ skipping 147 matching lines @@
   EXPECT_FALSE(
       view->GetLayoutViewItem().Compositor()->LayerForHorizontalScrollbar());
   EXPECT_FALSE(
       view->GetLayoutViewItem().Compositor()->LayerForVerticalScrollbar());
 }
 
 void SetScaleAndScrollAndLayout(WebViewBase* web_view,
                                 WebPoint scroll,
                                 float scale) {
   web_view->SetPageScaleFactor(scale);
-  web_view->MainFrame()->SetScrollOffset(WebSize(scroll.x, scroll.y));
+  web_view->MainFrameImpl()->SetScrollOffset(WebSize(scroll.x, scroll.y));
   web_view->UpdateAllLifecyclePhases();
 }
 
 void SimulatePageScale(WebViewBase* web_view_impl, float& scale) {
   ScrollOffset scroll_delta =
       ToScrollOffset(
           web_view_impl->FakePageScaleAnimationTargetPositionForTesting()) -
       web_view_impl->MainFrameImpl()->GetFrameView()->GetScrollOffset();
   float scale_delta =
       web_view_impl->FakePageScaleAnimationPageScaleForTesting() /
@@ skipping 980 matching lines @@
   const int kPageHeight = 100;
 
   RegisterMockedHttpURLLoad(first_url);
   RegisterMockedHttpURLLoad(second_url);
   RegisterMockedHttpURLLoad(third_url);
 
   ClearScrollStateOnCommitWebFrameClient client;
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + first_url, &client);
   web_view_helper.Resize(WebSize(kPageWidth, kPageHeight));
-  web_view_helper.WebView()->MainFrame()->SetScrollOffset(
+  web_view_helper.WebView()->MainFrameImpl()->SetScrollOffset(
       WebSize(kPageWidth / 4, kPageHeight / 4));
   web_view_helper.WebView()->SetPageScaleFactor(kPageScaleFactor);
 
   // Reload the page and end up at the same url. State should not be propagated.
   web_view_helper.WebView()->MainFrame()->ReloadWithOverrideURL(
       ToKURL(base_url_ + first_url), WebFrameLoadType::kReload);
   FrameTestHelpers::PumpPendingRequestsForFrameToLoad(
       web_view_helper.WebView()->MainFrame());
-  EXPECT_EQ(0, web_view_helper.WebView()->MainFrame()->GetScrollOffset().width);
-  EXPECT_EQ(0,
-            web_view_helper.WebView()->MainFrame()->GetScrollOffset().height);
+  EXPECT_EQ(
+      0, web_view_helper.WebView()->MainFrameImpl()->GetScrollOffset().width);
+  EXPECT_EQ(
+      0, web_view_helper.WebView()->MainFrameImpl()->GetScrollOffset().height);
   EXPECT_EQ(1.0f, web_view_helper.WebView()->PageScaleFactor());
 
   // Reload the page using the cache. State should not be propagated.
   web_view_helper.WebView()->MainFrame()->ReloadWithOverrideURL(
       ToKURL(base_url_ + second_url), WebFrameLoadType::kReload);
   FrameTestHelpers::PumpPendingRequestsForFrameToLoad(
       web_view_helper.WebView()->MainFrame());
-  EXPECT_EQ(0, web_view_helper.WebView()->MainFrame()->GetScrollOffset().width);
-  EXPECT_EQ(0,
-            web_view_helper.WebView()->MainFrame()->GetScrollOffset().height);
+  EXPECT_EQ(
+      0, web_view_helper.WebView()->MainFrameImpl()->GetScrollOffset().width);
+  EXPECT_EQ(
+      0, web_view_helper.WebView()->MainFrameImpl()->GetScrollOffset().height);
   EXPECT_EQ(1.0f, web_view_helper.WebView()->PageScaleFactor());
 
   // Reload the page while bypassing the cache. State should not be propagated.
   web_view_helper.WebView()->MainFrame()->ReloadWithOverrideURL(
       ToKURL(base_url_ + third_url), WebFrameLoadType::kReloadBypassingCache);
   FrameTestHelpers::PumpPendingRequestsForFrameToLoad(
       web_view_helper.WebView()->MainFrame());
-  EXPECT_EQ(0, web_view_helper.WebView()->MainFrame()->GetScrollOffset().width);
-  EXPECT_EQ(0,
-            web_view_helper.WebView()->MainFrame()->GetScrollOffset().height);
+  EXPECT_EQ(
+      0, web_view_helper.WebView()->MainFrameImpl()->GetScrollOffset().width);
+  EXPECT_EQ(
+      0, web_view_helper.WebView()->MainFrameImpl()->GetScrollOffset().height);
   EXPECT_EQ(1.0f, web_view_helper.WebView()->PageScaleFactor());
 }
 
 TEST_P(ParameterizedWebFrameTest, ReloadWhileProvisional) {
   // Test that reloading while the previous load is still pending does not cause
   // the initial request to get lost.
   RegisterMockedHttpURLLoad("fixed_layout.html");
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.Initialize();
@@ skipping 2029 matching lines @@
                                     nullptr, ConfigureAndroid);
 
   WebViewBase* web_view_impl = web_view_helper.WebView();
   ASSERT_TRUE(web_view_impl);
   LocalFrame* frame = web_view_impl->MainFrameImpl()->GetFrame();
   ASSERT_TRUE(frame);
 
   web_view_helper.Resize(WebSize(100, 200));
 
   // Scroll main frame to the bottom of the document
-  web_view_impl->MainFrame()->SetScrollOffset(WebSize(0, 400));
+  web_view_impl->MainFrameImpl()->SetScrollOffset(WebSize(0, 400));
   EXPECT_SIZE_EQ(ScrollOffset(0, 400), frame->View()->GetScrollOffset());
 
   web_view_impl->SetPageScaleFactor(2.0);
 
   // Scroll visual viewport to the top of the main frame.
   VisualViewport& visual_viewport = frame->GetPage()->GetVisualViewport();
   visual_viewport.SetLocation(FloatPoint(0, 0));
   EXPECT_SIZE_EQ(ScrollOffset(0, 0), visual_viewport.GetScrollOffset());
 
   // Tap at the top: there is nothing there.
@@ skipping 1549 matching lines @@
   WebViewBase* web_view = web_view_helper.WebView();
   LocalFrameView* frame_view =
       web_view_helper.WebView()->MainFrameImpl()->GetFrameView();
 
   float browser_controls_height = 40;
   web_view->ResizeWithBrowserControls(WebSize(100, 100),
                                       browser_controls_height, false);
   web_view->SetPageScaleFactor(2.0f);
   web_view->UpdateAllLifecyclePhases();
 
-  web_view->MainFrame()->SetScrollOffset(WebSize(0, 2000));
+  web_view->MainFrameImpl()->SetScrollOffset(WebSize(0, 2000));
   EXPECT_SIZE_EQ(ScrollOffset(0, 1900), frame_view->GetScrollOffset());
 
   // Simulate the browser controls showing by 20px, thus shrinking the viewport
   // and allowing it to scroll an additional 20px.
   web_view->ApplyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(),
                                 1.0f, 20.0f / browser_controls_height);
   EXPECT_SIZE_EQ(ScrollOffset(0, 1920), frame_view->MaximumScrollOffset());
 
   // Show more, make sure the scroll actually gets clamped.
   web_view->ApplyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(),
                                 1.0f, 20.0f / browser_controls_height);
-  web_view->MainFrame()->SetScrollOffset(WebSize(0, 2000));
+  web_view->MainFrameImpl()->SetScrollOffset(WebSize(0, 2000));
   EXPECT_SIZE_EQ(ScrollOffset(0, 1940), frame_view->GetScrollOffset());
 
   // Hide until there's 10px showing.
   web_view->ApplyViewportDeltas(WebFloatSize(), WebFloatSize(), WebFloatSize(),
                                 1.0f, -30.0f / browser_controls_height);
   EXPECT_SIZE_EQ(ScrollOffset(0, 1910), frame_view->MaximumScrollOffset());
 
   // Simulate a LayoutEmbeddedContent::resize. The frame is resized to
   // accomodate the browser controls and Blink's view of the browser controls
   // matches that of the CC
@@ skipping 4298 matching lines @@
     if (obj->IsText()) {
       LayoutText* layout_text = ToLayoutText(obj);
       text = layout_text->GetText();
       break;
     }
   }
   EXPECT_EQ("foo alt", text.Utf8());
 }
 
 }  // namespace blink