Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 11046002: Browser Plugin: Fixed browser process crash on embedder reload. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed nits Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/test/data/browser_plugin_embedder.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 9291e9f115c90b8a1a3f70aa66eab23b76a33dd8..beeed5e6474d65f477ecb120316e8b78a671ea15 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2378,8 +2378,13 @@ void WebContentsImpl::OnBrowserPluginCreateGuest(
// plugin renderer prior to CreateGuest will be ignored.
// For more info, see comment above classes BrowserPluginEmbedder and
// BrowserPluginGuest.
+ // The first BrowserPluginHostMsg_CreateGuest message from this WebContents'
+ // embedder render process is handled here. Once BrowserPluginEmbedder is
+ // created, all subsequent BrowserPluginHostMsg_CreateGuest messages are
+ // intercepted by the BrowserPluginEmbedderHelper and handled by the
+ // BrowserPluginEmbedder. Thus, this code will not be executed if a
+ // BrowserPluginEmbedder exists for this WebContents.
CHECK(!browser_plugin_embedder_.get());
-
browser_plugin_embedder_.reset(
content::BrowserPluginEmbedder::Create(this, GetRenderViewHost()));
browser_plugin_embedder_->CreateGuest(GetRenderViewHost(),
@@ -2388,16 +2393,6 @@ void WebContentsImpl::OnBrowserPluginCreateGuest(
persist_storage);
}
-void WebContentsImpl::OnBrowserPluginNavigateGuest(
- int instance_id,
- const std::string& src,
- const BrowserPluginHostMsg_ResizeGuest_Params& resize_params) {
- browser_plugin_embedder_->NavigateGuest(GetRenderViewHost(),
- instance_id,
- src,
- resize_params);
-}
-
// Notifies the RenderWidgetHost instance about the fact that the page is
// loading, or done loading and calls the base implementation.
void WebContentsImpl::SetIsLoading(bool is_loading,
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/test/data/browser_plugin_embedder.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698