chore: bump chromium to 7dff37844cb3 (master) (#18059)

This commit is contained in:
Electron Bot 2019-04-30 20:18:22 -04:00 committed by Jeremy Apthorp
parent 00358545a9
commit 2616911f7a
77 changed files with 1636 additions and 294 deletions

View file

@ -12,19 +12,19 @@ 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 f0ede24b7a723485996b9181d1521ffce87449de..6d4815276f6c2e44b16e7ad8bd0983788cd1fbcf 100644
index f93a9b7747c6501df48ffa6be286cdba3f0344d5..bff8ed632f878f74caab9b4184127f480877305c 100644
--- a/content/browser/frame_host/render_frame_proxy_host.cc
+++ b/content/browser/frame_host/render_frame_proxy_host.cc
@@ -270,6 +270,12 @@ void RenderFrameProxyHost::SetDestructionCallback(
@@ -268,6 +268,12 @@ void RenderFrameProxyHost::SetDestructionCallback(
void RenderFrameProxyHost::OnDetach() {
if (frame_tree_node_->render_manager()->ForInnerDelegate()) {
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;
+
// Only main frame proxy can detach for inner WebContents.
DCHECK(frame_tree_node_->IsMainFrame());
frame_tree_node_->render_manager()->RemoveOuterDelegateFrame();
return;
}