Removed FrameView's windowToContents and contentsToWindow methods.

Source/web/WebPluginContainerImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2014 Opera Software ASA. 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.
@@ skipping 100 matching lines @@
 
     // Don't paint anything if the plugin doesn't intersect the damage rect.
     if (!frameRect().intersects(damageRect))
         return;
 
     gc->save();
 
     ASSERT(parent()->isFrameView());
     FrameView* view =  toFrameView(parent());
 
-    // The plugin is positioned in window coordinates, so it needs to be painted
-    // in window coordinates.
-    IntPoint origin = view->contentsToWindow(IntPoint(0, 0));
+    // The plugin is positioned in the root frame's coordinates, so it needs to
+    // be painted in them too.
+    IntPoint origin = view->contentsToRootFrame(IntPoint(0, 0));
     gc->translate(static_cast<float>(-origin.x()), static_cast<float>(-origin.y()));
 
     WebCanvas* canvas = gc->canvas();
 
-    IntRect windowRect = view->contentsToWindow(damageRect);
+    IntRect windowRect = view->contentsToRootFrame(damageRect);
     m_webPlugin->paint(canvas, windowRect);
 
     gc->restore();
 }
 
 void WebPluginContainerImpl::invalidateRect(const IntRect& rect)
 {
     if (!parent())
         return;
 
@@ skipping 400 matching lines @@
         return;
     m_wantsWheelEvents = wantsWheelEvents;
     if (Page* page = m_element->document().page()) {
         if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator()) {
             if (parent() && parent()->isFrameView())
                 scrollingCoordinator->notifyLayoutUpdated();
         }
     }
 }
 
-WebPoint WebPluginContainerImpl::windowToLocalPoint(const WebPoint& point)
+WebPoint WebPluginContainerImpl::rootFrameToLocalPoint(const WebPoint& pointInRootFrame)
 {
     FrameView* view = toFrameView(parent());
     if (!view)
-        return point;
-    WebPoint windowPoint = view->windowToContents(point);
-    return roundedIntPoint(m_element->renderer()->absoluteToLocal(FloatPoint(windowPoint), UseTransforms));
+        return pointInRootFrame;
+    WebPoint pointInContent = view->rootFrameToContents(pointInRootFrame);
+    return roundedIntPoint(m_element->renderer()->absoluteToLocal(FloatPoint(pointInContent), UseTransforms));
 }
 
-WebPoint WebPluginContainerImpl::localToWindowPoint(const WebPoint& point)
+WebPoint WebPluginContainerImpl::localToRootFramePoint(const WebPoint& pointInLocal)
 {
     FrameView* view = toFrameView(parent());
     if (!view)
-        return point;
-    IntPoint absolutePoint = roundedIntPoint(m_element->renderer()->localToAbsolute(FloatPoint(point), UseTransforms));
-    return view->contentsToWindow(absolutePoint);
+        return pointInLocal;
+    IntPoint absolutePoint = roundedIntPoint(m_element->renderer()->localToAbsolute(FloatPoint(pointInLocal), UseTransforms));
+    return view->contentsToRootFrame(absolutePoint);
 }
 
 void WebPluginContainerImpl::didReceiveResponse(const ResourceResponse& response)
 {
     // Make sure that the plugin receives window geometry before data, or else
     // plugins misbehave.
     frameRectsChanged();
 
     WrappedResourceResponse urlResponse(response);
     m_webPlugin->didReceiveResponse(urlResponse);
@@ skipping 383 matching lines @@
         currentPage->focusController().setFocusedElement(m_element, &containingFrame);
     else
         containingFrame.document()->setFocusedElement(m_element);
 }
 
 void WebPluginContainerImpl::calculateGeometry(const IntRect& frameRect,
                                                IntRect& windowRect,
                                                IntRect& clipRect,
                                                Vector<IntRect>& cutOutRects)
 {
-    windowRect = toFrameView(parent())->contentsToWindow(frameRect);
+    windowRect = toFrameView(parent())->contentsToRootFrame(frameRect);
 
     // Calculate a clip-rect so that we don't overlap the scrollbars, etc.
     clipRect = windowClipRect();
     clipRect.move(-windowRect.x(), -windowRect.y());
 
     getPluginOcclusions(m_element, this->parent(), frameRect, cutOutRects);
     // Convert to the plugin position.
     for (size_t i = 0; i < cutOutRects.size(); i++)
         cutOutRects[i].move(-frameRect.x(), -frameRect.y());
 }
@@ skipping 16 matching lines @@
 
     return clipRect;
 }
 
 bool WebPluginContainerImpl::pluginShouldPersist() const
 {
     return m_webPlugin->shouldPersist();
 }
 
 } // namespace blink