Update WebLocalFrameImpl and RotationViewportAnchor for root layer scrolling.

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/dom/Document.h"
 #include "core/frame/FrameHost.h"
@@ skipping 272 matching lines @@
     EXPECT_POINT_EQ(expectedLocation, frameView.scrollableArea()->visibleContentRectDouble().location());
 
     webViewImpl()->resize(IntSize(800, 600));
 
     EXPECT_POINT_EQ(expectedLocation, frameView.scrollableArea()->visibleContentRectDouble().location());
 }
 
 
 // Test that the PinchViewport works as expected in case of a scaled
 // and scrolled viewport - scroll down.
-TEST_F(PinchViewportTest, TestResizeAfterVerticalScroll)
+TEST_P(ParameterizedPinchViewportTest, TestResizeAfterVerticalScroll)
 {
     /*
                  200                                 200
         |                   |               |                   |
         |                   |               |                   |
         |                   | 800           |                   | 800
         |-------------------|               |                   |
         |                   |               |                   |
         |                   |               |                   |
         |                   |               |                   |
@@ skipping 21 matching lines @@
 
     initializeWithAndroidSettings();
 
     registerMockedHttpURLLoad("200-by-800-viewport.html");
     navigateTo(m_baseURL + "200-by-800-viewport.html");
 
     webViewImpl()->resize(IntSize(100, 200));
 
     // Scroll main frame to the bottom of the document
     webViewImpl()->mainFrame()->setScrollOffset(WebSize(0, 400));
-    EXPECT_POINT_EQ(IntPoint(0, 400), frame()->view()->scrollPosition());
+    EXPECT_POINT_EQ(IntPoint(0, 400), frame()->view()->layoutViewportScrollableArea()->scrollPosition());
 
     webViewImpl()->setPageScaleFactor(2.0);
 
     // Scroll pinch viewport to the bottom of the main frame
     PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
     pinchViewport.setLocation(FloatPoint(0, 300));
     EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 300), pinchViewport.location());
 
     // Verify the initial size of the pinch viewport in the CSS pixels
     EXPECT_FLOAT_SIZE_EQ(FloatSize(50, 100), pinchViewport.visibleRect().size());
 
     // Perform the resizing
     webViewImpl()->resize(IntSize(200, 100));
 
     // After resizing the scale changes 2.0 -> 4.0
     EXPECT_FLOAT_SIZE_EQ(FloatSize(50, 25), pinchViewport.visibleRect().size());
 
-    EXPECT_POINT_EQ(IntPoint(0, 625), frame()->view()->scrollPosition());
+    EXPECT_POINT_EQ(IntPoint(0, 625), frame()->view()->layoutViewportScrollableArea()->scrollPosition());
     EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 75), pinchViewport.location());
 }
 
 // Test that the PinchViewport works as expected in case if a scaled
 // and scrolled viewport - scroll right.
 TEST_P(ParameterizedPinchViewportTest, TestResizeAfterHorizontalScroll)
 {
     /*
                  200                                 200
         ---------------o-----               ---------------o-----
@@ skipping 1353 matching lines @@
     registerMockedHttpURLLoad("window_dimensions_wide_div.html");
     webViewImpl()->resize(IntSize(800, 600));
     navigateTo(m_baseURL + "window_dimensions_wide_div.html");
 
     Element* output = frame()->document()->getElementById("output");
     ASSERT(output);
     EXPECT_EQ(std::string("2000x1500"), std::string(output->innerHTML().ascii().data()));
 }
 
 } // namespace