76c5f5cc8a
In the GN build, libchromiumcontent is no longer a distinct library, but merely a container for a set of scripts and patches. Maintaining those patches in a separate repository is tedious and error-prone, so merge them into the main repo. Once this is merged and GN is the default way to build Electron, the libchromiumcontent repository can be archived.
18 lines
868 B
Diff
18 lines
868 B
Diff
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
|
|
index 964c9a093a3b..f3b3d66ff267 100644
|
|
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
|
|
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
|
|
@@ -214,8 +214,11 @@ void BrowserPluginGuest::Init() {
|
|
|
|
WebContentsImpl* owner_web_contents = static_cast<WebContentsImpl*>(
|
|
delegate_->GetOwnerWebContents());
|
|
- owner_web_contents->CreateBrowserPluginEmbedderIfNecessary();
|
|
- InitInternal(BrowserPluginHostMsg_Attach_Params(), owner_web_contents);
|
|
+ if (nullptr != owner_web_contents)
|
|
+ {
|
|
+ owner_web_contents->CreateBrowserPluginEmbedderIfNecessary();
|
|
+ InitInternal(BrowserPluginHostMsg_Attach_Params(), owner_web_contents);
|
|
+ }
|
|
}
|
|
|
|
base::WeakPtr<BrowserPluginGuest> BrowserPluginGuest::AsWeakPtr() {
|