Removed FrameView's windowToContents and contentsToWindow methods.

Source/web/WebAXObject.cpp

Index: Source/web/WebAXObject.cpp
diff --git a/Source/web/WebAXObject.cpp b/Source/web/WebAXObject.cpp
index 38612586cb033948d64bae7538c3bc98322db8f6..5dca5777bda07647665f815eb46fb2264c72414c 100644
--- a/Source/web/WebAXObject.cpp
+++ b/Source/web/WebAXObject.cpp
@@ -707,15 +707,7 @@ WebAXObject WebAXObject::hitTest(const WebPoint& point) const
     if (isDetached())
         return WebAXObject();
 
-    // FIXME: This is being cleaned up in https://codereview.chromium.org/967213004/ to use
-    // centralized methods to convert between coordinate spaces. However, this is a bug that needs
-    // to be merged back to M42 so it needs an isolated, low-impact fix. This hack will be removed
-    // in the above CL.
-    PinchViewport& pinchViewport = m_private->documentFrameView()->page()->frameHost().pinchViewport();
-    FloatPoint pointInRootFrame(point.x, point.y);
-    pointInRootFrame.moveBy(pinchViewport.location());
-
-    IntPoint contentsPoint = m_private->documentFrameView()->windowToContents(flooredIntPoint(pointInRootFrame));
+    IntPoint contentsPoint = m_private->documentFrameView()->soonToBeRemovedUnscaledViewportToContents(point);
     RefPtr<AXObject> hit = m_private->accessibilityHitTest(contentsPoint);
 
     if (hit)