mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

build: move libcc patches to electron repo (#14104)

Browse source 
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.
This commit is contained in:
Jeremy Apthorp 2018-09-13 22:02:16 -07:00 • committed by GitHub
parent 9e85bdb02c
commit 76c5f5cc8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
147 changed files with 86931 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
patches/common/chromium/browser_plugin_guest.patch Normal file
View file

@ -0,0 +1,18 @@
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() {