Fix the position of context menu for BrowserPlugins inside OOPIF (Merge to M-57)

content/renderer/browser_plugin/browser_plugin.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/browser_plugin/browser_plugin.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 373 matching lines @@
 }
 
 void BrowserPlugin::updateGeometry(const WebRect& plugin_rect_in_viewport,
                                    const WebRect& clip_rect,
                                    const WebRect& unobscured_rect,
                                    const WebVector<WebRect>& cut_outs_rects,
                                    bool is_visible) {
   gfx::Rect old_view_rect = view_rect_;
   // Convert the plugin_rect_in_viewport to window coordinates, which is css.
   WebRect rect_in_css(plugin_rect_in_viewport);
-  blink::WebView* webview = container()->document().frame()->view();
-  RenderViewImpl::FromWebView(webview)->GetWidget()->convertViewportToWindow(
-      &rect_in_css);
+
+  // We will use the local root's RenderWidget to convert coordinates to Window.
+  // If this local root belongs to an OOPIF, on the browser side we will have to
+  // consider the displacement of the child frame in root window.
+  RenderFrameImpl::FromWebFrame(container()->document().frame())
+      ->GetRenderWidget()
+      ->convertViewportToWindow(&rect_in_css);
   view_rect_ = rect_in_css;
 
   if (!ready_) {
     if (delegate_)
       delegate_->Ready();
     ready_ = true;
   }
 
   bool rect_size_changed = view_rect_.size() != old_view_rect.size();
   if (delegate_ && rect_size_changed)
@@ skipping 213 matching lines @@
 
 bool BrowserPlugin::HandleMouseLockedInputEvent(
     const blink::WebMouseEvent& event) {
   BrowserPluginManager::Get()->Send(
       new BrowserPluginHostMsg_HandleInputEvent(browser_plugin_instance_id_,
                                                 &event));
   return true;
 }
 
 }  // namespace content