Removed FrameView's windowToContents and contentsToWindow methods.

Source/web/ContextMenuClientImpl.cpp

 /*
  * Copyright (C) 2009, 2012 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 177 matching lines @@
     if (!m_webView->contextMenuAllowed())
         return;
 
     HitTestResult r = m_webView->page()->contextMenuController().hitTestResult();
 
     r.setToShadowHostIfInClosedShadowRoot();
 
     LocalFrame* selectedFrame = r.innerNodeFrame();
 
     WebContextMenuData data;
-    IntPoint mousePoint = selectedFrame->view()->contentsToWindow(r.roundedPointInInnerNodeFrame());
-
-    // FIXME(bokan): crbug.com/371902 - We shouldn't be making these scale
-    // related coordinate transformatios in an ad hoc way.
-    PinchViewport& pinchViewport = selectedFrame->host()->pinchViewport();
-    mousePoint -= flooredIntSize(pinchViewport.visibleRect().location());
-    mousePoint.scale(m_webView->pageScaleFactor(), m_webView->pageScaleFactor());
-    data.mousePosition = mousePoint;
+    data.mousePosition = selectedFrame->view()->contentsToViewport(r.roundedPointInInnerNodeFrame());
 
     // Compute edit flags.
     data.editFlags = WebContextMenuData::CanDoNone;
     if (toLocalFrame(m_webView->focusedCoreFrame())->editor().canUndo())
         data.editFlags |= WebContextMenuData::CanUndo;
     if (toLocalFrame(m_webView->focusedCoreFrame())->editor().canRedo())
         data.editFlags |= WebContextMenuData::CanRedo;
     if (toLocalFrame(m_webView->focusedCoreFrame())->editor().canCut())
         data.editFlags |= WebContextMenuData::CanCut;
     if (toLocalFrame(m_webView->focusedCoreFrame())->editor().canCopy())
@@ skipping 226 matching lines @@
         outputItems[i] = subItems[i];
     subMenuItems.swap(outputItems);
 }
 
 void ContextMenuClientImpl::populateCustomMenuItems(const ContextMenu* defaultMenu, WebContextMenuData* data)
 {
     populateSubMenuItems(defaultMenu->items(), data->customItems);
 }
 
 } // namespace blink