Removed FrameView's windowToContents and contentsToWindow methods.

Source/web/WebAXObject.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 689 matching lines @@
 }
 
 // FIXME: This method passes in a point that has page scale applied but assumes that (0, 0)
 // is the top left of the visual viewport. In other words, the point has the PinchViewport
 // scale applied, but not the PinchViewport offset. crbug.com/459591.
 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)
         return WebAXObject(hit);
 
     if (m_private->elementRect().contains(contentsPoint))
         return *this;
 
     return WebAXObject();
 }
@@ skipping 612 matching lines @@
     m_private = object;
     return *this;
 }
 
 WebAXObject::operator WTF::PassRefPtr<AXObject>() const
 {
     return m_private.get();
 }
 
 } // namespace blink