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

chore: remove browser_plugin_guest.patch (#15786)

Browse source
This commit is contained in:
Jeremy Apthorp 2018-11-21 12:53:10 -08:00 • committed by John Kleinschmidt
parent bb7c63c052
commit fb52fdc592
2 changed files with 0 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
patches/common/chromium/.patches
View file

@ -24,7 +24,6 @@ web_contents.patch
webgl_context_attributes.patch webgl_context_attributes.patch
webview_cross_drag.patch webview_cross_drag.patch
worker_context_will_destroy.patch worker_context_will_destroy.patch
browser_plugin_guest.patch
disable_user_gesture_requirement_for_beforeunload_dialogs.patch disable_user_gesture_requirement_for_beforeunload_dialogs.patch
gin_enable_disable_v8_platform.patch gin_enable_disable_v8_platform.patch
blink-worker-enable-csp-in-file-scheme.patch blink-worker-enable-csp-in-file-scheme.patch

24
patches/common/chromium/browser_plugin_guest.patch
View file

@ -1,24 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tomas Rycl <torycl@microsoft.com>
Date: Thu, 20 Sep 2018 17:47:25 -0700
Subject: browser_plugin_guest.patch
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
index f56ce93c3d5b1b46b706800a12a21f29cabafb33..19c302c2714fb8ce89b261dd44d9939d3345a803 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -206,8 +206,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() {