Return VisualViewport coords in boundsInViewportSpace

third_party/WebKit/Source/web/tests/VisualViewportTest.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/VisualViewport.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/FrameHost.h"
@@ skipping 1380 matching lines @@
     webViewImpl()->setInitialFocus(false);
     Element* inputElement = webViewImpl()->focusedElement();
 
     IntRect bounds = inputElement->layoutObject()->absoluteBoundingBoxRect();
 
     VisualViewport& visualViewport = frame()->page()->frameHost().visualViewport();
     IntPoint scrollDelta(250, 400);
     visualViewport.setScale(2);
     visualViewport.setLocation(scrollDelta);
 
-    IntRect boundsInViewport = inputElement->boundsInViewportSpace();
+    const IntRect boundsInViewport = inputElement->boundsInViewport();
+    IntRect expectedBounds = bounds;
+    expectedBounds.scale(2.f);
+    IntPoint expectedScrollDelta = scrollDelta;
+    expectedScrollDelta.scale(2.f, 2.f);
 
-    EXPECT_POINT_EQ(IntPoint(bounds.location() - scrollDelta),
+    EXPECT_POINT_EQ(IntPoint(expectedBounds.location() - expectedScrollDelta),
         boundsInViewport.location());
-    EXPECT_SIZE_EQ(bounds.size(), boundsInViewport.size());
+    EXPECT_SIZE_EQ(expectedBounds.size(), boundsInViewport.size());
 }
 
 // Tests that when a new frame is created, it is created with the intended
 // size (i.e. viewport at minimum scale, 100x200 / 0.5).
 TEST_P(ParameterizedVisualViewportTest, TestMainFrameInitializationSizing)
 {
     initializeWithAndroidSettings();
 
     webViewImpl()->resize(IntSize(100, 200));
 
@@ skipping 192 matching lines @@
     webViewImpl()->handleInputEvent(pinchUpdate);
 
     VisualViewport& visualViewport = webViewImpl()->page()->frameHost().visualViewport();
     FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
     EXPECT_FLOAT_POINT_EQ(FloatPoint(50, 50), visualViewport.location());
     EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 0), frameView.scrollPositionDouble());
 }
 
 } // namespace