From 446944c677f432bc6b0395ef89292972b2f5f73a Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Tue, 21 May 2019 10:05:21 -0700 Subject: [PATCH] rebase patches --- .../chromium/allow_webview_file_url.patch | 4 +- .../common/chromium/blink_local_frame.patch | 6 +-- .../common/chromium/blink_world_context.patch | 10 ++--- .../chromium/browser_compositor_mac.patch | 4 +- .../common/chromium/can_create_window.patch | 12 ++--- ...r_to_prevent_locking_scheme_registry.patch | 4 +- .../chromium/content_browser_main_loop.patch | 4 +- ...cross_site_document_resource_handler.patch | 4 +- .../disable_color_correct_rendering.patch | 34 +++++++------- .../disable_detach_webview_frame.patch | 4 +- patches/common/chromium/disable_hidden.patch | 4 +- .../disable_network_services_by_default.patch | 6 +-- ...requirement_for_beforeunload_dialogs.patch | 4 +- ...screen_rendering_with_viz_compositor.patch | 35 ++++++++------- .../common/chromium/frame_host_manager.patch | 12 ++--- patches/common/chromium/mas-cfisobjc.patch | 2 +- .../common/chromium/mas_no_private_api.patch | 6 +-- .../chromium/notification_provenance.patch | 6 +-- patches/common/chromium/pepper_flash.patch | 23 +++++----- patches/common/chromium/printing.patch | 2 +- .../render_widget_host_view_base.patch | 17 +++---- .../render_widget_host_view_mac.patch | 4 +- .../chromium/resource_file_conflict.patch | 6 +-- .../common/chromium/scroll_bounce_flag.patch | 2 +- .../v8_context_snapshot_generator.patch | 2 +- patches/common/chromium/web_contents.patch | 6 +-- .../common/chromium/webview_cross_drag.patch | 4 +- .../worker_context_will_destroy.patch | 18 ++++---- patches/common/v8/add_realloc.patch | 10 ++--- patches/common/v8/build_gn.patch | 8 ++-- patches/common/v8/dcheck.patch | 16 +++---- ...vide_more_v8_backwards_compatibility.patch | 45 +++++++++---------- ...ort_symbols_needed_for_windows_build.patch | 4 +- patches/common/v8/expose_mksnapshot.patch | 4 +- ...v8_export_private_to_arm_arm64_ports.patch | 28 ++++++------ 35 files changed, 180 insertions(+), 180 deletions(-) diff --git a/patches/common/chromium/allow_webview_file_url.patch b/patches/common/chromium/allow_webview_file_url.patch index 1e6a0f33cc72..56cee9630491 100644 --- a/patches/common/chromium/allow_webview_file_url.patch +++ b/patches/common/chromium/allow_webview_file_url.patch @@ -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 5d721cad1ed0d42441edd57c8c17b559abbbf0a7..c100b8b7d645a2683aee410234cc3d05335eb7ea 100644 +index 73c8f135fe2619e1588e7fcd5bc33e4ba7bfdef9..cc2409ee161bcdc7ec5d1db041517ef830dbd06f 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc -@@ -1473,6 +1473,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest( +@@ -1475,6 +1475,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest( !policy->IsWebSafeScheme(info.common_params.url.scheme()) && !is_external_protocol; diff --git a/patches/common/chromium/blink_local_frame.patch b/patches/common/chromium/blink_local_frame.patch index 3f9e46859658..974922e026ad 100644 --- a/patches/common/chromium/blink_local_frame.patch +++ b/patches/common/chromium/blink_local_frame.patch @@ -14,10 +14,10 @@ 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 29a339c3bad6c8e5a8cae29ee421a83f039f9717..f155d964fb665726f8959295b7c8876c559b87f2 100644 +index 063a9ecc319c0dd575362bf0887373365cd37191..11f36d34ef71735157b08f023d5b8b3b3e2d3b8b 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -406,10 +406,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { +@@ -392,10 +392,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { } CHECK(!view_ || !view_->IsAttached()); @@ -28,7 +28,7 @@ index 29a339c3bad6c8e5a8cae29ee421a83f039f9717..f155d964fb665726f8959295b7c8876c if (!Client()) return; -@@ -427,6 +423,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) { +@@ -413,6 +409,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) { // Notify ScriptController that the frame is closing, since its cleanup ends // up calling back to LocalFrameClient via WindowProxy. GetScriptController().ClearForClose(); diff --git a/patches/common/chromium/blink_world_context.patch b/patches/common/chromium/blink_world_context.patch index 4772dd887256..82ed42d9b4c8 100644 --- a/patches/common/chromium/blink_world_context.patch +++ b/patches/common/chromium/blink_world_context.patch @@ -5,10 +5,10 @@ Subject: blink_world_context.patch diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h -index fa0c5f7ad8e20b429b697de0f81fe84199c09a87..1bacc981007b4706dc5bd775f96ac4fccb12cdaf 100644 +index 82fb3fdfe6bfa8c8d885ee133270b6f2564325a8..f3bad71eab608d3b9ac0e08446c9e520f47e9b10 100644 --- a/third_party/blink/public/web/web_local_frame.h +++ b/third_party/blink/public/web/web_local_frame.h -@@ -351,6 +351,9 @@ class WebLocalFrame : public WebFrame { +@@ -355,6 +355,9 @@ class WebLocalFrame : public WebFrame { // be calling this API. virtual v8::Local MainWorldScriptContext() const = 0; @@ -19,10 +19,10 @@ index fa0c5f7ad8e20b429b697de0f81fe84199c09a87..1bacc981007b4706dc5bd775f96ac4fc // that the script evaluated to with callback. Script execution can be // suspend. diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc -index bed103526f62358fa98973ba11bc3e1d9688c159..fcfc4948bc723864ac39cfef34ad28d3a673c0e2 100644 +index 88bb36db8cd1a499c133dcad29a9d20de4cc5ed1..e44ebd669d720d324d525d74e7690dcfeaea3c02 100644 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc -@@ -861,6 +861,13 @@ v8::Local WebLocalFrameImpl::GlobalProxy() const { +@@ -873,6 +873,13 @@ v8::Local WebLocalFrameImpl::GlobalProxy() const { return MainWorldScriptContext()->Global(); } @@ -37,7 +37,7 @@ index bed103526f62358fa98973ba11bc3e1d9688c159..fcfc4948bc723864ac39cfef34ad28d3 return BindingSecurity::ShouldAllowAccessToFrame( CurrentDOMWindow(V8PerIsolateData::MainThreadIsolate()), diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h -index 8b5916d086f1de3467a8579aebbb910c6568256f..cdea9b68698713cd635f9b1e0c54e1efca76cd51 100644 +index 3db1bec7516a40eb2f654574baa108e99ff9fb2d..fb5b43e48e455d64ce986cb5490291fc1c18d8ba 100644 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h @@ -146,6 +146,8 @@ class CORE_EXPORT WebLocalFrameImpl final diff --git a/patches/common/chromium/browser_compositor_mac.patch b/patches/common/chromium/browser_compositor_mac.patch index ff1791a61b82..7e47d8119f0b 100644 --- a/patches/common/chromium/browser_compositor_mac.patch +++ b/patches/common/chromium/browser_compositor_mac.patch @@ -26,10 +26,10 @@ index de89d291e5cbc0981cf06170ed35502a1239136d..656f6c38d55d9f9af569bc772254ca13 viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink); void OnDidNotProduceFrame(const viz::BeginFrameAck& ack); diff --git a/content/browser/renderer_host/browser_compositor_view_mac.mm b/content/browser/renderer_host/browser_compositor_view_mac.mm -index 625566d5ad2510679cd3ed4c306c1cd3715f4c94..342c85daba1812461b4d9c0f9255220b26aca770 100644 +index 4b3f3c7e97e73ad6d0166ad114f4168d9ed00e11..59e58d693c971742951434f6582140d9179235f2 100644 --- a/content/browser/renderer_host/browser_compositor_view_mac.mm +++ b/content/browser/renderer_host/browser_compositor_view_mac.mm -@@ -79,6 +79,12 @@ +@@ -80,6 +80,12 @@ DCHECK_EQ(1u, num_erased); } diff --git a/patches/common/chromium/can_create_window.patch b/patches/common/chromium/can_create_window.patch index 89491ae6e727..ac2c64afd973 100644 --- a/patches/common/chromium/can_create_window.patch +++ b/patches/common/chromium/can_create_window.patch @@ -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 ac73b61ebe584abaf18b0de782ad4111996edd71..0d78b60fcc9d6bf312981a5033b8d5ee7671d2ae 100644 +index 14bc2ffdcdb71e70b294960333eab765332e280d..d2863986ddafcece65fc88b0ad1f5f7a84ecf9a0 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc -@@ -3730,6 +3730,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -3725,6 +3725,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, @@ -17,7 +17,7 @@ index ac73b61ebe584abaf18b0de782ad4111996edd71..0d78b60fcc9d6bf312981a5033b8d5ee &no_javascript_access); diff --git a/content/common/frame.mojom b/content/common/frame.mojom -index ee0ca5d5b76756ab4123652b02298eede20f22e0..51c89138745cf587a483771b4716b5cabef91eb3 100644 +index 82882159b0bac6d47d678c485de0aacc7db06c2d..dd2299094b79d82da7ec1cd8f559050b6f0e2af5 100644 --- a/content/common/frame.mojom +++ b/content/common/frame.mojom @@ -291,6 +291,10 @@ struct CreateNewWindowParams { @@ -32,7 +32,7 @@ index ee0ca5d5b76756ab4123652b02298eede20f22e0..51c89138745cf587a483771b4716b5ca // 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 74da3ccb05fb9eababe966b881eca87d5c71a9f6..66280289f51a89dcd17c288569348efa18227e9b 100644 +index da482a1a1638f27a413502d9be16a5fb12e9678c..de19cb3a5f3d6685d8dede7c3cdb5b47183ed07f 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -518,6 +518,8 @@ bool ContentBrowserClient::CanCreateWindow( @@ -45,7 +45,7 @@ index 74da3ccb05fb9eababe966b881eca87d5c71a9f6..66280289f51a89dcd17c288569348efa 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 3545b144d53e22334b3d844a7904aa6e2e741076..f0e60c3e8c135712db5cb8e918109f249502bee9 100644 +index 5e79a99f045272846f3840547345adffb991421b..2c722d14437cdad69544e0c67921dbaec15b97da 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -175,6 +175,7 @@ class RenderFrameHost; @@ -66,7 +66,7 @@ index 3545b144d53e22334b3d844a7904aa6e2e741076..f0e60c3e8c135712db5cb8e918109f24 bool opener_suppressed, bool* no_javascript_access); diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc -index d13a90f530fd47d16be0e6681317d627b8877f19..a6be87cd24168f76ba1658496642ec0ead1d3923 100644 +index 25ab2ac5822670c6f912e4b032f280497cb26ec3..8917dbce71a415c60764f52a977c27a6fe8d335e 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -77,6 +77,7 @@ diff --git a/patches/common/chromium/content_allow_embedder_to_prevent_locking_scheme_registry.patch b/patches/common/chromium/content_allow_embedder_to_prevent_locking_scheme_registry.patch index 6208f2481a99..37fb9a2cdb51 100644 --- a/patches/common/chromium/content_allow_embedder_to_prevent_locking_scheme_registry.patch +++ b/patches/common/chromium/content_allow_embedder_to_prevent_locking_scheme_registry.patch @@ -12,10 +12,10 @@ Without this patch, calling `registerStandardSchemes` during initialization when in debug mode will cause a DCHECK to fire. diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc -index 3dda0677bfc7ff8bb0e2728ab40f586c450a4a20..1d094c0ebbfe4ee5a75c58ce7f823bdb0a1124f7 100644 +index dcf8654b210be64d55d98c784075e2453e6dad8f..cee4e47229b8d6bbb1e8b8e985eb3bb0b240f910 100644 --- a/content/app/content_main_runner_impl.cc +++ b/content/app/content_main_runner_impl.cc -@@ -758,7 +758,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) { +@@ -750,7 +750,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) { #endif RegisterPathProvider(); diff --git a/patches/common/chromium/content_browser_main_loop.patch b/patches/common/chromium/content_browser_main_loop.patch index 2b9bd57794d8..0124139250fe 100644 --- a/patches/common/chromium/content_browser_main_loop.patch +++ b/patches/common/chromium/content_browser_main_loop.patch @@ -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 55908d91d73a0de843fde9749539951f55a1d661..8bd29acde46e8368a38c756d4758763e372e549d 100644 +index 6a24bdf80820778fb8cbc627dfb9524ac438e2d3..074fb851cb44df66862f2eb4b2c5830269195cfc 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc -@@ -1523,7 +1523,7 @@ void BrowserMainLoop::MainMessageLoopRun() { +@@ -1524,7 +1524,7 @@ void BrowserMainLoop::MainMessageLoopRun() { } base::RunLoop run_loop; diff --git a/patches/common/chromium/cross_site_document_resource_handler.patch b/patches/common/chromium/cross_site_document_resource_handler.patch index 355f668a3881..a1998007e16b 100644 --- a/patches/common/chromium/cross_site_document_resource_handler.patch +++ b/patches/common/chromium/cross_site_document_resource_handler.patch @@ -22,7 +22,7 @@ index 2151c5b9698e9a2768875d04a2297956cc4c0d41..8a316a117ab367bcbac947894cbe1bc2 } diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc -index 0569c5b0ae4bed017c9b240689aef647f099d57e..c7b5c9a7245d1c738e5c103d378d0f2a5eb1f492 100644 +index acf458d5c088607d3ceb6d058f28f076bf4cf712..4bdfeefc531b378f33b143ea432aebd69906bf08 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -61,6 +61,10 @@ ContentBrowserClient::SiteInstanceForNavigationType ContentBrowserClient::Should @@ -37,7 +37,7 @@ index 0569c5b0ae4bed017c9b240689aef647f099d57e..c7b5c9a7245d1c738e5c103d378d0f2a const MainFunctionParams& parameters) { return nullptr; diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 6219857d40d63f1d6918d941b31c80f3729a8dba..74f8a2a0f44ee5daaa68cff108ffb5a458a8777b 100644 +index 9c7c77b44d279219411ce545c5448acecbd56d59..f99105176cc97e13b5d2b7c470b95e23b404de0a 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -241,6 +241,9 @@ class CONTENT_EXPORT ContentBrowserClient { diff --git a/patches/common/chromium/disable_color_correct_rendering.patch b/patches/common/chromium/disable_color_correct_rendering.patch index 10ca0c2b70b8..df922d03d411 100644 --- a/patches/common/chromium/disable_color_correct_rendering.patch +++ b/patches/common/chromium/disable_color_correct_rendering.patch @@ -65,10 +65,10 @@ index 78a6b5739caed8c3925f303c52ed107be8e4ccfe..ddbf660e594c1a991d4e758fa11b1b2e !command_line->HasSwitch(switches::kUIDisablePartialSwap); #if defined(OS_WIN) diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc -index a70fb439a3bf3ef210d1ea3a9256353bda6a02bb..c90de321edfc101f7c22b42936044bb3dde5eeb2 100644 +index edf8e92edadae9354962a98712e3bc0ac7410fbe..553c181f04180185acfcf865e59c6dea839cc973 100644 --- a/components/viz/service/display/gl_renderer.cc +++ b/components/viz/service/display/gl_renderer.cc -@@ -79,6 +79,9 @@ +@@ -80,6 +80,9 @@ using gpu::gles2::GLES2Interface; @@ -78,7 +78,7 @@ index a70fb439a3bf3ef210d1ea3a9256353bda6a02bb..c90de321edfc101f7c22b42936044bb3 namespace viz { namespace { -@@ -553,8 +556,9 @@ void GLRenderer::DoDrawQuad(const DrawQuad* quad, +@@ -554,8 +557,9 @@ void GLRenderer::DoDrawQuad(const DrawQuad* quad, void GLRenderer::DrawDebugBorderQuad(const DebugBorderDrawQuad* quad) { SetBlendEnabled(quad->ShouldDrawWithBlending()); @@ -90,7 +90,7 @@ index a70fb439a3bf3ef210d1ea3a9256353bda6a02bb..c90de321edfc101f7c22b42936044bb3 // Use the full quad_rect for debug quads to not move the edges based on // partial swaps. -@@ -1406,7 +1410,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params, +@@ -1353,7 +1357,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params, params->use_aa ? USE_AA : NO_AA, mask_mode, mask_for_background, params->use_color_matrix, tint_gl_composited_content_, ShouldApplyRoundedCorner(params->quad)), @@ -100,7 +100,7 @@ index a70fb439a3bf3ef210d1ea3a9256353bda6a02bb..c90de321edfc101f7c22b42936044bb3 } void GLRenderer::UpdateRPDQUniforms(DrawRenderPassDrawQuadParams* params) { -@@ -1877,8 +1882,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad, +@@ -1824,8 +1829,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad, SetUseProgram(ProgramKey::SolidColor(use_aa ? USE_AA : NO_AA, tint_gl_composited_content_, ShouldApplyRoundedCorner(quad)), @@ -111,7 +111,7 @@ index a70fb439a3bf3ef210d1ea3a9256353bda6a02bb..c90de321edfc101f7c22b42936044bb3 SetShaderColor(color, opacity); if (current_program_->rounded_corner_rect_location() != -1) { SetShaderRoundedCorner( -@@ -2033,8 +2038,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad, +@@ -1980,8 +1985,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad, : NON_PREMULTIPLIED_ALPHA, false, false, tint_gl_composited_content_, ShouldApplyRoundedCorner(quad)), @@ -122,7 +122,7 @@ index a70fb439a3bf3ef210d1ea3a9256353bda6a02bb..c90de321edfc101f7c22b42936044bb3 if (current_program_->tint_color_matrix_location() != -1) { auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix(); -@@ -2130,8 +2135,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad, +@@ -2077,8 +2082,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad, !quad->ShouldDrawWithBlending(), has_tex_clamp_rect, tint_gl_composited_content_, ShouldApplyRoundedCorner(quad)), @@ -133,7 +133,7 @@ index a70fb439a3bf3ef210d1ea3a9256353bda6a02bb..c90de321edfc101f7c22b42936044bb3 if (current_program_->tint_color_matrix_location() != -1) { auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix(); -@@ -2234,7 +2239,7 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad, +@@ -2181,7 +2186,7 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad, DCHECK_NE(src_color_space, src_color_space.GetAsFullRangeRGB()); gfx::ColorSpace dst_color_space = @@ -142,7 +142,7 @@ index a70fb439a3bf3ef210d1ea3a9256353bda6a02bb..c90de321edfc101f7c22b42936044bb3 // Force sRGB output on Windows for overlay candidate video quads to match // DirectComposition behavior in case these switch between overlays and // compositing. See https://crbug.com/811118 for details. -@@ -2390,8 +2395,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad, +@@ -2337,8 +2342,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad, SetUseProgram(ProgramKey::VideoStream(tex_coord_precision, ShouldApplyRoundedCorner(quad)), @@ -153,7 +153,7 @@ index a70fb439a3bf3ef210d1ea3a9256353bda6a02bb..c90de321edfc101f7c22b42936044bb3 DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_)); gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id()); -@@ -2448,8 +2453,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) { +@@ -2395,8 +2400,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) { draw_cache_.nearest_neighbor ? GL_NEAREST : GL_LINEAR); // Bind the program to the GL state. @@ -164,7 +164,7 @@ index a70fb439a3bf3ef210d1ea3a9256353bda6a02bb..c90de321edfc101f7c22b42936044bb3 if (current_program_->rounded_corner_rect_location() != -1) { SetShaderRoundedCorner( -@@ -3142,7 +3147,9 @@ void GLRenderer::PrepareGeometry(BoundGeometry binding) { +@@ -3089,7 +3094,9 @@ void GLRenderer::PrepareGeometry(BoundGeometry binding) { void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color, const gfx::ColorSpace& src_color_space, const gfx::ColorSpace& dst_color_space) { @@ -175,7 +175,7 @@ index a70fb439a3bf3ef210d1ea3a9256353bda6a02bb..c90de321edfc101f7c22b42936044bb3 ProgramKey program_key = program_key_no_color; const gfx::ColorTransform* color_transform = -@@ -3496,7 +3503,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource( +@@ -3443,7 +3450,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource( *overlay_texture = FindOrCreateOverlayTexture( params.quad->render_pass_id, iosurface_width, iosurface_height, @@ -184,7 +184,7 @@ index a70fb439a3bf3ef210d1ea3a9256353bda6a02bb..c90de321edfc101f7c22b42936044bb3 *new_bounds = gfx::RectF(updated_dst_rect.origin(), gfx::SizeF((*overlay_texture)->texture.size())); -@@ -3700,8 +3707,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) { +@@ -3647,8 +3654,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) { PrepareGeometry(SHARED_BINDING); @@ -196,14 +196,14 @@ index a70fb439a3bf3ef210d1ea3a9256353bda6a02bb..c90de321edfc101f7c22b42936044bb3 gfx::Transform render_matrix; render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(), -@@ -3861,3 +3869,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize( +@@ -3808,3 +3816,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize( } } // namespace viz + +#undef PATCH_CS diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc -index 03af9941b7029f71c24785b45afeaa1fd05deebb..2af2a2a383270b89d945b6d5a08fedc936b60caf 100644 +index f19bbb46ea6f3962f83d10fb400ae55584a17a9e..c5dff79af54a03ef888e4474e5ea53689e8e8cd7 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc @@ -191,6 +191,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus( @@ -235,10 +235,10 @@ index dffe06fa5262a0b6aebe064f8813b149439cb613..59c8ac411b4525f4a866b16c04c1a37a network::switches::kExplicitlyAllowedPorts, service_manager::switches::kDisableInProcessStackTraces, diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc -index 530154f0b9544cff8e15270e6cf7fff41476f409..89d0e83551230a174d7d402bb7487329abc9b559 100644 +index 046e138def4407388c5f668a8e3099c686ad9f9d..b648c09433efe925a098ac94caa797829344a3f6 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc -@@ -2803,6 +2803,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings( +@@ -2798,6 +2798,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings( settings.main_frame_before_activation_enabled = cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation); diff --git a/patches/common/chromium/disable_detach_webview_frame.patch b/patches/common/chromium/disable_detach_webview_frame.patch index d40366468bf2..c6f26d9a0558 100644 --- a/patches/common/chromium/disable_detach_webview_frame.patch +++ b/patches/common/chromium/disable_detach_webview_frame.patch @@ -12,10 +12,10 @@ 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 011665473863e973b3fdb48bdee64efc51330a24..f16ee98fd1311a45c343fc0d397bc7703ec2e554 100644 +index 7f0d8867dcf5eeaad3a1294014a141ff52e0643d..fc8b96dfd1c3a6d87ebc2cce1f736735e69743e6 100644 --- a/content/browser/frame_host/render_frame_proxy_host.cc +++ b/content/browser/frame_host/render_frame_proxy_host.cc -@@ -276,6 +276,12 @@ void RenderFrameProxyHost::SetDestructionCallback( +@@ -261,6 +261,12 @@ void RenderFrameProxyHost::BubbleLogicalScroll( void RenderFrameProxyHost::OnDetach() { if (frame_tree_node_->render_manager()->IsMainFrameForInnerDelegate()) { diff --git a/patches/common/chromium/disable_hidden.patch b/patches/common/chromium/disable_hidden.patch index 50135cab03c9..ce33d5ea1b2b 100644 --- a/patches/common/chromium/disable_hidden.patch +++ b/patches/common/chromium/disable_hidden.patch @@ -5,7 +5,7 @@ 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 6098f3aadf61242549359d99b6f166e81e753223..47c804d40005f29aaf32e7ea22044b29e7955953 100644 +index 525bb5e2a54c60c91ec7b435eb0387393c80a4b5..165e717369f9e218ba476bbecf8f1cd2979c6426 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -736,6 +736,9 @@ void RenderWidgetHostImpl::WasHidden() { @@ -19,7 +19,7 @@ index 6098f3aadf61242549359d99b6f166e81e753223..47c804d40005f29aaf32e7ea22044b29 TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::WasHidden"); diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h -index 09dad0b91dfdf2b87e719f85986cbb3a34c6f880..25fa3f5178af9c451df64944a3214f28a221628d 100644 +index 551ee2b2199d86a200dfed22b5405e40891284d9..1a2c38dc16d4521762d0557b17e07b30b23f5b82 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h @@ -155,6 +155,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl diff --git a/patches/common/chromium/disable_network_services_by_default.patch b/patches/common/chromium/disable_network_services_by_default.patch index 3c0fc587fdb7..f1f72667a940 100644 --- a/patches/common/chromium/disable_network_services_by_default.patch +++ b/patches/common/chromium/disable_network_services_by_default.patch @@ -12,15 +12,15 @@ We should remove this patch after all Electron's code has been migrated to the NetworkService. diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc -index a73c894c6d3e549b10cbbeb8f74fda526f0f2a9e..2db7d3a9debd7329c09f748dbe1e24bc7c9a0f53 100644 +index ae63eaa3a0e58905332bcd3b5623c34c2b4a9281..36499b0051936c356801067b1ba7714a5a608f3b 100644 --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc @@ -21,7 +21,7 @@ const base::Feature kNetworkService { "NetworkService", - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || \ (defined(OS_LINUX) && !defined(IS_CHROMECAST)) - base::FEATURE_ENABLED_BY_DEFAULT + base::FEATURE_DISABLED_BY_DEFAULT - }; #else base::FEATURE_DISABLED_BY_DEFAULT + #endif diff --git a/patches/common/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch b/patches/common/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch index c3dd8814f192..1379d4684357 100644 --- a/patches/common/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch +++ b/patches/common/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch @@ -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 d48b02a3aec299a443e05b65124b0b8a4bac992a..2d2701fa05366634fc780f47757d296f04b3ff2f 100644 +index 709e8f7a942f0b7c3353ec8c92fac48402ccd685..1536d12fffc11f5806bd53eedb0fd081068d2532 100644 --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc -@@ -3659,7 +3659,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client, +@@ -3647,7 +3647,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); diff --git a/patches/common/chromium/feat_offscreen_rendering_with_viz_compositor.patch b/patches/common/chromium/feat_offscreen_rendering_with_viz_compositor.patch index 03fe6cbe7381..23489e9f1c4b 100644 --- a/patches/common/chromium/feat_offscreen_rendering_with_viz_compositor.patch +++ b/patches/common/chromium/feat_offscreen_rendering_with_viz_compositor.patch @@ -5,7 +5,7 @@ Subject: feat: offscreen rendering with viz compositor diff --git a/components/viz/host/host_display_client.cc b/components/viz/host/host_display_client.cc -index ca788f5288132456d1142004b95f57678b082800..441ec3c34a8a4617d3a4b4d20ac864773b697589 100644 +index f5e18df4e06e24d3bdd51308abde48e217444848..41017d9d53b1c0d563ea0901f5cae407c6cf1560 100644 --- a/components/viz/host/host_display_client.cc +++ b/components/viz/host/host_display_client.cc @@ -18,6 +18,10 @@ @@ -30,7 +30,7 @@ index ca788f5288132456d1142004b95f57678b082800..441ec3c34a8a4617d3a4b4d20ac86477 if (!NeedsToUseLayerWindow(widget_)) { DLOG(ERROR) << "HWND shouldn't be using a layered window"; return; -@@ -56,7 +60,11 @@ void HostDisplayClient::CreateLayeredWindowUpdater( +@@ -56,8 +60,12 @@ void HostDisplayClient::CreateLayeredWindowUpdater( layered_window_updater_ = std::make_unique(widget_, std::move(request)); @@ -42,9 +42,10 @@ index ca788f5288132456d1142004b95f57678b082800..441ec3c34a8a4617d3a4b4d20ac86477 #endif +} - } // namespace viz + #if defined(USE_X11) + void HostDisplayClient::DidCompleteSwapWithNewSize(const gfx::Size& size) { diff --git a/components/viz/host/host_display_client.h b/components/viz/host/host_display_client.h -index af64385aa93f7abc7a85e1f6eec3c99134e0d2b5..011007ba451e71d46d02cb2d28f6489fe2a805ec 100644 +index 5e5c5da4a3cfc927df3fb120fcab647e927271c1..8c6ec95f309660fb83012a13c7b9bb64b782e7d9 100644 --- a/components/viz/host/host_display_client.h +++ b/components/viz/host/host_display_client.h @@ -30,17 +30,17 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom::DisplayClient { @@ -66,8 +67,8 @@ index af64385aa93f7abc7a85e1f6eec3c99134e0d2b5..011007ba451e71d46d02cb2d28f6489f mojom::LayeredWindowUpdaterRequest request) override; -#endif - mojo::Binding binding_; - #if defined(OS_MACOSX) || defined(OS_WIN) + #if defined(USE_X11) + void DidCompleteSwapWithNewSize(const gfx::Size& size) override; diff --git a/components/viz/host/layered_window_updater_impl.cc b/components/viz/host/layered_window_updater_impl.cc index d3a49ed8be8dc11b86af67cdd600b05ddc0fc486..88bf86f3938b8267d731b52c8c3baa35d3128c7a 100644 --- a/components/viz/host/layered_window_updater_impl.cc @@ -442,7 +443,7 @@ index 0000000000000000000000000000000000000000..01e1e2f0860faa1afe42c342c8905a7f + +#endif // COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_SOFTWARE_OUTPUT_DEVICE_PROXY_H_ diff --git a/components/viz/service/display_embedder/software_output_device_win.cc b/components/viz/service/display_embedder/software_output_device_win.cc -index 0fcded13143bd40eaebedde09feb9b00cfe73fa8..ffcbfee599b007679fb46badea517c4e1f840b8f 100644 +index 4e3f0255d5fe4991004a50768932c36c42d999ff..bf352091cef00482e3cec74cd523e469e1bffa0d 100644 --- a/components/viz/service/display_embedder/software_output_device_win.cc +++ b/components/viz/service/display_embedder/software_output_device_win.cc @@ -11,6 +11,7 @@ @@ -453,7 +454,7 @@ index 0fcded13143bd40eaebedde09feb9b00cfe73fa8..ffcbfee599b007679fb46badea517c4e #include "mojo/public/cpp/system/platform_handle.h" #include "services/viz/privileged/interfaces/compositing/layered_window_updater.mojom.h" #include "skia/ext/platform_canvas.h" -@@ -265,7 +266,7 @@ void SoftwareOutputDeviceWinProxy::EndPaintDelegated( +@@ -268,7 +269,7 @@ void SoftwareOutputDeviceWinProxy::EndPaintDelegated( if (!canvas_) return; @@ -462,7 +463,7 @@ index 0fcded13143bd40eaebedde09feb9b00cfe73fa8..ffcbfee599b007679fb46badea517c4e &SoftwareOutputDeviceWinProxy::DrawAck, base::Unretained(this))); waiting_on_draw_ack_ = true; -@@ -297,8 +298,13 @@ std::unique_ptr CreateSoftwareOutputDeviceWin( +@@ -300,8 +301,13 @@ std::unique_ptr CreateSoftwareOutputDeviceWin( display_client->CreateLayeredWindowUpdater( mojo::MakeRequest(&layered_window_updater)); @@ -479,10 +480,10 @@ index 0fcded13143bd40eaebedde09feb9b00cfe73fa8..ffcbfee599b007679fb46badea517c4e return std::make_unique(hwnd, backing); } diff --git a/services/viz/privileged/interfaces/compositing/display_private.mojom b/services/viz/privileged/interfaces/compositing/display_private.mojom -index f43ad2f0aeeb4e088c087b0c83cbf35aa764dfef..f88fda16a6f6e88d38b3a3e27a7daed8c4c270f8 100644 +index deb327b7705462d2cc07edb9d37528035377af8b..bc6958aa7e4dc14d3e0cf040299642825194e2fc 100644 --- a/services/viz/privileged/interfaces/compositing/display_private.mojom +++ b/services/viz/privileged/interfaces/compositing/display_private.mojom -@@ -73,12 +73,14 @@ interface DisplayPrivate { +@@ -77,12 +77,14 @@ interface DisplayPrivate { }; interface DisplayClient { @@ -510,7 +511,7 @@ index 360cab3eee4c5189a55269d76daa1d78a98ed3d3..6834242f23d27fd6d428c2cd6040206a + Draw(gfx.mojom.Rect damage_rect) => (); }; diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h -index d1352c059e0ef414e36408648d389b479aab9e28..9326d44cdf9d92b6c7603e8697255b9c204eccf0 100644 +index ce87db97e02af3c4ec358ae688e0f2a96492d952..cacda701a6da00a22a2eaaaaf4d3fad543ce1a04 100644 --- a/ui/compositor/compositor.h +++ b/ui/compositor/compositor.h @@ -24,6 +24,7 @@ @@ -547,7 +548,7 @@ index d1352c059e0ef414e36408648d389b479aab9e28..9326d44cdf9d92b6c7603e8697255b9c // 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 -@@ -463,6 +476,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient, +@@ -467,6 +480,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient, ui::ContextFactory* context_factory_; ui::ContextFactoryPrivate* context_factory_private_; @@ -557,21 +558,21 @@ index d1352c059e0ef414e36408648d389b479aab9e28..9326d44cdf9d92b6c7603e8697255b9c Layer* root_layer_ = nullptr; diff --git a/ui/compositor/host/host_context_factory_private.cc b/ui/compositor/host/host_context_factory_private.cc -index f8b1e4b8c64809bf3b151f0578e3bfe6f5b2d6b6..d866753c01bce623c45435fc01cfbac3841afc90 100644 +index 0ff1e05244e0e64bc2456dc3d53dd2378dce1a3c..7ca7f5e0cb73c8f6560ff9730d3880a07befe663 100644 --- a/ui/compositor/host/host_context_factory_private.cc +++ b/ui/compositor/host/host_context_factory_private.cc -@@ -70,8 +70,12 @@ void HostContextFactoryPrivate::ConfigureCompositor( +@@ -99,8 +99,12 @@ void HostContextFactoryPrivate::ConfigureCompositor( mojo::MakeRequest(&root_params->compositor_frame_sink_client); root_params->display_private = mojo::MakeRequest(&compositor_data.display_private); - compositor_data.display_client = -- std::make_unique(compositor->widget()); +- std::make_unique(compositor); + if (compositor->delegate()) + compositor_data.display_client = compositor->delegate()->CreateHostDisplayClient( + compositor); + else + compositor_data.display_client = -+ std::make_unique(compositor->widget()); ++ std::make_unique(compositor); root_params->display_client = compositor_data.display_client->GetBoundPtr(resize_task_runner_) .PassInterface(); diff --git a/patches/common/chromium/frame_host_manager.patch b/patches/common/chromium/frame_host_manager.patch index 3e5707aeac5a..235ee9616ae7 100644 --- a/patches/common/chromium/frame_host_manager.patch +++ b/patches/common/chromium/frame_host_manager.patch @@ -7,10 +7,10 @@ Allows embedder to intercept site instances chosen by chromium and respond with custom instance. diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc -index de85226ab3644cc9af5de66a4c25be5902bab55f..028e57320b3def3cd1d948a479a2453fa193c5bb 100644 +index ce9c79b32823b5f6f7edfdc14112bb1ed70e98ba..0708e35ff066b793121862a755081b2db2aad086 100644 --- a/content/browser/frame_host/render_frame_host_manager.cc +++ b/content/browser/frame_host/render_frame_host_manager.cc -@@ -2140,6 +2140,16 @@ bool RenderFrameHostManager::InitRenderView( +@@ -2141,6 +2141,16 @@ bool RenderFrameHostManager::InitRenderView( scoped_refptr RenderFrameHostManager::GetSiteInstanceForNavigationRequest( const NavigationRequest& request) { @@ -27,7 +27,7 @@ index de85226ab3644cc9af5de66a4c25be5902bab55f..028e57320b3def3cd1d948a479a2453f // First, check if the navigation can switch SiteInstances. If not, the // navigation should use the current SiteInstance. SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance(); -@@ -2172,6 +2182,51 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( +@@ -2173,6 +2183,51 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( request.common_params().url); no_renderer_swap_allowed |= request.from_begin_navigation() && !can_renderer_initiate_transfer; @@ -79,7 +79,7 @@ index de85226ab3644cc9af5de66a4c25be5902bab55f..028e57320b3def3cd1d948a479a2453f } else { // Subframe navigations will use the current renderer, unless specifically // allowed to swap processes. -@@ -2183,23 +2238,17 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( +@@ -2184,23 +2239,17 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( if (no_renderer_swap_allowed && !should_swap_for_error_isolation) return scoped_refptr(current_site_instance); @@ -108,7 +108,7 @@ index de85226ab3644cc9af5de66a4c25be5902bab55f..028e57320b3def3cd1d948a479a2453f } diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc -index 66280289f51a89dcd17c288569348efa18227e9b..0569c5b0ae4bed017c9b240689aef647f099d57e 100644 +index de19cb3a5f3d6685d8dede7c3cdb5b47183ed07f..acf458d5c088607d3ceb6d058f28f076bf4cf712 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -51,6 +51,16 @@ void OverrideOnBindInterface(const service_manager::BindSourceInfo& remote_info, @@ -129,7 +129,7 @@ index 66280289f51a89dcd17c288569348efa18227e9b..0569c5b0ae4bed017c9b240689aef647 const MainFunctionParams& parameters) { return nullptr; diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index f0e60c3e8c135712db5cb8e918109f249502bee9..6219857d40d63f1d6918d941b31c80f3729a8dba 100644 +index 2c722d14437cdad69544e0c67921dbaec15b97da..9c7c77b44d279219411ce545c5448acecbd56d59 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -210,8 +210,37 @@ CONTENT_EXPORT void OverrideOnBindInterface( diff --git a/patches/common/chromium/mas-cfisobjc.patch b/patches/common/chromium/mas-cfisobjc.patch index a5863205babc..fbe33c570f4c 100644 --- a/patches/common/chromium/mas-cfisobjc.patch +++ b/patches/common/chromium/mas-cfisobjc.patch @@ -6,7 +6,7 @@ Subject: mas-cfisobjc.patch Removes usage of the _CFIsObjC private API. diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm -index b5003fbf908fef375fb5daae040cb2e65e23e99e..e0ce94b3aaff00bb319cb0a18af4e70a9c61ca46 100644 +index 8b20ebc678c39b722bd5b03930ce89847e8cc73a..dca8c939e757003aafc1528ec7bbb739bf971fa6 100644 --- a/base/mac/foundation_util.mm +++ b/base/mac/foundation_util.mm @@ -26,7 +26,6 @@ diff --git a/patches/common/chromium/mas_no_private_api.patch b/patches/common/chromium/mas_no_private_api.patch index e4277b8e5956..4f52a059bf9f 100644 --- a/patches/common/chromium/mas_no_private_api.patch +++ b/patches/common/chromium/mas_no_private_api.patch @@ -181,10 +181,10 @@ index 1d8dbb5a781221dea2fb8138546461d0eddc0243..49a6ad7b31cf959cae19ef5352904415 return nil; } diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm -index e44929e37ddf2ddd2473e2cc92e94706aa43cdb4..43eb2a27486d12c7f9ce95b95e6dc418817bd097 100644 +index 8ccb8d266ef921b60c9db562f54431bb2bd8d327..1dbcdd5f7e742d993478190846b0052c0da252b5 100644 --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm -@@ -488,6 +488,7 @@ void PostAnnouncementNotification(NSString* announcement) { +@@ -489,6 +489,7 @@ void PostAnnouncementNotification(NSString* announcement) { [user_info setObject:native_focus_object forKey:NSAccessibilityTextChangeElement]; @@ -192,7 +192,7 @@ index e44929e37ddf2ddd2473e2cc92e94706aa43cdb4..43eb2a27486d12c7f9ce95b95e6dc418 id selected_text = [native_focus_object selectedTextMarkerRange]; if (selected_text) { NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute = -@@ -495,6 +496,7 @@ void PostAnnouncementNotification(NSString* announcement) { +@@ -496,6 +497,7 @@ void PostAnnouncementNotification(NSString* announcement) { [user_info setObject:selected_text forKey:NSAccessibilitySelectedTextMarkerRangeAttribute]; } diff --git a/patches/common/chromium/notification_provenance.patch b/patches/common/chromium/notification_provenance.patch index ecf1c4f2fede..b3e89bc77a17 100644 --- a/patches/common/chromium/notification_provenance.patch +++ b/patches/common/chromium/notification_provenance.patch @@ -6,7 +6,7 @@ Subject: pass RenderProcessHost through to PlatformNotificationService this is so Electron can identify which renderer a notification came from diff --git a/content/browser/notifications/blink_notification_service_impl.cc b/content/browser/notifications/blink_notification_service_impl.cc -index a30403295a8bb4d8333e538df5c6932f5a7bf9fb..06cca17194ce41c0b27c4e056831d769a5c3e7c6 100644 +index 63a1fe8ebd1a59973748cf12d7a914c91a8e27f1..d2f7d4bdf41c71874849ccaeca13f2b8f9cfa483 100644 --- a/content/browser/notifications/blink_notification_service_impl.cc +++ b/content/browser/notifications/blink_notification_service_impl.cc @@ -88,9 +88,11 @@ BlinkNotificationServiceImpl::BlinkNotificationServiceImpl( @@ -67,7 +67,7 @@ index cbac30fa7a12db927ba6a15173ba1181e03e0723..4d26fd795a7ce1ffd046c4a0f2ec1779 mojo::MakeRequest(¬ification_service_ptr_)); diff --git a/content/browser/notifications/platform_notification_context_impl.cc b/content/browser/notifications/platform_notification_context_impl.cc -index 258d4235cc977ce0aed3cb31020244b26a8c19dd..436ebd7927eec6b007724c988248c418114491e5 100644 +index 9402a2b51567beb042dbcfe05a6f61da457a659e..d046d64e94937ea12ff87c06ea14cc112bfd18ee 100644 --- a/content/browser/notifications/platform_notification_context_impl.cc +++ b/content/browser/notifications/platform_notification_context_impl.cc @@ -207,12 +207,13 @@ void PlatformNotificationContextImpl::Shutdown() { @@ -87,7 +87,7 @@ index 258d4235cc977ce0aed3cb31020244b26a8c19dd..436ebd7927eec6b007724c988248c418 void PlatformNotificationContextImpl::RemoveService( diff --git a/content/browser/notifications/platform_notification_context_impl.h b/content/browser/notifications/platform_notification_context_impl.h -index de7f9d4c1b670b6955ec62e562b133a86b770652..a7daada96b6ebed404d6fa3eef1048ab022d443f 100644 +index 3373171efb690863c70cd10bd465fc4b3dd5320c..64f2c0344eb9978e712f5c39e1f43d9b61c3bf08 100644 --- a/content/browser/notifications/platform_notification_context_impl.h +++ b/content/browser/notifications/platform_notification_context_impl.h @@ -24,6 +24,7 @@ diff --git a/patches/common/chromium/pepper_flash.patch b/patches/common/chromium/pepper_flash.patch index a09488ac37cb..516c7efb7815 100644 --- a/patches/common/chromium/pepper_flash.patch +++ b/patches/common/chromium/pepper_flash.patch @@ -258,7 +258,7 @@ index aa4433cccff4bc637ce5e71039de3c4352e7cd6b..d9630fdf6b87e11fb9657814895dff36 base::WeakPtrFactory weak_factory_; diff --git a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc -index 5e468b261f400379d20bb5e8f6fed683229a6837..583474b7e5e2010bd1323be94f08845cc396fc3e 100644 +index 0d083bb09ff17a691c6399d2a5746b44e3196873..2023dc0240220362a1b503da07aa9fab4cb4b434 100644 --- a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc +++ b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc @@ -8,17 +8,21 @@ @@ -324,8 +324,8 @@ index 5e468b261f400379d20bb5e8f6fed683229a6837..583474b7e5e2010bd1323be94f08845c Profile* PepperIsolatedFileSystemMessageFilter::GetProfile() { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); ProfileManager* profile_manager = g_browser_process->profile_manager(); -@@ -122,6 +129,7 @@ std::string PepperIsolatedFileSystemMessageFilter::CreateCrxFileSystem( - return std::string(); +@@ -122,6 +129,7 @@ PepperIsolatedFileSystemMessageFilter::CreateCrxFileSystem(Profile* profile) { + return storage::IsolatedContext::ScopedFSHandle(); #endif } +#endif @@ -349,7 +349,7 @@ index 5e468b261f400379d20bb5e8f6fed683229a6837..583474b7e5e2010bd1323be94f08845c int32_t PepperIsolatedFileSystemMessageFilter::OpenCrxFileSystem( ppapi::host::HostMessageContext* context) { #if BUILDFLAG(ENABLE_EXTENSIONS) -@@ -178,6 +187,7 @@ int32_t PepperIsolatedFileSystemMessageFilter::OpenCrxFileSystem( +@@ -180,6 +189,7 @@ int32_t PepperIsolatedFileSystemMessageFilter::OpenCrxFileSystem( return PP_ERROR_NOTSUPPORTED; #endif } @@ -358,11 +358,11 @@ index 5e468b261f400379d20bb5e8f6fed683229a6837..583474b7e5e2010bd1323be94f08845c int32_t PepperIsolatedFileSystemMessageFilter::OpenPluginPrivateFileSystem( ppapi::host::HostMessageContext* context) { diff --git a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h -index ca7f87b973e6e060db2123929da6a3b9fc0ae5a4..f73b596ce78eff9c14ac27699d5ecbd9ff69a0a0 100644 +index 1d5ff1f6aa14812f2a6552f601900b03f3e3c8e7..5b6d0297c874146c21af37b983b2d8ee387b31ce 100644 --- a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h +++ b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h -@@ -19,7 +19,9 @@ - #include "ppapi/host/resource_message_filter.h" +@@ -20,7 +20,9 @@ + #include "storage/browser/fileapi/isolated_context.h" #include "url/gurl.h" +#if 0 @@ -371,7 +371,7 @@ index ca7f87b973e6e060db2123929da6a3b9fc0ae5a4..f73b596ce78eff9c14ac27699d5ecbd9 namespace content { class BrowserPpapiHost; -@@ -53,16 +55,20 @@ class PepperIsolatedFileSystemMessageFilter +@@ -54,6 +56,7 @@ class PepperIsolatedFileSystemMessageFilter ~PepperIsolatedFileSystemMessageFilter() override; @@ -379,9 +379,10 @@ index ca7f87b973e6e060db2123929da6a3b9fc0ae5a4..f73b596ce78eff9c14ac27699d5ecbd9 Profile* GetProfile(); // Returns filesystem id of isolated filesystem if valid, or empty string - // otherwise. This must run on the UI thread because ProfileManager only +@@ -61,10 +64,13 @@ class PepperIsolatedFileSystemMessageFilter // allows access on that thread. - std::string CreateCrxFileSystem(Profile* profile); + storage::IsolatedContext::ScopedFSHandle CreateCrxFileSystem( + Profile* profile); +#endif int32_t OnOpenFileSystem(ppapi::host::HostMessageContext* context, @@ -392,7 +393,7 @@ index ca7f87b973e6e060db2123929da6a3b9fc0ae5a4..f73b596ce78eff9c14ac27699d5ecbd9 int32_t OpenPluginPrivateFileSystem(ppapi::host::HostMessageContext* context); const int render_process_id_; -@@ -73,8 +79,10 @@ class PepperIsolatedFileSystemMessageFilter +@@ -75,8 +81,10 @@ class PepperIsolatedFileSystemMessageFilter // Not owned by this object. ppapi::host::PpapiHost* ppapi_host_; diff --git a/patches/common/chromium/printing.patch b/patches/common/chromium/printing.patch index cc99e8c942f0..9e7eb9c32af3 100644 --- a/patches/common/chromium/printing.patch +++ b/patches/common/chromium/printing.patch @@ -166,7 +166,7 @@ index a2569836d04ff968e690215f56f6de3b6d884874..6ddec22641b74d5484c2e0d4f62e5d71 bool printing_succeeded_; diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc -index 0291dfdec6aa85442c8cdd8019d437f217436ed2..e1c111a860e5b9b8ac79100b5530fb83f94b8894 100644 +index 1f79e7b127f35e2eaef923af5c4a5f0a7e5250a5..b93d8f59850b59f74271233440d1a3b2d0aded46 100644 --- a/chrome/browser/printing/printing_message_filter.cc +++ b/chrome/browser/printing/printing_message_filter.cc @@ -21,6 +21,7 @@ diff --git a/patches/common/chromium/render_widget_host_view_base.patch b/patches/common/chromium/render_widget_host_view_base.patch index b0dc000f3f9f..74f4d998780a 100644 --- a/patches/common/chromium/render_widget_host_view_base.patch +++ b/patches/common/chromium/render_widget_host_view_base.patch @@ -5,7 +5,7 @@ Subject: render_widget_host_view_base.patch diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc -index 90a2587a6e746e3f46558c3295ec17fb27e615a0..4849045b97474584740154890c3d80da4b0d03ad 100644 +index 3291e61a244ccf5e88fb8cafe10d01ce9b79b92c..9b5bb201f1725ca433d33a023bc887f6e85f648c 100644 --- a/content/browser/renderer_host/render_widget_host_view_base.cc +++ b/content/browser/renderer_host/render_widget_host_view_base.cc @@ -660,6 +660,15 @@ viz::FrameSinkId RenderWidgetHostViewBase::FrameSinkIdAtPoint( @@ -25,21 +25,22 @@ index 90a2587a6e746e3f46558c3295ec17fb27e615a0..4849045b97474584740154890c3d80da const blink::WebMouseEvent& event, const ui::LatencyInfo& latency) { diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h -index bb55eccad3edce7556e3f50b4a8be1db2fe823c8..ad1594af775cbcc0fe543eb3bac8c134d733bae5 100644 +index 903131f45d4fa82af9a6315227505b54ee0f1560..6450a05a4829731d3dc2338fd51ef6d0720b7fcb 100644 --- a/content/browser/renderer_host/render_widget_host_view_base.h +++ b/content/browser/renderer_host/render_widget_host_view_base.h -@@ -23,8 +23,10 @@ +@@ -24,9 +24,11 @@ #include "components/viz/common/surfaces/surface_id.h" #include "components/viz/host/hit_test/hit_test_query.h" #include "content/browser/renderer_host/event_with_latency_info.h" +#include "content/browser/web_contents/web_contents_view.h" #include "content/common/content_export.h" + #include "content/common/tab_switch_time_recorder.h" #include "content/public/browser/render_frame_metadata_provider.h" +#include "content/public/browser/render_widget_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/common/input_event_ack_state.h" #include "content/public/common/screen_info.h" -@@ -73,10 +75,12 @@ class CursorManager; +@@ -75,10 +77,12 @@ class CursorManager; class MouseWheelPhaseHandler; class RenderWidgetHostImpl; class RenderWidgetHostViewBaseObserver; @@ -52,9 +53,9 @@ index bb55eccad3edce7556e3f50b4a8be1db2fe823c8..ad1594af775cbcc0fe543eb3bac8c134 class WebCursor; class DelegatedFrameHost; struct TextInputState; -@@ -132,6 +136,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase - GetTouchSelectionControllerClientManager() override; - void SetLastTabChangeStartTime(base::TimeTicks start_time) final; +@@ -136,6 +140,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase + bool destination_is_loaded, + bool destination_is_frozen) final; + virtual void InitAsGuest(RenderWidgetHostView* parent_host_view, + RenderWidgetHostViewGuest* guest_view) {} @@ -62,7 +63,7 @@ index bb55eccad3edce7556e3f50b4a8be1db2fe823c8..ad1594af775cbcc0fe543eb3bac8c134 // This only needs to be overridden by RenderWidgetHostViewBase subclasses // that handle content embedded within other RenderWidgetHostViews. gfx::PointF TransformPointToRootCoordSpaceF( -@@ -358,6 +365,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase +@@ -364,6 +371,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase virtual void ProcessGestureEvent(const blink::WebGestureEvent& event, const ui::LatencyInfo& latency); diff --git a/patches/common/chromium/render_widget_host_view_mac.patch b/patches/common/chromium/render_widget_host_view_mac.patch index ecb12b385d1d..466ee3427d42 100644 --- a/patches/common/chromium/render_widget_host_view_mac.patch +++ b/patches/common/chromium/render_widget_host_view_mac.patch @@ -66,10 +66,10 @@ index 41285370f97be53ec93249c4eb0caf8c77a595b9..3c7eee8a565444f0c66be88885f8826a return validAttributesForMarkedText_.get(); } diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm -index 01341832627f168b9eb2deba471cf51e8e020d7c..89c2b5b06f3ffbd8fde2093853baf0733693ce46 100644 +index c6f096b1f58265b6dfe469d271e3decb96c14f14..819803a665e145565e2b71541835750983ebf8a5 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm -@@ -61,6 +61,7 @@ +@@ -62,6 +62,7 @@ #include "ui/events/keycodes/dom/dom_keyboard_layout_map.h" #include "ui/gfx/geometry/dip_util.h" #include "ui/gfx/mac/coordinate_conversion.h" diff --git a/patches/common/chromium/resource_file_conflict.patch b/patches/common/chromium/resource_file_conflict.patch index 2b8dcc89f3dc..605c151d060d 100644 --- a/patches/common/chromium/resource_file_conflict.patch +++ b/patches/common/chromium/resource_file_conflict.patch @@ -52,10 +52,10 @@ Some alternatives to this patch: None of these options seems like a substantial maintainability win over this patch to me (@nornagon). diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index 7878cd09863788f7c35e62a49f50a99a1fcf46d5..cabf18983e659e1608dd02109599b444990975a1 100644 +index ebb498247b2b228f166a52a0f7455f0dee916bcc..99e9cb9f2d6332d6b519275cea3deef9af3139f6 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -1719,7 +1719,7 @@ if (is_chrome_branded && !is_android) { +@@ -1784,7 +1784,7 @@ if (is_chrome_branded && !is_android) { } } @@ -64,7 +64,7 @@ index 7878cd09863788f7c35e62a49f50a99a1fcf46d5..cabf18983e659e1608dd02109599b444 chrome_paks("packed_resources") { if (is_mac) { output_dir = "$root_gen_dir/repack" -@@ -1743,6 +1743,12 @@ if (!is_android) { +@@ -1808,6 +1808,12 @@ if (!is_android) { } } diff --git a/patches/common/chromium/scroll_bounce_flag.patch b/patches/common/chromium/scroll_bounce_flag.patch index 605e222da5e6..eaa71fb9911a 100644 --- a/patches/common/chromium/scroll_bounce_flag.patch +++ b/patches/common/chromium/scroll_bounce_flag.patch @@ -6,7 +6,7 @@ Subject: scroll_bounce_flag.patch Patch to make scrollBounce option work. diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index aea4d162b62a3b7c936889f1131e9e124630d4d8..9adecd86c760abf8b7d65afffa99acd90e91117a 100644 +index ee84cf4e2791ccbe76f3527158c633e2b56e71c7..72033c83d8bb39dfbb748f22796f9ff69ef1e329 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -1513,7 +1513,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() { diff --git a/patches/common/chromium/v8_context_snapshot_generator.patch b/patches/common/chromium/v8_context_snapshot_generator.patch index ccaf6b083cc6..8291f7b43449 100644 --- a/patches/common/chromium/v8_context_snapshot_generator.patch +++ b/patches/common/chromium/v8_context_snapshot_generator.patch @@ -7,7 +7,7 @@ v8_context_snapshot_generator is a build time executable. The patch adds the config. diff --git a/tools/v8_context_snapshot/BUILD.gn b/tools/v8_context_snapshot/BUILD.gn -index 771fc0df366c6461f18940546992b3efe97c4186..2cf5730fd721d3dba97ad43562516c75cf1fc157 100644 +index 2d7b357cfc2cd60e6e880a8c93b32166376540b5..002e9e67f8009e780182150705417c500a01c5cd 100644 --- a/tools/v8_context_snapshot/BUILD.gn +++ b/tools/v8_context_snapshot/BUILD.gn @@ -109,6 +109,7 @@ if (use_v8_context_snapshot) { diff --git a/patches/common/chromium/web_contents.patch b/patches/common/chromium/web_contents.patch index 90aecefe03d1..37bc174e4ea4 100644 --- a/patches/common/chromium/web_contents.patch +++ b/patches/common/chromium/web_contents.patch @@ -5,10 +5,10 @@ Subject: web_contents.patch diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index aa8c31fe87a08fe3926d0b3ccb5a37d89276506d..65b7eab5b82f96a0572f3a6138f8d2eb76ea227d 100644 +index 5ddd9e7545d2139545fcf3e308d64a5a68a99735..27f69b81ba9ba2b96c7832ca7933ee496ec1b7e4 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -2066,6 +2066,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -2067,6 +2067,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { std::string unique_name; frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name); @@ -21,7 +21,7 @@ index aa8c31fe87a08fe3926d0b3ccb5a37d89276506d..65b7eab5b82f96a0572f3a6138f8d2eb WebContentsViewDelegate* delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -2081,6 +2087,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -2082,6 +2088,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { &render_view_host_delegate_view_); } } diff --git a/patches/common/chromium/webview_cross_drag.patch b/patches/common/chromium/webview_cross_drag.patch index 05d0754dc12c..38bbe0a64ed7 100644 --- a/patches/common/chromium/webview_cross_drag.patch +++ b/patches/common/chromium/webview_cross_drag.patch @@ -5,10 +5,10 @@ Subject: webview_cross_drag.patch diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc -index 6565781a84d50e1dfdea4086588e8dcf11579d32..1ec9d900346f506a3fd9b1bfcb7de3f38048842a 100644 +index ee5760ecbe0f836d0e49f53527252a48f4344b03..a413be0448816152f99d234a4e409bf0e9816be7 100644 --- a/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc -@@ -742,6 +742,7 @@ gfx::NativeView WebContentsViewAura::GetRenderWidgetHostViewParent() const { +@@ -775,6 +775,7 @@ gfx::NativeView WebContentsViewAura::GetRenderWidgetHostViewParent() const { bool WebContentsViewAura::IsValidDragTarget( RenderWidgetHostImpl* target_rwh) const { diff --git a/patches/common/chromium/worker_context_will_destroy.patch b/patches/common/chromium/worker_context_will_destroy.patch index 70a27b722672..2c7e9d51b45f 100644 --- a/patches/common/chromium/worker_context_will_destroy.patch +++ b/patches/common/chromium/worker_context_will_destroy.patch @@ -5,7 +5,7 @@ Subject: worker_context_will_destroy.patch diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h -index 9e405a1f92c8218387ca270c8d2ccdb7030d3ad6..bb625490e2dd86c72e903a5d713881fdf8185cff 100644 +index 5bcf6f95f630ae6232ec9be7d8de7360a1592566..3142a8286e6aaf508a06cee0e32c73903682261f 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h @@ -384,6 +384,11 @@ class CONTENT_EXPORT ContentRendererClient { @@ -21,10 +21,10 @@ index 9e405a1f92c8218387ca270c8d2ccdb7030d3ad6..bb625490e2dd86c72e903a5d713881fd // An empty URL is returned if the URL is not overriden. virtual GURL OverrideFlashEmbedWithHTML(const GURL& url); diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc -index 01b7e68dba2ccfedf0491cd0387e3e0729473c2a..1364adb8e06da07812137ff19e550b4ff3a345e9 100644 +index 2e3a922dd2a8a15bfe3eec802085f09d3eda9e5d..30da4053a8438dd018fb2739a6cc0e300af2e657 100644 --- a/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc -@@ -1072,6 +1072,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { +@@ -1056,6 +1056,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread(); } @@ -38,10 +38,10 @@ index 01b7e68dba2ccfedf0491cd0387e3e0729473c2a..1364adb8e06da07812137ff19e550b4f const v8::Local& worker) { GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread( diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h -index 91345bba1ecd1a28e2588fa2f93b6226b3904467..5fb3283310675d15a5ed387fb33b1bc01b8ceff0 100644 +index f5298e5e942e43008e469214ba252932cc6d771a..ae28b78037e0a078dd9e11fb0cd3edbfdd0ff986 100644 --- a/content/renderer/renderer_blink_platform_impl.h +++ b/content/renderer/renderer_blink_platform_impl.h -@@ -205,6 +205,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { +@@ -201,6 +201,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { void DidStartWorkerThread() override; void WillStopWorkerThread() override; void WorkerContextCreated(const v8::Local& worker) override; @@ -50,10 +50,10 @@ index 91345bba1ecd1a28e2588fa2f93b6226b3904467..5fb3283310675d15a5ed387fb33b1bc0 void RecordMetricsForBackgroundedRendererPurge() override; diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h -index cf06aa2c9beda4a2b6c7f484da971b1b5de2b79b..13b1bbe8098fdbe9096fc61e99d88b038a57df54 100644 +index 921175528990fffc8fda609e768be47b856f7621..f52b4d1573c07a9c280d67bc3b2389dd3a549925 100644 --- a/third_party/blink/public/platform/platform.h +++ b/third_party/blink/public/platform/platform.h -@@ -664,6 +664,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -660,6 +660,7 @@ class BLINK_PLATFORM_EXPORT Platform { virtual void DidStartWorkerThread() {} virtual void WillStopWorkerThread() {} virtual void WorkerContextCreated(const v8::Local& worker) {} @@ -62,10 +62,10 @@ index cf06aa2c9beda4a2b6c7f484da971b1b5de2b79b..13b1bbe8098fdbe9096fc61e99d88b03 const WebSecurityOrigin& script_origin) { return false; diff --git a/third_party/blink/renderer/core/workers/worker_thread.cc b/third_party/blink/renderer/core/workers/worker_thread.cc -index 4b2aacabf151c7aacf3a338cc47f1faf0c7b9391..308c10136d7ccf735b216ac5be4af846b218841a 100644 +index 0da8aa29d7ddf6564d46fd1b439f040bc9491527..4c9163415298c2e766e0d64f8a2b0d9110a9032c 100644 --- a/third_party/blink/renderer/core/workers/worker_thread.cc +++ b/third_party/blink/renderer/core/workers/worker_thread.cc -@@ -640,6 +640,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() { +@@ -634,6 +634,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() { nested_runner_->QuitNow(); } diff --git a/patches/common/v8/add_realloc.patch b/patches/common/v8/add_realloc.patch index bf98e36ab03f..3045b12085ad 100644 --- a/patches/common/v8/add_realloc.patch +++ b/patches/common/v8/add_realloc.patch @@ -29,11 +29,11 @@ index 8b23e02bf42ffdab5d8c6f36a4663ed0668531f7..742aaa1df005f28ba55b0c42a18d41e9 /** * Free the memory block of size |length|, pointed to by |data|. * That memory is guaranteed to be previously allocated by |Allocate|. -diff --git a/src/api.cc b/src/api.cc -index fac25e9713dcf27ce9aff545ba98468fa0545540..e1f16d9594458b5e3aec3b6929634abcce5ee59a 100644 ---- a/src/api.cc -+++ b/src/api.cc -@@ -520,6 +520,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) { +diff --git a/src/api/api.cc b/src/api/api.cc +index 62946e00db8cd844a1de7aa16ea8addaa42f6bc6..4a421e73cb45bf3eb3d6643011151743cf989fee 100644 +--- a/src/api/api.cc ++++ b/src/api/api.cc +@@ -514,6 +514,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) { i::V8::SetSnapshotBlob(snapshot_blob); } diff --git a/patches/common/v8/build_gn.patch b/patches/common/v8/build_gn.patch index 453971c18081..f46e7f309323 100644 --- a/patches/common/v8/build_gn.patch +++ b/patches/common/v8/build_gn.patch @@ -5,10 +5,10 @@ Subject: build_gn.patch diff --git a/BUILD.gn b/BUILD.gn -index 384a94766b4ca7707c991d45a3b7152910c98feb..1f16b3f1ce7a476d4a1e20b6437a305bb867b01b 100644 +index c1bbdbdf0d1b9968632e0158b02e80f3ddfe06ed..e25b4a427c96a6f66ea693f162a4806723026a91 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -266,7 +266,7 @@ config("internal_config") { +@@ -278,7 +278,7 @@ config("internal_config") { ":v8_header_features", ] @@ -17,7 +17,7 @@ index 384a94766b4ca7707c991d45a3b7152910c98feb..1f16b3f1ce7a476d4a1e20b6437a305b defines += [ "BUILDING_V8_SHARED" ] } } -@@ -3756,7 +3756,7 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -3780,7 +3780,7 @@ if (current_toolchain == v8_generator_toolchain) { "src/interpreter/bytecodes.h", ] @@ -26,7 +26,7 @@ index 384a94766b4ca7707c991d45a3b7152910c98feb..1f16b3f1ce7a476d4a1e20b6437a305b deps = [ ":v8_libbase", -@@ -3777,6 +3777,8 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) { +@@ -3801,6 +3801,8 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) { configs = [ ":internal_config" ] diff --git a/patches/common/v8/dcheck.patch b/patches/common/v8/dcheck.patch index 830f3d995f9d..6a69035ca3dc 100644 --- a/patches/common/v8/dcheck.patch +++ b/patches/common/v8/dcheck.patch @@ -4,12 +4,12 @@ Date: Mon, 22 Oct 2018 10:47:12 -0700 Subject: dcheck.patch -diff --git a/src/api.cc b/src/api.cc -index c926d049ec4d04c40573b2e4d3608b59753a6050..1892ff80e75ca08f83ca26fd21126d8f6dbcc45b 100644 ---- a/src/api.cc -+++ b/src/api.cc -@@ -8572,7 +8572,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) { - +diff --git a/src/api/api.cc b/src/api/api.cc +index 675d3df256143380594577b458d12c9705e7ecf1..fe4a82836995053d8c43a2ace2457eaa95aa8d38 100644 +--- a/src/api/api.cc ++++ b/src/api/api.cc +@@ -8248,7 +8248,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) { + } void Isolate::RunMicrotasks() { - DCHECK_NE(MicrotasksPolicy::kScoped, GetMicrotasksPolicy()); @@ -18,10 +18,10 @@ index c926d049ec4d04c40573b2e4d3608b59753a6050..1892ff80e75ca08f83ca26fd21126d8f isolate->default_microtask_queue()->RunMicrotasks(isolate); } diff --git a/src/heap/heap.cc b/src/heap/heap.cc -index 87ff3b12afec44cb9a7116892581edf8d1f633f9..e255691f013f80d5c2e84f43f48713353936683c 100644 +index ee2a4ceed24d92fff94affad47b194576841dff0..3c220a31cf3f913d4161105cbff7347fa1e0df23 100644 --- a/src/heap/heap.cc +++ b/src/heap/heap.cc -@@ -4954,9 +4954,9 @@ void Heap::TearDown() { +@@ -4999,9 +4999,9 @@ void Heap::TearDown() { void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback, GCType gc_type, void* data) { DCHECK_NOT_NULL(callback); diff --git a/patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch b/patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch index f00b12412979..2fe852bcd6a9 100644 --- a/patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch +++ b/patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch @@ -173,11 +173,11 @@ index 742aaa1df005f28ba55b0c42a18d41e9a74a9b6a..382a9eae997fbc399ee196d2fc58951a Boolean* Boolean::Cast(v8::Value* value) { #ifdef V8_ENABLE_CHECKS CheckCast(value); -diff --git a/src/api.cc b/src/api.cc -index e1f16d9594458b5e3aec3b6929634abcce5ee59a..c926d049ec4d04c40573b2e4d3608b59753a6050 100644 ---- a/src/api.cc -+++ b/src/api.cc -@@ -2230,6 +2230,10 @@ int PrimitiveArray::Length() const { +diff --git a/src/api/api.cc b/src/api/api.cc +index 4a421e73cb45bf3eb3d6643011151743cf989fee..675d3df256143380594577b458d12c9705e7ecf1 100644 +--- a/src/api/api.cc ++++ b/src/api/api.cc +@@ -2179,6 +2179,10 @@ int PrimitiveArray::Length() const { return array->length(); } @@ -188,7 +188,7 @@ index e1f16d9594458b5e3aec3b6929634abcce5ee59a..c926d049ec4d04c40573b2e4d3608b59 void PrimitiveArray::Set(Isolate* v8_isolate, int index, Local item) { i::Isolate* isolate = reinterpret_cast(v8_isolate); -@@ -2243,6 +2247,10 @@ void PrimitiveArray::Set(Isolate* v8_isolate, int index, +@@ -2192,6 +2196,10 @@ void PrimitiveArray::Set(Isolate* v8_isolate, int index, array->set(index, *i_item); } @@ -199,7 +199,7 @@ index e1f16d9594458b5e3aec3b6929634abcce5ee59a..c926d049ec4d04c40573b2e4d3608b59 Local PrimitiveArray::Get(Isolate* v8_isolate, int index) { i::Isolate* isolate = reinterpret_cast(v8_isolate); i::Handle array = Utils::OpenHandle(this); -@@ -2956,6 +2964,10 @@ void Message::PrintCurrentStackTrace(Isolate* isolate, FILE* out) { +@@ -2875,6 +2883,10 @@ void Message::PrintCurrentStackTrace(Isolate* isolate, FILE* out) { // --- S t a c k T r a c e --- @@ -210,7 +210,7 @@ index e1f16d9594458b5e3aec3b6929634abcce5ee59a..c926d049ec4d04c40573b2e4d3608b59 Local StackTrace::GetFrame(Isolate* v8_isolate, uint32_t index) const { i::Isolate* isolate = reinterpret_cast(v8_isolate); -@@ -3585,6 +3597,34 @@ MaybeLocal Value::ToBigInt(Local context) const { +@@ -3461,6 +3473,34 @@ MaybeLocal Value::ToBigInt(Local context) const { RETURN_ESCAPED(result); } @@ -245,20 +245,19 @@ index e1f16d9594458b5e3aec3b6929634abcce5ee59a..c926d049ec4d04c40573b2e4d3608b59 bool Value::BooleanValue(Isolate* v8_isolate) const { return Utils::OpenHandle(this)->BooleanValue( reinterpret_cast(v8_isolate)); -@@ -3971,6 +4011,12 @@ MaybeLocal Value::ToArrayIndex(Local context) const { +@@ -3809,6 +3849,11 @@ MaybeLocal Value::ToArrayIndex(Local context) const { + return Local(); } - +bool Value::Equals(Local that) const { + return Equals(Isolate::GetCurrent()->GetCurrentContext(), that) + .FromMaybe(false); +} -+ + Maybe Value::Equals(Local context, Local that) const { i::Isolate* isolate = Utils::OpenHandle(*context)->GetIsolate(); auto self = Utils::OpenHandle(this); -@@ -5249,6 +5295,10 @@ bool String::ContainsOnlyOneByte() const { +@@ -5041,6 +5086,10 @@ bool String::ContainsOnlyOneByte() const { return helper.Check(*str); } @@ -269,7 +268,7 @@ index e1f16d9594458b5e3aec3b6929634abcce5ee59a..c926d049ec4d04c40573b2e4d3608b59 int String::Utf8Length(Isolate* isolate) const { i::Handle str = Utils::OpenHandle(this); str = i::String::Flatten(reinterpret_cast(isolate), str); -@@ -5401,6 +5451,14 @@ static int WriteUtf8Impl(i::Vector string, char* write_start, +@@ -5193,6 +5242,14 @@ static int WriteUtf8Impl(i::Vector string, char* write_start, } } // anonymous namespace @@ -284,10 +283,10 @@ index e1f16d9594458b5e3aec3b6929634abcce5ee59a..c926d049ec4d04c40573b2e4d3608b59 int String::WriteUtf8(Isolate* v8_isolate, char* buffer, int capacity, int* nchars_ref, int options) const { i::Handle str = Utils::OpenHandle(this); -@@ -5441,6 +5499,18 @@ static inline int WriteHelper(i::Isolate* isolate, const String* string, +@@ -5231,6 +5288,17 @@ static inline int WriteHelper(i::Isolate* isolate, const String* string, + return end - start; } - +int String::WriteOneByte(uint8_t* buffer, int start, + int length, int options) const { + return WriteOneByte(Isolate::GetCurrent(), buffer, start, length, options); @@ -298,12 +297,11 @@ index e1f16d9594458b5e3aec3b6929634abcce5ee59a..c926d049ec4d04c40573b2e4d3608b59 + int options) const { + return Write(Isolate::GetCurrent(), buffer, start, length, options); +} -+ + int String::WriteOneByte(Isolate* isolate, uint8_t* buffer, int start, int length, int options) const { return WriteHelper(reinterpret_cast(isolate), this, buffer, -@@ -6385,6 +6455,11 @@ MaybeLocal String::NewFromTwoByte(Isolate* isolate, +@@ -6142,6 +6210,11 @@ MaybeLocal String::NewFromTwoByte(Isolate* isolate, return result; } @@ -315,19 +313,18 @@ index e1f16d9594458b5e3aec3b6929634abcce5ee59a..c926d049ec4d04c40573b2e4d3608b59 Local v8::String::Concat(Isolate* v8_isolate, Local left, Local right) { i::Isolate* isolate = reinterpret_cast(v8_isolate); -@@ -6660,6 +6735,11 @@ bool v8::BooleanObject::ValueOf() const { +@@ -6411,6 +6484,10 @@ bool v8::BooleanObject::ValueOf() const { + return jsvalue->value()->IsTrue(isolate); } - +Local v8::StringObject::New(Local value) { + return New(Isolate::GetCurrent(), value); +} -+ + Local v8::StringObject::New(Isolate* v8_isolate, Local value) { i::Handle string = Utils::OpenHandle(*value); -@@ -8937,6 +9017,9 @@ bool MicrotasksScope::IsRunningMicrotasks(Isolate* v8_isolate) { +@@ -8600,6 +8677,9 @@ bool MicrotasksScope::IsRunningMicrotasks(Isolate* v8_isolate) { return microtask_queue->IsRunningMicrotasks(); } @@ -337,9 +334,9 @@ index e1f16d9594458b5e3aec3b6929634abcce5ee59a..c926d049ec4d04c40573b2e4d3608b59 String::Utf8Value::Utf8Value(v8::Isolate* isolate, v8::Local obj) : str_(nullptr), length_(0) { if (obj.IsEmpty()) return; -@@ -8956,6 +9039,9 @@ String::Utf8Value::~Utf8Value() { - i::DeleteArray(str_); - } +@@ -8617,6 +8697,9 @@ String::Utf8Value::Utf8Value(v8::Isolate* isolate, v8::Local obj) + + String::Utf8Value::~Utf8Value() { i::DeleteArray(str_); } +String::Value::Value(v8::Local obj) + : Value(Isolate::GetCurrent(), obj) {} diff --git a/patches/common/v8/export_symbols_needed_for_windows_build.patch b/patches/common/v8/export_symbols_needed_for_windows_build.patch index 8e1008583f28..511ada906ee2 100644 --- a/patches/common/v8/export_symbols_needed_for_windows_build.patch +++ b/patches/common/v8/export_symbols_needed_for_windows_build.patch @@ -6,10 +6,10 @@ Subject: Export symbols needed for Windows build These symbols are required to build v8 with BUILD_V8_SHARED on Windows. diff --git a/src/objects.h b/src/objects.h -index af6f5639604cdef8ad82289d1669635143091d38..169b38745e62a652531f70d8054e26eb1a7b9d18 100644 +index c1ae835e89bc7ccd6da36e9c03ca56ee4e07d31e..dc7e78db9ff76917c57f80926e23c7920c7a0c16 100644 --- a/src/objects.h +++ b/src/objects.h -@@ -769,7 +769,7 @@ enum class KeyCollectionMode { +@@ -772,7 +772,7 @@ enum class KeyCollectionMode { // Utility superclass for stack-allocated objects that must be updated // on gc. It provides two ways for the gc to update instances, either // iterating or updating after gc. diff --git a/patches/common/v8/expose_mksnapshot.patch b/patches/common/v8/expose_mksnapshot.patch index 6b440e91171a..1fe2fc748a7e 100644 --- a/patches/common/v8/expose_mksnapshot.patch +++ b/patches/common/v8/expose_mksnapshot.patch @@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch Needed in order to target mksnapshot for mksnapshot zip. diff --git a/BUILD.gn b/BUILD.gn -index 1f16b3f1ce7a476d4a1e20b6437a305bb867b01b..121170ee0eaa1482497595337481589e06e0f9a2 100644 +index e25b4a427c96a6f66ea693f162a4806723026a91..fff650f31e33cabdddf2c6f6127678379f99bad7 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -3767,8 +3767,6 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -3791,8 +3791,6 @@ if (current_toolchain == v8_generator_toolchain) { if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) { v8_executable("mksnapshot") { diff --git a/patches/common/v8/revert_cctest_add_v8_export_private_to_arm_arm64_ports.patch b/patches/common/v8/revert_cctest_add_v8_export_private_to_arm_arm64_ports.patch index 97f388942543..6601436f10fd 100644 --- a/patches/common/v8/revert_cctest_add_v8_export_private_to_arm_arm64_ports.patch +++ b/patches/common/v8/revert_cctest_add_v8_export_private_to_arm_arm64_ports.patch @@ -6,7 +6,7 @@ Subject: Revert "[cctest] Add V8_EXPORT_PRIVATE to arm/arm64 ports" This reverts commit 1a7d847cfac9a7363c59c980e47a7b7ff416e6da. diff --git a/src/arm/assembler-arm.h b/src/arm/assembler-arm.h -index 07a882a2becd759fd82adc6fb452c60621b51153..7e4a61fb46ee9002d04fe9af2019d3b14c10738f 100644 +index 8157d3cb053fcad45357b3570792e19276670a80..3617d4b71aef412f603470350cb388e7c7515391 100644 --- a/src/arm/assembler-arm.h +++ b/src/arm/assembler-arm.h @@ -79,7 +79,7 @@ enum Coprocessor { @@ -236,7 +236,7 @@ index 8514469227042b5740da73d42fc210a2282414e4..6f46e4b88c2e7c77f6fd58567e9aa2ae static bool IsValidImmPCOffset(ImmBranchType branch_type, ptrdiff_t offset); bool IsTargetInImmPCOffsetRange(Instruction* target); diff --git a/src/arm64/macro-assembler-arm64.h b/src/arm64/macro-assembler-arm64.h -index 114e19fba9bbafac974205d99c425ea98ed5bc0f..64f332af84843a3091b8b04aebd606dac200b56e 100644 +index 62261c9c734de9fe230c52af6fe807a8d444009b..617d709ee5756ede6cb69632520b7d2410562c16 100644 --- a/src/arm64/macro-assembler-arm64.h +++ b/src/arm64/macro-assembler-arm64.h @@ -2082,7 +2082,7 @@ class InstructionAccurateScope { @@ -367,10 +367,10 @@ index 0c247fd247151a0bdfbf3a9f420c2eb2fa47b5cd..21543e7f498c0becfcc1121f2f17ebd9 void Emit(Assembler* assm); size_t entry_count() const; uint32_t section_size() const; -diff --git a/src/disasm.h b/src/disasm.h -index f543af2609fa1e5b8fa8c7fcc74a073c52a3912e..d752b1a44b928dddd722a9cc68bf5b22629e60c7 100644 ---- a/src/disasm.h -+++ b/src/disasm.h +diff --git a/src/diagnostics/disasm.h b/src/diagnostics/disasm.h +index 2fe14f19321c67aaf1dd388472b14c8b5fbfe400..fcc38eb3b2242ce65f872636b9121c66f94b987a 100644 +--- a/src/diagnostics/disasm.h ++++ b/src/diagnostics/disasm.h @@ -14,7 +14,7 @@ typedef unsigned char byte; // Interface and default implementation for converting addresses and // register-numbers to text. The default implementation is machine @@ -398,10 +398,10 @@ index f543af2609fa1e5b8fa8c7fcc74a073c52a3912e..d752b1a44b928dddd722a9cc68bf5b22 // Returns -1 if instruction does not mark the beginning of a constant pool, // or the number of entries in the constant pool beginning here. -diff --git a/src/disassembler.h b/src/disassembler.h -index d6bb84cd274575c78291eafdb6794d7ff690915c..5315d5598f3064cbf5563246bd5bd17fbb916900 100644 ---- a/src/disassembler.h -+++ b/src/disassembler.h +diff --git a/src/diagnostics/disassembler.h b/src/diagnostics/disassembler.h +index 1bb326655abb828e42d370e28b5c12908320f47c..8ac5ced6b370fe15f546c0053afb0c404c8fc8dd 100644 +--- a/src/diagnostics/disassembler.h ++++ b/src/diagnostics/disassembler.h @@ -20,10 +20,8 @@ class Disassembler : public AllStatic { // Instruction'. // the code object is used for name resolution and may be null. @@ -416,10 +416,10 @@ index d6bb84cd274575c78291eafdb6794d7ff690915c..5315d5598f3064cbf5563246bd5bd17f } // namespace internal diff --git a/src/objects.cc b/src/objects.cc -index 70b6966ec0aacfc8df3caa5b73147bbe2691c929..8d6d09eca5ba9ff62744d5d774d7072ad363cf22 100644 +index c254eaf4d6a80cafaf4b17ebef91d794e2034790..9641318f878049c96be8b992e20f459a84635fad 100644 --- a/src/objects.cc +++ b/src/objects.cc -@@ -1238,7 +1238,7 @@ bool Object::ToInt32(int32_t* value) { +@@ -1239,7 +1239,7 @@ bool Object::ToInt32(int32_t* value) { // static constexpr object declarations need a definition to make the // compiler happy. constexpr Object Smi::kZero; @@ -462,7 +462,7 @@ index 31309dc5a89b6433479d95dc9de77401690b004a..ef205cdf90e4426d91c7b6551fd17c9e // [name]: Returns shared name if it exists or an empty string otherwise. inline String Name() const; diff --git a/src/objects/string.cc b/src/objects/string.cc -index f1fafa0c8e5e52d59ad717280a7ad4af978d88c2..d68a78939146085ee8cb381b856e1796bd47f07c 100644 +index 1f044e3299d6a54caa5a81417213970f24fd1954..625ca289807f0300585811eddb95bc9bc8ac6266 100644 --- a/src/objects/string.cc +++ b/src/objects/string.cc @@ -1626,8 +1626,5 @@ String ConsStringIterator::NextLeaf(bool* blew_stack) { @@ -537,7 +537,7 @@ index d31f5ff067c9b096a94705769c64586ffd546341..cce60d015af915e0984060dd2e84d6f7 uint32_t table_index; WasmInitExpr offset; diff --git a/test/cctest/parsing/test-parse-decision.cc b/test/cctest/parsing/test-parse-decision.cc -index e3b046baef67369153bafc4605ea0e636a88cd36..c0c4b2cd7e847c217fb8c868263fd74b9c8d9499 100644 +index 14b772cd4b72fb7fda13c1633b3c2371aa23485d..2146ca767a53efd3d9ae2f689918de16fd4cbea2 100644 --- a/test/cctest/parsing/test-parse-decision.cc +++ b/test/cctest/parsing/test-parse-decision.cc @@ -14,7 +14,6 @@