Use layout units in PinchViewport::scrollIntoView.

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 944 matching lines @@
     mouseDownEvent.button = WebMouseEvent::ButtonRight;
     webViewImpl()->handleInputEvent(mouseDownEvent);
     webViewImpl()->handleInputEvent(mouseUpEvent);
 
     // Reset the old client so destruction can occur naturally.
     webViewImpl()->mainFrameImpl()->setClient(oldClient);
 }
 
 // Test that the scrollIntoView correctly scrolls the main frame
 // and pinch viewports such that the given rect is centered in the viewport.
-TEST_F(PinchViewportTest, DISABLED_TestScrollingDocumentRegionIntoView)
+TEST_F(PinchViewportTest, TestScrollingDocumentRegionIntoView)
 {
     initializeWithDesktopSettings();
     webViewImpl()->resize(IntSize(100, 150));
 
     registerMockedHttpURLLoad("200-by-300-viewport.html");
     navigateTo(m_baseURL + "200-by-300-viewport.html");
 
     PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
 
     // Test that the pinch viewport is scrolled if the viewport has been
     // resized (as is the case when the ChromeOS keyboard comes up) but not
     // scaled.
     webViewImpl()->resizePinchViewport(WebSize(100, 100));
-    pinchViewport.scrollIntoView(FloatRect(100, 250, 50, 50));
+    pinchViewport.scrollIntoView(LayoutRect(100, 250, 50, 50));
     EXPECT_POINT_EQ(IntPoint(75, 150), frame()->view()->scrollPosition());
     EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 50), pinchViewport.visibleRect().location());
 
-    pinchViewport.scrollIntoView(FloatRect(25, 75, 50, 50));
+    pinchViewport.scrollIntoView(LayoutRect(25, 75, 50, 50));
     EXPECT_POINT_EQ(IntPoint(0, 0), frame()->view()->scrollPosition());
     EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 50), pinchViewport.visibleRect().location());
 
     // Reset the pinch viewport's size, scale the page and repeat the test
     webViewImpl()->resizePinchViewport(IntSize(100, 150));
     webViewImpl()->setPageScaleFactor(2);
     pinchViewport.setLocation(FloatPoint());
 
-    pinchViewport.scrollIntoView(FloatRect(50, 75, 50, 75));
+    pinchViewport.scrollIntoView(LayoutRect(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));
+    pinchViewport.scrollIntoView(LayoutRect(190, 290, 10, 10));
     EXPECT_POINT_EQ(IntPoint(100, 150), frame()->view()->scrollPosition());
     EXPECT_FLOAT_POINT_EQ(FloatPoint(50, 75), pinchViewport.visibleRect().location());
+
+    // Scrolling into view the viewport rect itself should be a no-op.
+    webViewImpl()->resizePinchViewport(IntSize(100, 100));
+    webViewImpl()->setPageScaleFactor(1.5f);
+    frame()->view()->scrollTo(IntPoint(50, 50));
+    pinchViewport.setLocation(FloatPoint(0, 10));
+
+    pinchViewport.scrollIntoView(LayoutRect(pinchViewport.visibleRectInDocument()));
+    EXPECT_POINT_EQ(IntPoint(50, 50), frame()->view()->scrollPosition());
+    EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 10), pinchViewport.visibleRect().location());
 }
 
 static IntPoint expectedMaxFrameViewScrollOffset(PinchViewport& pinchViewport, FrameView& frameView)
 {
     float aspectRatio = pinchViewport.visibleRect().width() / pinchViewport.visibleRect().height();
     float newHeight = frameView.frameRect().width() / aspectRatio;
     return IntPoint(
         frameView.contentsSize().width() - frameView.frameRect().width(),
         frameView.contentsSize().height() - newHeight);
 }
@@ skipping 185 matching lines @@
     EXPECT_EQ(500, frameView.scrollPositionDouble().y());
 
     // Now send the resize, make sure the scroll offset doesn't change.
     webViewImpl()->setTopControlsLayoutHeight(0);
     webViewImpl()->resize(IntSize(1000, 1500));
     EXPECT_EQ(500, frameView.scrollPositionDouble().y());
 }
 
 
 } // namespace