Skip to content

Commit

Permalink
chore: roll 73.0.3683.10
Browse files Browse the repository at this point in the history
  • Loading branch information
deepak1556 committed Feb 4, 2019
1 parent c214b05 commit 37ce80a
Show file tree
Hide file tree
Showing 34 changed files with 115 additions and 115 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ gclient_gn_args = [

vars = {
'chromium_version':
'73.0.3679.0',
'73.0.3683.10',
'node_version':
'fac6d766c143db8db05bb3b0c0871df8f032363c',

Expand Down
2 changes: 1 addition & 1 deletion patches/common/boringssl/expose_aes-cfb.patch
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ index acc4719b7e9c4c4461fc6142f2ae9156b407915b..8b008a401ec2f2d0673f6876609dd578
callback(EVP_aes_256_ecb(), "aes-256-ecb", NULL, arg);
callback(EVP_aes_256_ofb(), "aes-256-ofb", NULL, arg);
diff --git a/include/openssl/cipher.h b/include/openssl/cipher.h
index 59634138cb60237f008eb99e7d8df54da7629c1a..b30b8434b301fb5b8630ae954698b6fee255df77 100644
index e9545c82ca7e663ae25d9e85d29acea2be54d38f..4902859cdb96012eae7956d9fc3b1dcd47a71c07 100644
--- a/include/openssl/cipher.h
+++ b/include/openssl/cipher.h
@@ -421,6 +421,7 @@ OPENSSL_EXPORT const EVP_CIPHER *EVP_aes_192_ofb(void);
Expand Down
4 changes: 2 additions & 2 deletions patches/common/chromium/allow_webview_file_url.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Subject: allow_webview_file_url.patch
Allow webview to load non-web URLs.

diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index 8a67808f690a2baf526f39095dd5e1122319ee91..1ab079b1fe97c506dca39b5b175f045394abae62 100644
index a206be71b8d9f28d659000cd2ea72cdb8f876e07..f4ad084900723a5c0cf78affae7744d8039a8395 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -1449,6 +1449,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
@@ -1447,6 +1447,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
!policy->IsWebSafeScheme(info.common_params.url.scheme()) &&
!is_external_protocol;

Expand Down
2 changes: 1 addition & 1 deletion patches/common/chromium/blink_local_frame.patch
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ when there is code doing that.
This patch reverts the change to fix the crash in Electron.

diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index e07ace500ef1dd60ce9833e7324e238de1018ae6..950c5ff5b14129ab2ca4b8c929ff583b5523b04b 100644
index 9c8ffb99f78ef29df08e139551af984dc23e9de2..8196880b6da930557d22f4c29a6de35c1aa7a763 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -403,10 +403,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
Expand Down
2 changes: 1 addition & 1 deletion patches/common/chromium/boringssl_build_gn.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Subject: boringssl BUILD.gn
Build BoringSSL with some extra functions that nodejs needs.

diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
index 6e4fc85f124ed6dd4a7ac1812686fa59c4e50cdf..fd45cfcb50fb659ff8d5a07b06aeecc8f0ecd3ee 100644
index 8d460717d4c5d2ee56a10689f3d4cead9740ae36..fe8753c128759b9b0421238cabf89a990e600735 100644
--- a/third_party/boringssl/BUILD.gn
+++ b/third_party/boringssl/BUILD.gn
@@ -45,6 +45,19 @@ config("no_asm_config") {
Expand Down
12 changes: 6 additions & 6 deletions patches/common/chromium/can_create_window.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: can_create_window.patch


diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 1a023385a3d27d9145f2a0a069ff6799c69ec66a..8289c09b9e3d30ae171942a987fbc1dca83f58d9 100644
index a6c9e15b29af4ede177593db58a189153a392515..23ecf8e1a679676ef11ad82616bc68f845be1643 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -3697,6 +3697,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -3723,6 +3723,7 @@ void RenderFrameHostImpl::CreateNewWindow(
last_committed_origin_, params->window_container_type,
params->target_url, params->referrer.To<Referrer>(),
params->frame_name, params->disposition, *params->features,
Expand All @@ -32,7 +32,7 @@ index e566a15b798e2586fa4fae3c4db97ce5f4f2f09f..08f52fd73bc9b6231a75f7804bb9b9f3

// Operation result when the renderer asks the browser to create a new window.
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index bce9b68c989da1e287b7e593e1ae281923d1a557..e2f2b8e8d09d1f14b58eb8b093042b89141cdd35 100644
index abc9829f296f26c2217066f68927861d032d9868..f43321b9f7513a1e51367bbd38006e7e2f930923 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -494,6 +494,8 @@ bool ContentBrowserClient::CanCreateWindow(
Expand All @@ -45,7 +45,7 @@ index bce9b68c989da1e287b7e593e1ae281923d1a557..e2f2b8e8d09d1f14b58eb8b093042b89
bool opener_suppressed,
bool* no_javascript_access) {
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 92425b0bded161d513a3e39b8f9631d4c98c143c..5dc21230970fe23a25ad6e811d65c434760d1d1b 100644
index 694796bf8dbba514ae9f09e51186e53be14ae50e..73ea7c49ee5993536902f21a51c8cd3bbe30e3f2 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -171,6 +171,7 @@ class RenderFrameHost;
Expand All @@ -66,7 +66,7 @@ index 92425b0bded161d513a3e39b8f9631d4c98c143c..5dc21230970fe23a25ad6e811d65c434
bool opener_suppressed,
bool* no_javascript_access);
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index ad23a9040c21a674c1b011e7120d4288a722f2bb..ffe7e5d4b2359d8490c514b8abee91c885ac973b 100644
index 77b93bd04c8b7887f9fc5e9dc7d5f42c034e3bfa..468e9ed1d7c24b7b3a1e4e37239c42b75be4e7a9 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -76,6 +76,7 @@
Expand All @@ -77,7 +77,7 @@ index ad23a9040c21a674c1b011e7120d4288a722f2bb..ffe7e5d4b2359d8490c514b8abee91c8
#include "content/renderer/media/audio/audio_device_factory.h"
#include "content/renderer/media/stream/media_stream_device_observer.h"
#include "content/renderer/media/video_capture_impl_manager.h"
@@ -1345,6 +1346,8 @@ WebView* RenderViewImpl::CreateView(
@@ -1343,6 +1344,8 @@ WebView* RenderViewImpl::CreateView(
}
params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features);

Expand Down
12 changes: 6 additions & 6 deletions patches/common/chromium/command-ismediakey.patch
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ and electron/electron@d2368d2d3b3de9eec4cc32b6aaf035cc89921bf1 as
patches.

diff --git a/chrome/browser/extensions/global_shortcut_listener_mac.mm b/chrome/browser/extensions/global_shortcut_listener_mac.mm
index 5ab71f9a7632f0211f2efd7be2298203f32fa83d..e99f55c82e1d59e919fbab65b9cbe833dfa79771 100644
index befe726af9c10b1563a7fc0bb77cc55f65943d5c..46c6fe08bab8471007f78d3ef227e5195bfdf0e1 100644
--- a/chrome/browser/extensions/global_shortcut_listener_mac.mm
+++ b/chrome/browser/extensions/global_shortcut_listener_mac.mm
@@ -20,6 +20,26 @@
@@ -21,6 +21,26 @@

namespace extensions {

Expand Down Expand Up @@ -46,10 +46,10 @@ index 5ab71f9a7632f0211f2efd7be2298203f32fa83d..e99f55c82e1d59e919fbab65b9cbe833
GlobalShortcutListener* GlobalShortcutListener::GetInstance() {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
diff --git a/chrome/browser/extensions/global_shortcut_listener_win.cc b/chrome/browser/extensions/global_shortcut_listener_win.cc
index e5cfd70cc2effcbfd75e60357a44ce467e35fbc9..41d3ebd0628b4a8b5966b2b573d5feac4a19dc82 100644
index eb58c51eb768bb013e293649e0308786c5482e21..e469e5115fce12fe5d382bd75d9c6f41fa24293e 100644
--- a/chrome/browser/extensions/global_shortcut_listener_win.cc
+++ b/chrome/browser/extensions/global_shortcut_listener_win.cc
@@ -60,6 +60,8 @@ void GlobalShortcutListenerWin::OnWndProc(HWND hwnd,
@@ -62,6 +62,8 @@ void GlobalShortcutListenerWin::OnWndProc(HWND hwnd,
modifiers |= (LOWORD(lparam) & MOD_SHIFT) ? ui::EF_SHIFT_DOWN : 0;
modifiers |= (LOWORD(lparam) & MOD_ALT) ? ui::EF_ALT_DOWN : 0;
modifiers |= (LOWORD(lparam) & MOD_CONTROL) ? ui::EF_CONTROL_DOWN : 0;
Expand Down Expand Up @@ -80,7 +80,7 @@ index 392cf3d58c64c088596e8d321a2ce37b0ec60b6e..43e30f47240dc10a3a9b950255d4e487
ui::Accelerator accelerator(
ui::KeyboardCodeFromXKeyEvent(x_event), modifiers);
diff --git a/ui/base/accelerators/media_keys_listener_mac.mm b/ui/base/accelerators/media_keys_listener_mac.mm
index 2320015f9d38f3313bee1de6872910e27cd259d1..33f2ac9c021b69fe17c1857b6dfaa9808e90136b 100644
index b48fa8e63867021bdd77bf585a0e02c366980d91..bae9e24e7bcf7615be243bcb5629cc5981a31b06 100644
--- a/ui/base/accelerators/media_keys_listener_mac.mm
+++ b/ui/base/accelerators/media_keys_listener_mac.mm
@@ -31,6 +31,12 @@ KeyboardCode MediaKeyCodeToKeyboardCode(int key_code) {
Expand All @@ -96,7 +96,7 @@ index 2320015f9d38f3313bee1de6872910e27cd259d1..33f2ac9c021b69fe17c1857b6dfaa980
}
return VKEY_UNKNOWN;
}
@@ -189,7 +195,10 @@ static CGEventRef EventTapCallback(CGEventTapProxy proxy,
@@ -190,7 +196,10 @@ static CGEventRef EventTapCallback(CGEventTapProxy proxy,
int key_code = (data1 & 0xFFFF0000) >> 16;
if (key_code != NX_KEYTYPE_PLAY && key_code != NX_KEYTYPE_NEXT &&
key_code != NX_KEYTYPE_PREVIOUS && key_code != NX_KEYTYPE_FAST &&
Expand Down
4 changes: 2 additions & 2 deletions patches/common/chromium/compositor_delegate.patch
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ index 5aeda7bd9caf6b5b9e2a95293e4409dc7f9a6d2d..d15e1462babe97b5d68014f4d6723665
} else {
DCHECK(context_provider);
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index a445b569ede1cd9331003e21b0427971d98ef924..087802fc0d47276c1449b4d9153756f6beb39bad 100644
index 313431f82ee7e181dad2c48dd27950129afbb223..b8c2632e49b7b96adbb06a03678961823f0790f6 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -25,6 +25,7 @@
Expand Down Expand Up @@ -69,7 +69,7 @@ index a445b569ede1cd9331003e21b0427971d98ef924..087802fc0d47276c1449b4d9153756f6
// Sets the root of the layer tree drawn by this Compositor. The root layer
// must have no parent. The compositor's root layer is reset if the root layer
// is destroyed. NULL can be passed to reset the root layer, in which case the
@@ -440,6 +453,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
@@ -442,6 +455,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
ui::ContextFactory* context_factory_;
ui::ContextFactoryPrivate* context_factory_private_;

Expand Down
4 changes: 2 additions & 2 deletions patches/common/chromium/content_browser_main_loop.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ run before shutdown. This is required to cleanup WebContents asynchronously
in atom::CommonWebContentsDelegate::ResetManageWebContents.

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index a69d86afff84745e1b0cd85ae6eec48f10127ab5..0782f0e890ee86c4f051e3102e3d20bee8276479 100644
index 81d99cb7f9e200e2b8b487eae9292cc61adcbccc..9948a2621ade7b227cbed7d82e885a63197a2ed4 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -1543,7 +1543,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
@@ -1550,7 +1550,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
}

base::RunLoop run_loop;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ this patch can be removed once we switch to network service,
where the embedders have a chance to design their URLLoaders.

diff --git a/content/browser/loader/cross_site_document_resource_handler.cc b/content/browser/loader/cross_site_document_resource_handler.cc
index 7d5a3367774f558583ea69e60c46ab8636a19a81..190565b067ef869a332b77322dc62403c36c1a00 100644
index bd62ed07876ad4a2a7c6e8309843281719dbefb6..13e67994997caf175ba1b30ba8070718a697588d 100644
--- a/content/browser/loader/cross_site_document_resource_handler.cc
+++ b/content/browser/loader/cross_site_document_resource_handler.cc
@@ -631,6 +631,9 @@ bool CrossSiteDocumentResourceHandler::ShouldBlockBasedOnHeaders(
@@ -673,6 +673,9 @@ bool CrossSiteDocumentResourceHandler::ShouldBlockBasedOnHeaders(
return false;
}

Expand All @@ -22,7 +22,7 @@ index 7d5a3367774f558583ea69e60c46ab8636a19a81..190565b067ef869a332b77322dc62403
}

diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 84b324992f22a65030b8badc05f6ce542929dea6..5703236f5ea937ebe3111fe79cf30f9ffb172a04 100644
index 2d1eb5e9f7c9494920e626a1c89cb3417627d12d..d10724466f8802d434b868da769379f49fe115bc 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -58,6 +58,10 @@ ContentBrowserClient::SiteInstanceForNavigationType ContentBrowserClient::Should
Expand All @@ -37,7 +37,7 @@ index 84b324992f22a65030b8badc05f6ce542929dea6..5703236f5ea937ebe3111fe79cf30f9f
const MainFunctionParams& parameters) {
return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 031332e91cf38cb3d69cd73778a9e4a0701f7645..108c1e2f57b4fd86bbf819452da37da3cc96e5bb 100644
index de03cae23d8c9e93181562f9d09f215ce8eddc2f..cc29e2795477e3ace7c57a04502c8c3dc7b04fb4 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -237,6 +237,9 @@ class CONTENT_EXPORT ContentBrowserClient {
Expand Down
10 changes: 5 additions & 5 deletions patches/common/chromium/dcheck.patch
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ only one or two specific checks fail. Then it's better to simply comment out the
failing checks and allow the rest of the target to have them enabled.

diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
index 63f520bae169ecdcc311bf038b962b1ff3e30126..734e51af5ecbf5faa210255a1fae3efda5293ac8 100644
index 5249401e58a57f0278665f2c6648c7e6e8e1bf77..518b1279714888121095af9bdb077f3622c1255d 100644
--- a/content/browser/frame_host/navigation_controller_impl.cc
+++ b/content/browser/frame_host/navigation_controller_impl.cc
@@ -1153,8 +1153,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
@@ -1170,8 +1170,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
return NAVIGATION_TYPE_NEW_SUBFRAME;
}

Expand All @@ -33,7 +33,7 @@ index 63f520bae169ecdcc311bf038b962b1ff3e30126..734e51af5ecbf5faa210255a1fae3efd

if (rfh->GetParent()) {
// All manual subframes would be did_create_new_entry and handled above, so
@@ -1395,7 +1397,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(
@@ -1412,7 +1414,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(
new_entry->GetFavicon() = GetLastCommittedEntry()->GetFavicon();
}

Expand Down Expand Up @@ -75,10 +75,10 @@ index 3073b0856d29e442f8905041350a2bb196aa24ce..e997f094c75e055b44ce4a31c359c31c
<< AsciiForDebugging() << " " << CurrentThread();
#endif
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
index 1857bfa07ce3d8656105e696363a760889794e77..c25d8c241907fb166218670533a3b6e1e2f32769 100644
index 49654c95675e0240d82232eb971f85ab3611ab29..8f0737841f70144770dc4dfd7353f7bdba3ffcfd 100644
--- a/ui/base/clipboard/clipboard_win.cc
+++ b/ui/base/clipboard/clipboard_win.cc
@@ -913,9 +913,9 @@ void ClipboardWin::WriteBitmapFromHandle(HBITMAP source_hbitmap,
@@ -726,9 +726,9 @@ void ClipboardWin::WriteBitmapFromHandle(HBITMAP source_hbitmap,
}

void ClipboardWin::WriteToClipboard(unsigned int format, HANDLE handle) {
Expand Down
12 changes: 6 additions & 6 deletions patches/common/chromium/disable_color_correct_rendering.patch
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ to deal with color spaces. That is being tracked at
https://crbug.com/634542 and https://crbug.com/711107.

diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index bc110bfd003e41b1b170c4d8cd404ab0a88240e3..8979c777978216b6e0f7f89f19200afc57f08012 100644
index 6a44080f30936c8383f575c8c65c5582d9ed7fc3..b4394286e0a54357973d23ed94731ae7e830b2a8 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1569,6 +1569,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
Expand Down Expand Up @@ -218,10 +218,10 @@ index 6ee04d0919d9b4ae5e2d6719f1417f00a3d600fa..62c0b5da24e02102b268429b1d8e3654
+
+#undef PATCH_CS
diff --git a/components/viz/service/display/skia_renderer.cc b/components/viz/service/display/skia_renderer.cc
index 54e1614d979ef2afa5e23404541cfc2d1227e17d..97190566b60140cbdac43a5c57deb03e1fc48982 100644
index 5a757c437d36f98d6d813ef2af81b46434cdc5de..86ed034d207fe5cdf6810de085cc34ea8981169c 100644
--- a/components/viz/service/display/skia_renderer.cc
+++ b/components/viz/service/display/skia_renderer.cc
@@ -707,9 +707,11 @@ void SkiaRenderer::DrawPictureQuad(const PictureDrawQuad* quad,
@@ -708,9 +708,11 @@ void SkiaRenderer::DrawPictureQuad(const PictureDrawQuad* quad,

std::unique_ptr<SkCanvas> color_transform_canvas;
// TODO(enne): color transform needs to be replicated in gles2_cmd_decoder
Expand Down Expand Up @@ -268,7 +268,7 @@ index 4aa391a6bfe2408b84da4ffe5b3dc27a0544d0ca..649efb7ed16e6f4850010c8b9df5d0b7
service_manager::switches::kGpuSandboxAllowSysVShm,
service_manager::switches::kGpuSandboxFailuresFatal,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index ecbfc65e474409a0d073362d6734047b098d2c7f..2aa5ba9d51adda083a5eeac2c200b2ffba106b21 100644
index 5759d527ecc355a88cb8632a2cebdf2e76ab3940..2c9d59feb24caf009dfd909f19334486ab87177d 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -221,6 +221,7 @@
Expand All @@ -288,10 +288,10 @@ index ecbfc65e474409a0d073362d6734047b098d2c7f..2aa5ba9d51adda083a5eeac2c200b2ff
network::switches::kExplicitlyAllowedPorts,
service_manager::switches::kDisableInProcessStackTraces,
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 6d5833dc1bef727aba4c012563c3e161a9dab9ae..3215ab16ad51e7d519baa1e82fd0a9c489b8e31a 100644
index 3eb59602364dc178fc783867c5dff036c8be70d3..4f4f4c08bf62752df1a47d5e8c91452365b8ea5b 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -2641,6 +2641,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings(
@@ -2658,6 +2658,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings(
settings.main_frame_before_activation_enabled =
cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation);

Expand Down
2 changes: 1 addition & 1 deletion patches/common/chromium/disable_detach_webview_frame.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ 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 656498fdbad93c8fcc758e08653f5417e7406345..476db3bdc90a6bf014e0a2ab4f2b47651ef8e1cc 100644
index f075640df52ca30b29b03eed1ac5ffdbba995957..09877293148fa486c4b48cbd8d6554f92a330ddc 100644
--- a/content/browser/frame_host/render_frame_proxy_host.cc
+++ b/content/browser/frame_host/render_frame_proxy_host.cc
@@ -263,6 +263,12 @@ void RenderFrameProxyHost::SetDestructionCallback(
Expand Down
4 changes: 2 additions & 2 deletions patches/common/chromium/disable_hidden.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: disable_hidden.patch


diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 801517c670e4cfb5adcfa0a14d2626c2be90e833..e63f00a1c4013f1e07f3b1adcdb34ea24eac3916 100644
index 316e7cf9819c0ffe3a15a55e6bcada781d6d7832..d90f50ed29740b14e6259c4d6d14434222ddbfb4 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -763,6 +763,9 @@ void RenderWidgetHostImpl::WasHidden() {
@@ -760,6 +760,9 @@ void RenderWidgetHostImpl::WasHidden() {
if (is_hidden_)
return;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Subject: disable_user_gesture_requirement_for_beforeunload_dialogs.patch
See https://github.com/electron/electron/issues/10754

diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
index 09418dad61316ad4534e8f9c71cc153ffc5e0ffd..20e90ed973b0de71c07cbcd21578d7eee8cab06e 100644
index 21ef6fd598dfedb5d443fc7162d08af19c137bf1..b3d157158db866aaa8f5132d71453ced61553577 100644
--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
@@ -3675,7 +3675,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client,
@@ -3665,7 +3665,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client,
"frame that never had a user gesture since its load. "
"https://www.chromestatus.com/feature/5082396709879808";
Intervention::GenerateReport(frame_, "BeforeUnloadNoGesture", message);
Expand Down

0 comments on commit 37ce80a

Please sign in to comment.