Revert: electron/electron#14487 (#19011)
This commit is contained in:
parent
75a020e0ac
commit
e26f366405
6 changed files with 3 additions and 67 deletions
|
@ -41,7 +41,6 @@ enable_widevine.patch
|
|||
chrome_key_systems.patch
|
||||
allow_nested_error_trackers.patch
|
||||
blink_initialization_order.patch
|
||||
disable_detach_webview_frame.patch
|
||||
ssl_security_state_tab_helper.patch
|
||||
exclude-a-few-test-files-from-build.patch
|
||||
expose-net-observer-api.patch
|
||||
|
|
|
@ -1,30 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: zcbenz <zcbenz@gmail.com>
|
||||
Date: Thu, 20 Sep 2018 17:50:27 -0700
|
||||
Subject: disable_detach_webview_frame.patch
|
||||
|
||||
Don't detach the frame for webview, we will manage the WebContents
|
||||
manually.
|
||||
This is part of the fixes for https://github.com/electron/electron/issues/14211.
|
||||
We should revisit this bug after upgrading to newer versions of Chrome,
|
||||
this patch was introduced in Chrome 66.
|
||||
|
||||
Update(zcbenz): The bug is still in Chrome 72.
|
||||
|
||||
diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc
|
||||
index ab3be3430e2d074bbb8b4c2d5fe5a5f98baf6848..acb78da664aae9320e65ffbe3a273025723652d6 100644
|
||||
--- a/content/browser/frame_host/render_frame_proxy_host.cc
|
||||
+++ b/content/browser/frame_host/render_frame_proxy_host.cc
|
||||
@@ -268,6 +268,12 @@ void RenderFrameProxyHost::BubbleLogicalScroll(
|
||||
|
||||
void RenderFrameProxyHost::OnDetach() {
|
||||
if (frame_tree_node_->render_manager()->IsMainFrameForInnerDelegate()) {
|
||||
+ // Don't detach the frame for webview, we will manage the WebContents
|
||||
+ // manually.
|
||||
+ // We should revisit this bug after upgrading to newer versions of Chrome,
|
||||
+ // this patch was introduced in Chrome 66.
|
||||
+ return;
|
||||
+
|
||||
frame_tree_node_->render_manager()->RemoveOuterDelegateFrame();
|
||||
return;
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue