2018-10-24 11:24:11 -07:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-09-20 17:30:26 -07:00
|
|
|
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.
|
|
|
|
|
2019-01-12 15:50:33 +09:00
|
|
|
Update(zcbenz): The bug is still in Chrome 72.
|
|
|
|
|
2018-09-13 22:02:16 -07:00
|
|
|
diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc
|
2019-04-20 13:20:37 -04:00
|
|
|
index f0ede24b7a723485996b9181d1521ffce87449de..6d4815276f6c2e44b16e7ad8bd0983788cd1fbcf 100644
|
2018-09-13 22:02:16 -07:00
|
|
|
--- a/content/browser/frame_host/render_frame_proxy_host.cc
|
|
|
|
+++ b/content/browser/frame_host/render_frame_proxy_host.cc
|
2019-02-14 22:04:15 +05:30
|
|
|
@@ -270,6 +270,12 @@ void RenderFrameProxyHost::SetDestructionCallback(
|
2018-09-13 22:02:16 -07:00
|
|
|
|
|
|
|
void RenderFrameProxyHost::OnDetach() {
|
|
|
|
if (frame_tree_node_->render_manager()->ForInnerDelegate()) {
|
|
|
|
+ // 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;
|
|
|
|
+
|
|
|
|
// Only main frame proxy can detach for inner WebContents.
|
|
|
|
DCHECK(frame_tree_node_->IsMainFrame());
|
|
|
|
frame_tree_node_->render_manager()->RemoveOuterDelegateFrame();
|