2018-10-24 18:24:11 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-09-21 00:30:26 +00: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 06:50:33 +00:00
|
|
|
Update(zcbenz): The bug is still in Chrome 72.
|
|
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc
|
2019-01-16 18:07:52 +00:00
|
|
|
index 656498fdbad93c8fcc758e08653f5417e7406345..476db3bdc90a6bf014e0a2ab4f2b47651ef8e1cc 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/content/browser/frame_host/render_frame_proxy_host.cc
|
|
|
|
|
+++ b/content/browser/frame_host/render_frame_proxy_host.cc
|
2019-01-16 18:07:52 +00:00
|
|
|
@@ -263,6 +263,12 @@ void RenderFrameProxyHost::SetDestructionCallback(
|
2018-09-14 05:02:16 +00: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();
|
