Removed FrameView's windowToContents and contentsToWindow methods.

Source/web/PopupContainer.cpp

 /*
  * Copyright (c) 2011, 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 388 matching lines @@
     m_listBox->updateFromElement();
 
     // We set the selected item in updateFromElement(), and disregard the
     // index passed into this function (same as Webkit's PopupMenuWin.cpp)
     // FIXME: make sure this is correct, and add an assertion.
     // ASSERT(popupWindow(popup)->listBox()->selectedIndex() == index);
 
     // Save and convert the controlPosition to main window coords. Each point is converted separately
     // to window coordinates because the control could be in a transformed webview and then each point
     // would be transformed by a different delta.
-    m_controlPosition.setP1(v->contentsToWindow(IntPoint(controlPosition.p1().x(), controlPosition.p1().y())));
-    m_controlPosition.setP2(v->contentsToWindow(IntPoint(controlPosition.p2().x(), controlPosition.p2().y())));
-    m_controlPosition.setP3(v->contentsToWindow(IntPoint(controlPosition.p3().x(), controlPosition.p3().y())));
-    m_controlPosition.setP4(v->contentsToWindow(IntPoint(controlPosition.p4().x(), controlPosition.p4().y())));
+    m_controlPosition.setP1(v->contentsToRootFrame(IntPoint(controlPosition.p1().x(), controlPosition.p1().y())));
+    m_controlPosition.setP2(v->contentsToRootFrame(IntPoint(controlPosition.p2().x(), controlPosition.p2().y())));
+    m_controlPosition.setP3(v->contentsToRootFrame(IntPoint(controlPosition.p3().x(), controlPosition.p3().y())));
+    m_controlPosition.setP4(v->contentsToRootFrame(IntPoint(controlPosition.p4().x(), controlPosition.p4().y())));
 
     FloatRect controlBounds = m_controlPosition.boundingBox();
-    controlBounds.moveBy(-v->page()->frameHost().pinchViewport().location());
+    controlBounds = v->page()->frameHost().pinchViewport().mainViewToViewportCSSPixels(controlBounds);
     m_controlPosition = controlBounds;
 
     m_controlSize = controlSize;
 
     // Position at (0, 0) since the frameRect().location() is relative to the
     // parent WebWidget.
     setFrameRect(IntRect(IntPoint(), controlSize));
     showPopup(v);
 }
 
@@ skipping 67 matching lines @@
 }
 
 IntPoint PopupContainer::convertSelfToChild(const Widget* child, const IntPoint& point) const
 {
     IntPoint newPoint = point;
     newPoint.moveBy(-child->location());
     return newPoint;
 }
 
 } // namespace blink