BrowserPlugin: Move CreateGuest to chrome

content/browser/web_contents/web_contents_impl.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 "content/browser/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 409 matching lines @@
   FOR_EACH_OBSERVER(WebContentsObserver,
                     observers_,
                     WebContentsImplDestroyed());
 
   SetDelegate(NULL);
 
   STLDeleteContainerPairSecondPointers(destruction_observers_.begin(),
                                        destruction_observers_.end());
 }
 
 WebContentsImpl* WebContentsImpl::CreateWithOpener(

[jam, 2014/05/06 23:43:53]

what is the callstack when this method is called with a non zero
guest_instance_id?

[Fady Samuel, 2014/05/07 00:07:47]

This bouncing from content to chrome and back should be reduced significantly in
the future. I plan to introduce a chrome extension API for "guestviews"

GuestView.allocateInstanceId

and

GuestView.createGuest

or some such API. This will allow guests to be allocated from chrome all the
time. The final step will be to create a BrowserPlugin in content via
WebContents::Create. Here is the current stack trace:

#1 0x7f38cd5b52b5 content::WebContentsImpl::CreateWithOpener()
#2 0x000001019302 GuestViewManager::CreateGuest()
#3 0x7f38cd34dd1a content::BrowserPluginGuestManager::CreateGuest()
#4 0x7f38cd344cb9 content::BrowserPluginEmbedder::OnGuestCallback()
#5 0x7f38cd34de76 content::BrowserPluginGuestByInstanceIDCallback()
#6 0x0000010194bf GuestViewManager::MaybeGetGuestByInstanceIDOrKill()
#7 0x7f38cd34de0b
content::BrowserPluginGuestManager::MaybeGetGuestByInstanceIDOrKill()
#8 0x7f38cd3446f7 content::BrowserPluginEmbedder::OnMessageReceived()

     const WebContents::CreateParams& params,
     WebContentsImpl* opener) {
   TRACE_EVENT0("browser", "WebContentsImpl::CreateWithOpener");
   WebContentsImpl* new_contents = new WebContentsImpl(
       params.browser_context, opener);
 
+  if (params.guest_instance_id) {
+    scoped_ptr<base::DictionaryValue> extra_params(
+        params.guest_extra_params->DeepCopy());
+    // This makes |new_contents| act as a guest.
+    // For more info, see comment above class BrowserPluginGuest.
+    BrowserPluginGuest::Create(params.guest_instance_id,
+                               params.site_instance,
+                               new_contents,
+                               extra_params.Pass());
+    // We are instantiating a WebContents for browser plugin. Set its subframe
+    // bit to true.
+    new_contents->is_subframe_ = true;
+  }
   new_contents->Init(params);
   return new_contents;
 }
 
-// static
-BrowserPluginGuest* WebContentsImpl::CreateGuest(
-    BrowserContext* browser_context,
-    SiteInstance* site_instance,
-    int guest_instance_id,
-    scoped_ptr<base::DictionaryValue> extra_params) {
-  WebContentsImpl* new_contents = new WebContentsImpl(browser_context, NULL);
-
-  // This makes |new_contents| act as a guest.
-  // For more info, see comment above class BrowserPluginGuest.
-  BrowserPluginGuest::Create(
-      guest_instance_id, site_instance, new_contents, extra_params.Pass());
-
-  WebContents::CreateParams create_params(browser_context, site_instance);
-  new_contents->Init(create_params);
-
-  // We are instantiating a WebContents for browser plugin. Set its subframe bit
-  // to true.
-  new_contents->is_subframe_ = true;
-
-  return new_contents->browser_plugin_guest_.get();
-}
-
 RenderFrameHostManager* WebContentsImpl::GetRenderManagerForTesting() {
   return GetRenderManager();
 }
 
 bool WebContentsImpl::OnMessageReceived(RenderViewHost* render_view_host,
                                         const IPC::Message& message) {
   return OnMessageReceived(render_view_host, NULL, message);
 }
 
 bool WebContentsImpl::OnMessageReceived(RenderViewHost* render_view_host,
@@ skipping 3506 matching lines @@
 
 void WebContentsImpl::OnPreferredSizeChanged(const gfx::Size& old_size) {
   if (!delegate_)
     return;
   const gfx::Size new_size = GetPreferredSize();
   if (new_size != old_size)
     delegate_->UpdatePreferredSize(this, new_size);
 }
 
 }  // namespace content