96b32a814c
* chore: bump chromium in DEPS to 2930eb12d56988c2c80bad2797ab036fe493d4e1 * chore: update patches * Revert "disable robotjs-based tests" This reverts commite56adafc1f. * Revert "skip dbus tests (#18409)" This reverts commitaea042cc83. * Revert "skip more dbus tests" This reverts commit68dbef48da. * chore: bump chromium in DEPS to fd62da5601399b92effaa32a943fcd96143c8605 * chore: bump chromium in DEPS to 99f87ca22ee6e7ec953defe694771cb68f47a596 * chore: bump chromium in DEPS to d88778435b4cd9a510a63385b6d4ba24674b9774 * chore: update patches * chore: update ssl_security_state_tab_helper.patch * Remove content_packaged_services https://chromium-review.googlesource.com/c/chromium/src/+/1604203 * chore: fix false positive lint error * views: wireup widget name to crash data https://chromium-review.googlesource.com/c/chromium/src/+/1626640 * chore: bump chromium in DEPS to ab588d36191964c4bca8de5c320534d95606c861 * roll patches
30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
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 40b42d5c85d693d15aedb6265628fe8da15dae76..1fdf88d06a869da2edad9383456cc89129f7d7cc 100644
|
|
--- a/content/browser/frame_host/render_frame_proxy_host.cc
|
|
+++ b/content/browser/frame_host/render_frame_proxy_host.cc
|
|
@@ -261,6 +261,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;
|
|
}
|