From fb52fdc5928af9183a90b5d3257d7698f0fb6d87 Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Wed, 21 Nov 2018 12:53:10 -0800 Subject: [PATCH] chore: remove browser_plugin_guest.patch (#15786) --- patches/common/chromium/.patches | 1 - .../chromium/browser_plugin_guest.patch | 24 ------------------- 2 files changed, 25 deletions(-) delete mode 100644 patches/common/chromium/browser_plugin_guest.patch diff --git a/patches/common/chromium/.patches b/patches/common/chromium/.patches index d8f77d1640089..9738eb2ecba17 100644 --- a/patches/common/chromium/.patches +++ b/patches/common/chromium/.patches @@ -24,7 +24,6 @@ web_contents.patch webgl_context_attributes.patch webview_cross_drag.patch worker_context_will_destroy.patch -browser_plugin_guest.patch disable_user_gesture_requirement_for_beforeunload_dialogs.patch gin_enable_disable_v8_platform.patch blink-worker-enable-csp-in-file-scheme.patch diff --git a/patches/common/chromium/browser_plugin_guest.patch b/patches/common/chromium/browser_plugin_guest.patch deleted file mode 100644 index d4ebe17a97964..0000000000000 --- a/patches/common/chromium/browser_plugin_guest.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tomas Rycl -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( - 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::AsWeakPtr() {