Index: content/browser/browser_plugin/browser_plugin_guest.cc |
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc |
index 3f6173a2ca52d23be3b4f0f28a70579c0c2a04cd..d8a7e77700cc54191722c0414d97f7a78b440429 100644 |
--- a/content/browser/browser_plugin/browser_plugin_guest.cc |
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc |
@@ -6,6 +6,7 @@ |
#include <algorithm> |
+#include "base/command_line.h" |
#include "base/message_loop/message_loop.h" |
#include "base/pickle.h" |
#include "base/strings/utf_string_conversions.h" |
@@ -35,6 +36,7 @@ |
#include "content/public/browser/render_widget_host_view.h" |
#include "content/public/browser/user_metrics.h" |
#include "content/public/browser/web_contents_observer.h" |
+#include "content/public/common/content_switches.h" |
#include "content/public/common/drop_data.h" |
#include "ui/gfx/geometry/size_conversions.h" |
@@ -103,6 +105,14 @@ BrowserPluginGuest::BrowserPluginGuest(bool has_render_view, |
} |
int BrowserPluginGuest::GetGuestProxyRoutingID() { |
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kSitePerProcess)) { |
+ // We don't directly use the proxy to send postMessage in |
+ // --site-per-process, we use the contentWindow directly from |
Charlie Reis
2015/05/19 07:12:30
nit: , since
lazyboy
2015/05/21 23:23:46
Done.
|
+ // the frame element instead. |
+ return MSG_ROUTING_NONE; |
+ } |
+ |
if (guest_proxy_routing_id_ != MSG_ROUTING_NONE) |
return guest_proxy_routing_id_; |
@@ -263,14 +273,18 @@ void BrowserPluginGuest::InitInternal( |
if (owner_web_contents_ != owner_web_contents) { |
WebContentsViewGuest* new_view = |
- static_cast<WebContentsViewGuest*>(GetWebContents()->GetView()); |
- if (owner_web_contents_) |
+ base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kSitePerProcess) |
+ ? nullptr |
+ : static_cast<WebContentsViewGuest*>(GetWebContents()->GetView()); |
Charlie Reis
2015/05/19 07:12:30
Style nit: This is a bit awkward to read. Maybe i
lazyboy
2015/05/21 23:23:46
Done.
|
+ if (owner_web_contents_ && new_view) |
new_view->OnGuestDetached(owner_web_contents_->GetView()); |
// Once a BrowserPluginGuest has an embedder WebContents, it's considered to |
// be attached. |
owner_web_contents_ = owner_web_contents; |
- new_view->OnGuestAttached(owner_web_contents_->GetView()); |
+ if (new_view) |
+ new_view->OnGuestAttached(owner_web_contents_->GetView()); |
} |
RendererPreferences* renderer_prefs = |
@@ -646,10 +660,12 @@ void BrowserPluginGuest::Attach( |
void BrowserPluginGuest::OnWillAttachComplete( |
WebContentsImpl* embedder_web_contents, |
const BrowserPluginHostMsg_Attach_Params& params) { |
+ bool use_site_per_process = base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kSitePerProcess); |
// If a RenderView has already been created for this new window, then we need |
// to initialize the browser-side state now so that the RenderFrameHostManager |
// does not create a new RenderView on navigation. |
- if (has_render_view_) { |
+ if (!use_site_per_process && has_render_view_) { |
// This will trigger a callback to RenderViewReady after a round-trip IPC. |
static_cast<RenderViewHostImpl*>( |
GetWebContents()->GetRenderViewHost())->Init(); |
@@ -668,14 +684,16 @@ void BrowserPluginGuest::OnWillAttachComplete( |
delegate_->DidAttach(GetGuestProxyRoutingID()); |
- has_render_view_ = true; |
+ if (!use_site_per_process) { |
+ has_render_view_ = true; |
- // Enable input method for guest if it's enabled for the embedder. |
- if (static_cast<RenderViewHostImpl*>( |
- owner_web_contents_->GetRenderViewHost())->input_method_active()) { |
- RenderViewHostImpl* guest_rvh = static_cast<RenderViewHostImpl*>( |
- GetWebContents()->GetRenderViewHost()); |
- guest_rvh->SetInputMethodActive(true); |
+ // Enable input method for guest if it's enabled for the embedder. |
+ if (static_cast<RenderViewHostImpl*>( |
+ owner_web_contents_->GetRenderViewHost())->input_method_active()) { |
+ RenderViewHostImpl* guest_rvh = static_cast<RenderViewHostImpl*>( |
+ GetWebContents()->GetRenderViewHost()); |
+ guest_rvh->SetInputMethodActive(true); |
+ } |
} |
RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.Attached")); |