716cb28430
* chore: bump chromium in DEPS to 1e9f9a24aa12bea9cf194a82a7e249bd1242ec4f * chore: update patches * Make WebContents' theme color a base::Optional<SkColor>1540022* update autofill patch for incorrect header includes * Move Shell messages to web_test and rename to BlinkTest.1525181* Make PlatformNotificationServiceImpl a KeyedService.1336150* Move MediaPlayerId to its own file.1547057* Remove net/base/completion_callback.h, which is no longer used1552821* AW NS: support file scheme cookies1533486* Remove SecurityInfo and adapt remaining consumers1509455* Remove deprecated type-specific number to string conversion functions1545881* DevTools: Adding new performance histograms for launch of top 4 tools1506388* Update include paths for //base/hash/hash.h1544630* build: Disable ensure_gn_version gclient hook for mac CI checkout * update patches * use maybe version of v8::String::NewFromTwoByte * bump appveyor image version * fix mac ci hopefully * Convert enum to enum class for MenuAnchorPosition1530508* use maybe version of ToObject * RenderViewHost::GetProcess is no longer const * Unrefcount AuthChallengeInfo1550631* MenuButtonController takes Button rather than MenuButton1500935* add //ui/views_bridge_mac to deps to fix link error * forward declare views::Button in atom::MenuDelegate * more v8 patches * base/{=> hash}/md5.h1535124* gfx::{PlatformFontWin => win}::*1534178* fix v8 patches * [base] Rename TaskScheduler to ThreadPool1561552* use internal_config_base for bytecode_builtins_list_generator avoids windows link errors * FIXME: temporarily disable v8/breakpad integration * FIXME: temporarily disable prevent-will-redirect test * FIXME: disable neon on aarch64 pending crbug.com/953815 * update to account for WebCursor refactor1562755* enable stack dumping on appveyor * Revert "FIXME: disable neon on aarch64 pending crbug.com/953815" This reverts commit 57f082026be3d83069f2a2814684abf4dc9e7b53. * fix: remove const qualifiers to match upstream * fix: remove const qualifiers to match upstream in cc files as well * don't throw an error when testing if an object is an object * use non-deprecated Buffer constructor * Remove net::CookieSameSite::DEFAULT_MODE enum value1567955* depend on modded dbus-native to work around buffer deprecation https://github.com/sidorares/dbus-native/pull/262 * revert clang roll to fix arm build on linux * fixup! depend on modded dbus-native to work around buffer deprecation need more coffee * update coffee-script * robustify verify-mksnapshot w.r.t. command-line parameters * Revert "robustify verify-mksnapshot w.r.t. command-line parameters" This reverts commit a49af01411f684f6025528d604895c3696e0bc57. * fix mksnapshot by matching args * update patches * TMP: enable rdp on appveyor * Changed ContentBrowserClient::CreateQuotaPermissionContext() to return scoped_refptr.1569376* Make content::ResourceType an enum class.1569345* fixup! Make content::ResourceType an enum class. * turn off rdp * use net::CompletionRepeatingCallback instead of base::Callback<void(int)> * remove disable_ensure_gn_version_gclient_hook.patch * copy repeating callback instead of std::move * fix lint * add completion_repeating_callback.h include
30 lines
1.4 KiB
Diff
30 lines
1.4 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 f0ede24b7a723485996b9181d1521ffce87449de..6d4815276f6c2e44b16e7ad8bd0983788cd1fbcf 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(
|
|
|
|
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();
|