Track frame openers in FrameTreeNodes instead of WebContents

android_webview/browser/aw_content_browser_client.cc

 // Copyright (c) 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 "android_webview/browser/aw_content_browser_client.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
 #include "android_webview/browser/aw_contents_client_bridge_base.h"
 #include "android_webview/browser/aw_contents_io_thread_client.h"
@@ skipping 364 matching lines @@
     const GURL& source_origin,
     WindowContainerType container_type,
     const GURL& target_url,
     const content::Referrer& referrer,
     WindowOpenDisposition disposition,
     const blink::WebWindowFeatures& features,
     bool user_gesture,
     bool opener_suppressed,
     content::ResourceContext* context,
     int render_process_id,
-    int opener_id,
+    int opener_render_view_id,
+    int opener_render_frame_id,
     bool* no_javascript_access) {
   // We unconditionally allow popup windows at this stage and will give
   // the embedder the opporunity to handle displaying of the popup in
   // WebContentsDelegate::AddContents (via the
   // AwContentsClient.onCreateWindow callback).
   // Note that if the embedder has blocked support for creating popup
   // windows through AwSettings, then we won't get to this point as
   // the popup creation will have been blocked at the WebKit level.
   if (no_javascript_access) {
     *no_javascript_access = false;
@@ skipping 70 matching lines @@
 
 #if defined(VIDEO_HOLE)
 content::ExternalVideoSurfaceContainer*
 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
     content::WebContents* web_contents) {
   return native_factory_->CreateExternalVideoSurfaceContainer(web_contents);
 }
 #endif
 
 }  // namespace android_webview