Revert of Initial draft - modify ViewportAnchor to know about both inner and outer viewports.

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 135 matching lines @@
         settings->setPreferCompositingToLCDTextEnabled(true);
         settings->setPinchVirtualViewportEnabled(true);
     }
 
     static void configureAndroidSettings(WebSettings* settings)
     {
         configureSettings(settings);
         settings->setViewportEnabled(true);
         settings->setViewportMetaEnabled(true);
         settings->setShrinksViewportContentToFit(true);
-        settings->setMainFrameResizesAreOrientationChanges(true);
     }
 
 protected:
     std::string m_baseURL;
     FrameTestHelpers::TestWebViewClient m_mockWebViewClient;
 
 private:
     FrameTestHelpers::WebViewHelper m_helper;
 };
 
@@ skipping 20 matching lines @@
     EXPECT_SIZE_EQ(webViewSize, IntSize(webViewImpl()->size()));
     EXPECT_SIZE_EQ(webViewSize, pinchViewport.size());
 
     // Resizing the pinch viewport shouldn't affect the WebView.
     IntSize newViewportSize = IntSize(320, 200);
     pinchViewport.setSize(newViewportSize);
     EXPECT_SIZE_EQ(webViewSize, IntSize(webViewImpl()->size()));
     EXPECT_SIZE_EQ(newViewportSize, pinchViewport.size());
 }
 
-// Test that the PinchViewport works as expected in case of a scaled
-// and scrolled viewport - scroll down.
-TEST_F(PinchViewportTest, TestResizeAfterVerticalScroll)
-{
-    /*
-                 200                                 200
-        |                   |               |                   |
-        |                   |               |                   |
-        |                   | 800           |                   | 800
-        |-------------------|               |                   |
-        |                   |               |                   |
-        |                   |               |                   |
-        |                   |               |                   |
-        |                   |   -------->   |                   |
-        | 300               |               |                   |
-        |                   |               |                   |
-        |               400 |               |                   |
-        |                   |               |-------------------|
-        |                   |               |      75           |
-        | 50                |               | 50             100|
-        o-----              |               o----               |
-        |    |              |               |   |  25           |
-        |    |100           |               |-------------------|
-        |    |              |               |                   |
-        |    |              |               |                   |
-        --------------------                --------------------
-
-     */
-
-    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()->setMainFrameScrollOffset(WebPoint(0, 400));
-    EXPECT_POINT_EQ(IntPoint(0, 400), frame()->view()->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_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_F(PinchViewportTest, TestResizeAfterHorizontalScroll)
-{
-    /*
-                 200                                 200
-        ---------------o-----               ---------------o-----
-        |              |    |               |            25|    |
-        |              |    |               |              -----|
-        |           100|    |               |100             50 |
-        |              |    |               |                   |
-        |              ---- |               |-------------------|
-        |                   |               |                   |
-        |                   |               |                   |
-        |                   |               |                   |
-        |                   |               |                   |
-        |                   |               |                   |
-        |400                |   --------->  |                   |
-        |                   |               |                   |
-        |                   |               |                   |
-        |                   |               |                   |
-        |                   |               |                   |
-        |                   |               |                   |
-        |                   |               |                   |
-        |                   |               |                   |
-        |                   |               |                   |
-        |-------------------|               |                   |
-        |                   |               |                   |
-
-     */
-
-    initializeWithAndroidSettings();
-
-    registerMockedHttpURLLoad("200-by-800-viewport.html");
-    navigateTo(m_baseURL + "200-by-800-viewport.html");
-
-    webViewImpl()->resize(IntSize(100, 200));
-
-    // Outer viewport takes the whole width of the document.
-
-    webViewImpl()->setPageScaleFactor(2.0);
-
-    // Scroll pinch viewport to the right edge of the frame
-    PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
-    pinchViewport.setLocation(FloatPoint(150, 0));
-    EXPECT_FLOAT_POINT_EQ(FloatPoint(150, 0), pinchViewport.location());
-
-    // Verify the initial size of the pinch viewport in the CSS pixels
-    EXPECT_FLOAT_SIZE_EQ(FloatSize(50, 100), pinchViewport.visibleRect().size());
-
-    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, 0), frame()->view()->scrollPosition());
-    EXPECT_FLOAT_POINT_EQ(FloatPoint(150, 0), pinchViewport.location());
-}
-
 static void disableAcceleratedCompositing(WebSettings* settings)
 {
     PinchViewportTest::configureSettings(settings);
     // FIXME: This setting is being removed, so this test needs to be rewritten to
     // do something else. crbug.com/173949
     settings->setAcceleratedCompositingEnabled(false);
 }
 
 // Test that the container layer gets sized properly if the WebView is resized
 // prior to the PinchViewport being attached to the layer tree.
@@ skipping 587 matching lines @@
     pinchViewport.scrollIntoView(FloatRect(50, 75, 50, 75));
     EXPECT_POINT_EQ(IntPoint(50, 75), frame()->view()->scrollPosition());
     EXPECT_FLOAT_POINT_EQ(FloatPoint(), pinchViewport.visibleRect().location());
 
     pinchViewport.scrollIntoView(FloatRect(190, 290, 10, 10));
     EXPECT_POINT_EQ(IntPoint(100, 150), frame()->view()->scrollPosition());
     EXPECT_FLOAT_POINT_EQ(FloatPoint(50, 75), pinchViewport.visibleRect().location());
 }
 
 } // namespace