Removed FrameView's windowToContents and contentsToWindow methods.

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 1447 matching lines @@
     PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
     ScrollableArea* scrollableArea = &pinchViewport;
 
     webViewImpl()->setPageScaleFactor(1.0);
     EXPECT_FLOAT_POINT_EQ(DoublePoint(), scrollableArea->maximumScrollPositionDouble());
 
     webViewImpl()->setPageScaleFactor(2);
     EXPECT_FLOAT_POINT_EQ(DoublePoint(101. / 2., 201. / 2.), scrollableArea->maximumScrollPositionDouble());
 }
 
+// Tests that the maximum scroll offset of the viewport can be fractional.

[Rick Byers, 2015/03/05 17:56:20]

looks like you're not actually testing for fractional values.  That would be
valuable to add, right?

[bokan, 2015/03/06 22:07:20]

Done.

+TEST_F(PinchViewportTest, TestCoordinateTransforms)
+{
+    initializeWithAndroidSettings();
+    webViewImpl()->resize(IntSize(800, 600));
+    registerMockedHttpURLLoad("content-width-1000.html");
+    navigateTo(m_baseURL + "content-width-1000.html");
+
+    PinchViewport& pinchViewport = webViewImpl()->page()->frameHost().pinchViewport();
+    FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
+
+    // At scale = 1 the transform should be a no-op.
+    pinchViewport.setScale(1);
+    EXPECT_FLOAT_POINT_EQ(FloatPoint(314, 273), pinchViewport.viewportToRootFrame(FloatPoint(314, 273)));
+    EXPECT_FLOAT_POINT_EQ(FloatPoint(314, 273), pinchViewport.rootFrameToViewport(FloatPoint(314, 273)));
+
+    // At scale = 2.
+    pinchViewport.setScale(2);
+    EXPECT_FLOAT_POINT_EQ(FloatPoint(55, 75), pinchViewport.viewportToRootFrame(FloatPoint(110, 150)));
+    EXPECT_FLOAT_POINT_EQ(FloatPoint(110, 150), pinchViewport.rootFrameToViewport(FloatPoint(55, 75)));
+
+    // At scale = 2 and with the pinch viewport offset.
+    pinchViewport.setLocation(FloatPoint(10, 12));
+    EXPECT_FLOAT_POINT_EQ(FloatPoint(50, 62), pinchViewport.viewportToRootFrame(FloatPoint(80, 100)));
+    EXPECT_FLOAT_POINT_EQ(FloatPoint(80, 100), pinchViewport.rootFrameToViewport(FloatPoint(50, 62)));
+
+    // Scrolling the main frame should have no effect.
+    frameView.scrollTo(DoublePoint(100, 120));
+    EXPECT_FLOAT_POINT_EQ(FloatPoint(50, 62), pinchViewport.viewportToRootFrame(FloatPoint(80, 100)));
+    EXPECT_FLOAT_POINT_EQ(FloatPoint(80, 100), pinchViewport.rootFrameToViewport(FloatPoint(50, 62)));
+}
+
 } // namespace