Move convertViewportToWindow and convertWindowToViewport from

third_party/WebKit/Source/core/html/ImageDocumentTest.cpp

 // Copyright 2016 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 "core/html/ImageDocument.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/DocumentParser.h"
 #include "core/loader/EmptyClients.h"
 #include "core/testing/DummyPageHolder.h"
@@ skipping 39 matching lines @@
 
 class WindowToViewportScalingChromeClient : public EmptyChromeClient {
 public:
     WindowToViewportScalingChromeClient()
         : EmptyChromeClient()
         , m_scaleFactor(1.f)
     {
     }
 
     void setScalingFactor(float s) { m_scaleFactor = s; }
-    float windowToViewportScalar(const float s) const override { return s * m_scaleFactor; }
+    float windowToViewportScalar(const Widget&, const float s) const override { return s * m_scaleFactor; }
 
 private:
     float m_scaleFactor;
 };
 
 class ImageDocumentTest : public ::testing::Test {
 protected:
     void TearDown() override
     {
         ThreadState::current()->collectAllGarbage();
@@ skipping 115 matching lines @@
 TEST_F(ImageDocumentTest, ImageScalesDownWithDsf)
 {
     createDocumentWithoutLoadingImage(20, 30);
     setWindowToViewportScalingFactor(2.f);
     loadImage();
     EXPECT_EQ(10, imageWidth());
     EXPECT_EQ(10, imageHeight());
 }
 
 } // namespace blink