From e794260d89c262de237bb2f00a7ecd07d409f05c Mon Sep 17 00:00:00 2001 From: Nitish Sakhawalkar Date: Mon, 13 May 2019 11:49:01 -0700 Subject: [PATCH] Update chromium patches --- patches/common/chromium/.patches | 6 +- .../chromium/allow_webview_file_url.patch | 4 +- ...ink-worker-enable-csp-in-file-scheme.patch | 4 +- .../common/chromium/blink_local_frame.patch | 6 +- .../common/chromium/blink_world_context.patch | 12 ++-- .../common/chromium/boringssl_build_gn.patch | 2 +- .../build_add_electron_tracing_category.patch | 2 +- patches/common/chromium/build_gn.patch | 4 +- .../common/chromium/can_create_window.patch | 24 +++---- ...r_to_prevent_locking_scheme_registry.patch | 2 +- .../chromium/content_browser_main_loop.patch | 4 +- ...cross_site_document_resource_handler.patch | 8 +-- .../common/chromium/disable-redraw-lock.patch | 10 +-- .../disable_color_correct_rendering.patch | 46 ++++++------- .../disable_detach_webview_frame.patch | 4 +- patches/common/chromium/disable_hidden.patch | 4 +- .../disable_network_services_by_default.patch | 2 +- ...requirement_for_beforeunload_dialogs.patch | 4 +- .../common/chromium/dom_storage_limits.patch | 8 +-- patches/common/chromium/dump_syms.patch | 4 +- .../exclude-a-few-test-files-from-build.patch | 4 +- ...creen_rendering_with_viz_compositor.patch} | 18 ++--- .../common/chromium/frame_host_manager.patch | 12 ++-- .../gin_enable_disable_v8_platform.patch | 2 +- .../chromium/gritsettings_resource_ids.patch | 4 +- patches/common/chromium/mas-cfisobjc.patch | 2 +- .../common/chromium/mas_no_private_api.patch | 40 +++++------ .../chromium/no_cache_storage_check.patch | 4 +- .../chromium/notification_provenance.patch | 4 +- .../chromium/out_of_process_instance.patch | 4 +- .../render_widget_host_view_base.patch | 12 ++-- .../render_widget_host_view_mac.patch | 16 ++--- .../chromium/resource_file_conflict.patch | 6 +- .../revert_build_swiftshader_for_arm32.patch | 2 +- .../revert_roll_clang_356356_357569.patch | 26 -------- .../common/chromium/scroll_bounce_flag.patch | 4 +- .../ssl_security_state_tab_helper.patch | 41 +++--------- .../support_mixed_sandbox_with_zygote.patch | 10 +-- patches/common/chromium/sysroot.patch | 6 +- .../verbose_generate_breakpad_symbols.patch | 22 +++---- patches/common/chromium/web_contents.patch | 30 +++++---- .../common/chromium/webview_cross_drag.patch | 4 +- .../worker_context_will_destroy.patch | 22 +++---- patches/common/v8/.patches | 2 +- patches/common/v8/add_realloc.patch | 6 +- patches/common/v8/build_gn.patch | 8 +-- patches/common/v8/dcheck.patch | 8 +-- ...vide_more_v8_backwards_compatibility.patch | 50 +++++++------- ...ort_symbols_needed_for_windows_build.patch | 4 +- patches/common/v8/expose_mksnapshot.patch | 4 +- ...v8_export_private_to_arm_arm64_ports.patch | 66 ++++++------------- ...workaround_an_undefined_symbol_error.patch | 6 +- 52 files changed, 268 insertions(+), 341 deletions(-) rename patches/common/chromium/{viz_osr.patch => feat_offscreen_rendering_with_viz_compositor.patch} (97%) delete mode 100644 patches/common/chromium/revert_roll_clang_356356_357569.patch diff --git a/patches/common/chromium/.patches b/patches/common/chromium/.patches index 7fce17e6536..ba6285d533b 100644 --- a/patches/common/chromium/.patches +++ b/patches/common/chromium/.patches @@ -17,7 +17,6 @@ stream_resource_handler.patch thread_capabilities.patch web_contents.patch webview_cross_drag.patch -worker_context_will_destroy.patch disable_user_gesture_requirement_for_beforeunload_dialogs.patch gin_enable_disable_v8_platform.patch blink-worker-enable-csp-in-file-scheme.patch @@ -72,9 +71,10 @@ fix_disable_usage_of_setapplicationisdaemon_and.patch ipc_message_start.patch disable_network_services_by_default.patch unsandboxed_ppapi_processes_skip_zygote.patch -viz_osr.patch patch_the_ensure_gn_version_py_script_to_work_on_mac_ci.patch -revert_roll_clang_356356_357569.patch partially_revert_fb4ab3be3fc0024d00358d5b7816d3215a8ff20c.patch build_add_electron_tracing_category.patch add_contentgpuclient_precreatemessageloop_callback.patch +disable_custom_libcxx_on_windows.patch +feat_offscreen_rendering_with_viz_compositor.patch +worker_context_will_destroy.patch diff --git a/patches/common/chromium/allow_webview_file_url.patch b/patches/common/chromium/allow_webview_file_url.patch index 18189e59141..1e6a0f33cc7 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 27f7edf204a0f22917cc7b62a63723e7ff396702..ea25f04910803f34248674c42a43574fa884b8ab 100644 +index 5d721cad1ed0d42441edd57c8c17b559abbbf0a7..c100b8b7d645a2683aee410234cc3d05335eb7ea 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc -@@ -1496,6 +1496,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest( +@@ -1473,6 +1473,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest( !policy->IsWebSafeScheme(info.common_params.url.scheme()) && !is_external_protocol; diff --git a/patches/common/chromium/blink-worker-enable-csp-in-file-scheme.patch b/patches/common/chromium/blink-worker-enable-csp-in-file-scheme.patch index 50f6ac97761..2f81b519ec8 100644 --- a/patches/common/chromium/blink-worker-enable-csp-in-file-scheme.patch +++ b/patches/common/chromium/blink-worker-enable-csp-in-file-scheme.patch @@ -5,10 +5,10 @@ Subject: blink-worker-enable-csp-in-file-scheme.patch diff --git a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc -index d90b74ba141ee7f9609bea8698ca7b7c2f630d9f..f66233507fb26b4a2626b75b4eb38ff340d2d91c 100644 +index eeeaa47777df0cab00e1c14f60a0d1e26432c538..608ba10174a9c313bb17ab6d5f68053ce37a0435 100644 --- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc +++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc -@@ -310,7 +310,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy( +@@ -307,7 +307,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy( // document (which is implemented in WorkerMessagingProxy, and // m_contentSecurityPolicy should be left as nullptr to inherit the policy). if (!response.CurrentRequestUrl().ProtocolIs("blob") && diff --git a/patches/common/chromium/blink_local_frame.patch b/patches/common/chromium/blink_local_frame.patch index eb2a4810ff8..3f9e4685965 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 24f40cc20d5a178d57828b733c10fcad5b3dcafe..99a7be58c6fde45aff4feafca51b3a63918850bb 100644 +index 29a339c3bad6c8e5a8cae29ee421a83f039f9717..f155d964fb665726f8959295b7c8876c559b87f2 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -423,10 +423,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { +@@ -406,10 +406,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { } CHECK(!view_ || !view_->IsAttached()); @@ -28,7 +28,7 @@ index 24f40cc20d5a178d57828b733c10fcad5b3dcafe..99a7be58c6fde45aff4feafca51b3a63 if (!Client()) return; -@@ -444,6 +440,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) { +@@ -427,6 +423,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 8543d7c1213..4772dd88725 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 641a24b04dcf6602f8da660e4d84d591bc38573a..f9f1871d73dce74375084dd1786dee2806f973fb 100644 +index fa0c5f7ad8e20b429b697de0f81fe84199c09a87..1bacc981007b4706dc5bd775f96ac4fccb12cdaf 100644 --- a/third_party/blink/public/web/web_local_frame.h +++ b/third_party/blink/public/web/web_local_frame.h -@@ -355,6 +355,9 @@ class WebLocalFrame : public WebFrame { +@@ -351,6 +351,9 @@ class WebLocalFrame : public WebFrame { // be calling this API. virtual v8::Local MainWorldScriptContext() const = 0; @@ -19,10 +19,10 @@ index 641a24b04dcf6602f8da660e4d84d591bc38573a..f9f1871d73dce74375084dd1786dee28 // 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 412e7553b657077c4ed5587dd7763ad4f14dc649..295ccca27242d3583697e4cda3460476ea38b231 100644 +index bed103526f62358fa98973ba11bc3e1d9688c159..fcfc4948bc723864ac39cfef34ad28d3a673c0e2 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 -@@ -868,6 +868,13 @@ v8::Local WebLocalFrameImpl::GlobalProxy() const { +@@ -861,6 +861,13 @@ v8::Local WebLocalFrameImpl::GlobalProxy() const { return MainWorldScriptContext()->Global(); } @@ -37,10 +37,10 @@ index 412e7553b657077c4ed5587dd7763ad4f14dc649..295ccca27242d3583697e4cda3460476 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 c6d881efbe2ecbb9170521020ac12590df3a74fd..a32f8cd49ab2f8ce9c462af04260453889ebcd92 100644 +index 8b5916d086f1de3467a8579aebbb910c6568256f..cdea9b68698713cd635f9b1e0c54e1efca76cd51 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 -@@ -147,6 +147,8 @@ class CORE_EXPORT WebLocalFrameImpl final +@@ -146,6 +146,8 @@ class CORE_EXPORT WebLocalFrameImpl final int argc, v8::Local argv[]) override; v8::Local MainWorldScriptContext() const override; diff --git a/patches/common/chromium/boringssl_build_gn.patch b/patches/common/chromium/boringssl_build_gn.patch index 95ff17d4db4..411d50b9876 100644 --- a/patches/common/chromium/boringssl_build_gn.patch +++ b/patches/common/chromium/boringssl_build_gn.patch @@ -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 051b3ed07fa7d4ec2e5f9200dab6843176e55d56..edf567e79c88fbe66acf4aabd3952cb8adcab4af 100644 +index 250ed854247a6f2f17690ffb95524eb57c72598b..6399d955196fb2d79f18dfcf7cbb2dbd5bd0bcae 100644 --- a/third_party/boringssl/BUILD.gn +++ b/third_party/boringssl/BUILD.gn @@ -45,6 +45,19 @@ config("no_asm_config") { diff --git a/patches/common/chromium/build_add_electron_tracing_category.patch b/patches/common/chromium/build_add_electron_tracing_category.patch index 3b3518a9575..8f70f10b724 100644 --- a/patches/common/chromium/build_add_electron_tracing_category.patch +++ b/patches/common/chromium/build_add_electron_tracing_category.patch @@ -8,7 +8,7 @@ categories in use are known / declared. This patch is required for us to introduce a new Electron category. diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h -index 0a0fb37798bdf596fef33c148ee0d9d358559286..ea0775c7edca664f9e1ba981b4a512f6fa5f3c29 100644 +index 97055b4bdaf0dc38b8d248fefddfcf8c68c123b9..6dbe407151dfc5a9168df77f42932e51b802377f 100644 --- a/base/trace_event/builtin_categories.h +++ b/base/trace_event/builtin_categories.h @@ -61,6 +61,7 @@ diff --git a/patches/common/chromium/build_gn.patch b/patches/common/chromium/build_gn.patch index da0f7becd2e..0c3b488799e 100644 --- a/patches/common/chromium/build_gn.patch +++ b/patches/common/chromium/build_gn.patch @@ -5,7 +5,7 @@ Subject: build_gn.patch diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn -index 7175865b31ceefb592bfdfb55b00a1aaab14ef15..a96c2429dacac65489da0cd6fa5a642222f4b518 100644 +index 7063da0f26c5691f01214c2dc014128d7c8c5e09..b45c5adade6f68d5ba90ddbdf39755b53431b6f6 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -123,6 +123,9 @@ if (current_os == "") { @@ -18,7 +18,7 @@ index 7175865b31ceefb592bfdfb55b00a1aaab14ef15..a96c2429dacac65489da0cd6fa5a6422 # Set to enable the official build level of optimization. This has nothing # to do with branding, but enables an additional level of optimization above # release (!is_debug). This might be better expressed as a tri-state -@@ -438,6 +441,7 @@ default_compiler_configs = [ +@@ -437,6 +440,7 @@ default_compiler_configs = [ "//build/config/compiler:thin_archive", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", diff --git a/patches/common/chromium/can_create_window.patch b/patches/common/chromium/can_create_window.patch index fc4ce4c35d4..89491ae6e72 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 5eb0746e4d69a72b083d1632bb66882888b6b7f1..e99ea17700d6e0c240e07984748983e65fc61425 100644 +index ac73b61ebe584abaf18b0de782ad4111996edd71..0d78b60fcc9d6bf312981a5033b8d5ee7671d2ae 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc -@@ -3669,6 +3669,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -3730,6 +3730,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,10 +17,10 @@ index 5eb0746e4d69a72b083d1632bb66882888b6b7f1..e99ea17700d6e0c240e07984748983e6 &no_javascript_access); diff --git a/content/common/frame.mojom b/content/common/frame.mojom -index 68cb13c4e2bd144a81546edb99ba993e36cf09ff..67b676e6c58f2e27e47c9064980e2bfca39c7d3b 100644 +index ee0ca5d5b76756ab4123652b02298eede20f22e0..51c89138745cf587a483771b4716b5cabef91eb3 100644 --- a/content/common/frame.mojom +++ b/content/common/frame.mojom -@@ -289,6 +289,10 @@ struct CreateNewWindowParams { +@@ -291,6 +291,10 @@ struct CreateNewWindowParams { // The window features to use for the new window. blink.mojom.WindowFeatures features; @@ -32,7 +32,7 @@ index 68cb13c4e2bd144a81546edb99ba993e36cf09ff..67b676e6c58f2e27e47c9064980e2bfc // 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 bf0bbe26b5dfd43539b47a9dda8ec079f24adca4..bac5261c293f1c9aeec1ce077d483378538b9046 100644 +index 74da3ccb05fb9eababe966b881eca87d5c71a9f6..66280289f51a89dcd17c288569348efa18227e9b 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 bf0bbe26b5dfd43539b47a9dda8ec079f24adca4..bac5261c293f1c9aeec1ce077d483378 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 e295f5a9b4c27ddcb5128c041dfbb91378dda791..2539e6fce69fd0eb68f0439ae93393f88c670566 100644 +index 3545b144d53e22334b3d844a7904aa6e2e741076..f0e60c3e8c135712db5cb8e918109f249502bee9 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 e295f5a9b4c27ddcb5128c041dfbb91378dda791..2539e6fce69fd0eb68f0439ae93393f8 bool opener_suppressed, bool* no_javascript_access); diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc -index a9508139d626447ebf54edf1281337b9f7a3f406..ee84732bc535538f95fc2c767060dca50fbdf561 100644 +index d13a90f530fd47d16be0e6681317d627b8877f19..a6be87cd24168f76ba1658496642ec0ead1d3923 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -77,6 +77,7 @@ @@ -77,7 +77,7 @@ index a9508139d626447ebf54edf1281337b9f7a3f406..ee84732bc535538f95fc2c767060dca5 #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/video_capture_impl_manager.h" -@@ -1368,6 +1369,8 @@ WebView* RenderViewImpl::CreateView( +@@ -1358,6 +1359,8 @@ WebView* RenderViewImpl::CreateView( } params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features); @@ -87,10 +87,10 @@ index a9508139d626447ebf54edf1281337b9f7a3f406..ee84732bc535538f95fc2c767060dca5 // moved on send. bool is_background_tab = diff --git a/content/shell/browser/web_test/web_test_content_browser_client.cc b/content/shell/browser/web_test/web_test_content_browser_client.cc -index a303b169acb638a0c4bbec1349a028c8d89762bd..c95dcedefc74e5ad9883d16448bb36fcb5a088a6 100644 +index 3e3f251af3c531fca379f7fa00f67d671bbe2d5f..e77427146729664247e4dd3313f8533a78059bf7 100644 --- a/content/shell/browser/web_test/web_test_content_browser_client.cc +++ b/content/shell/browser/web_test/web_test_content_browser_client.cc -@@ -298,6 +298,8 @@ bool WebTestContentBrowserClient::CanCreateWindow( +@@ -299,6 +299,8 @@ bool WebTestContentBrowserClient::CanCreateWindow( const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -100,10 +100,10 @@ index a303b169acb638a0c4bbec1349a028c8d89762bd..c95dcedefc74e5ad9883d16448bb36fc bool opener_suppressed, bool* no_javascript_access) { diff --git a/content/shell/browser/web_test/web_test_content_browser_client.h b/content/shell/browser/web_test/web_test_content_browser_client.h -index 6413e5f117d7dfd4a61779d4c971c28a14a86082..a02e232249cf99c55ec5b07a94b29f0a6d4a38bf 100644 +index 8b9ae118bca4678c315d820af6b4dbe850943ed4..acde862d6d48429db5936f2e6735017dc2ef647e 100644 --- a/content/shell/browser/web_test/web_test_content_browser_client.h +++ b/content/shell/browser/web_test/web_test_content_browser_client.h -@@ -68,6 +68,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient { +@@ -69,6 +69,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient { const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, 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 554fbda845b..6208f2481a9 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 @@ -40,7 +40,7 @@ index 456df421598153bde006ad0ecb0f1031360bb543..af06d78b91fa30e5daf993ad2c65c2c5 return service_manager::ProcessType::kDefault; } diff --git a/content/public/app/content_main_delegate.h b/content/public/app/content_main_delegate.h -index 01f81ee8a103bc893c0739de3463c48839f8d10f..40123b4bf42131a716f9ed7f5dd14b93151fd0b3 100644 +index d4f3b8097c6aba8e15616c6d00070565064b1e9c..5672f4f1c328d30bb04dd8aaf4af63c51d52b3e6 100644 --- a/content/public/app/content_main_delegate.h +++ b/content/public/app/content_main_delegate.h @@ -88,6 +88,9 @@ class CONTENT_EXPORT ContentMainDelegate { diff --git a/patches/common/chromium/content_browser_main_loop.patch b/patches/common/chromium/content_browser_main_loop.patch index 2482a0e14b7..2b9bd57794d 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 6a1d8bbebc69b031ac02b56756a8f313bd1b030f..ca61686d763cd7fb867599397a161e8c88c5b7a9 100644 +index 55908d91d73a0de843fde9749539951f55a1d661..8bd29acde46e8368a38c756d4758763e372e549d 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc -@@ -1570,7 +1570,7 @@ void BrowserMainLoop::MainMessageLoopRun() { +@@ -1523,7 +1523,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 f68a3d51f70..355f668a388 100644 --- a/patches/common/chromium/cross_site_document_resource_handler.patch +++ b/patches/common/chromium/cross_site_document_resource_handler.patch @@ -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 9e65e50de1d45d8435145b56bf7108a8c0272065..3103e4caa2adf853277774092cbd645fd8ece952 100644 +index 2151c5b9698e9a2768875d04a2297956cc4c0d41..8a316a117ab367bcbac947894cbe1bc2428de93e 100644 --- a/content/browser/loader/cross_site_document_resource_handler.cc +++ b/content/browser/loader/cross_site_document_resource_handler.cc -@@ -666,6 +666,9 @@ bool CrossSiteDocumentResourceHandler::ShouldBlockBasedOnHeaders( +@@ -671,6 +671,9 @@ bool CrossSiteDocumentResourceHandler::ShouldBlockBasedOnHeaders( return false; } @@ -22,7 +22,7 @@ index 9e65e50de1d45d8435145b56bf7108a8c0272065..3103e4caa2adf853277774092cbd645f } diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc -index d31af66d884a36b1f10ba845bd3df77394296cf1..f57d0f9d0aef241e648a6a4a3aa390efcf16c690 100644 +index 0569c5b0ae4bed017c9b240689aef647f099d57e..c7b5c9a7245d1c738e5c103d378d0f2a5eb1f492 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 d31af66d884a36b1f10ba845bd3df77394296cf1..f57d0f9d0aef241e648a6a4a3aa390ef const MainFunctionParams& parameters) { return nullptr; diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 87967723939dc85f89ed0be793f3371200860e45..ec60fa98d994b07881dbb15d397f8b7844af911a 100644 +index 6219857d40d63f1d6918d941b31c80f3729a8dba..74f8a2a0f44ee5daaa68cff108ffb5a458a8777b 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-redraw-lock.patch b/patches/common/chromium/disable-redraw-lock.patch index 494c7c3059b..4dbecd75c72 100644 --- a/patches/common/chromium/disable-redraw-lock.patch +++ b/patches/common/chromium/disable-redraw-lock.patch @@ -15,10 +15,10 @@ the redraw locking mechanism, which fixes these issues. The electron issue can be found at https://github.com/electron/electron/issues/1821 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc -index 9e686fc3ec97bbb4a67b391f344dc8eb7aad2fbd..566929def5c8a9de82b5f7238cc50657521249d9 100644 +index 64dbeec700f4848966cd25940ae1a360de09f1d1..0a92b5d3501682cdd5101e3fdd8dde96580efc92 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc -@@ -284,6 +284,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500; +@@ -285,6 +285,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500; } // namespace @@ -29,7 +29,7 @@ index 9e686fc3ec97bbb4a67b391f344dc8eb7aad2fbd..566929def5c8a9de82b5f7238cc50657 // A scoping class that prevents a window from being able to redraw in response // to invalidations that may occur within it for the lifetime of the object. // -@@ -335,6 +339,7 @@ class HWNDMessageHandler::ScopedRedrawLock { +@@ -336,6 +340,7 @@ class HWNDMessageHandler::ScopedRedrawLock { cancel_unlock_(false), should_lock_(owner_->IsVisible() && !owner->HasChildRenderingWindow() && ::IsWindow(hwnd_) && @@ -37,7 +37,7 @@ index 9e686fc3ec97bbb4a67b391f344dc8eb7aad2fbd..566929def5c8a9de82b5f7238cc50657 (!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION) || !ui::win::IsAeroGlassEnabled())) { if (should_lock_) -@@ -936,6 +941,10 @@ bool HWNDMessageHandler::HasChildRenderingWindow() { +@@ -934,6 +939,10 @@ bool HWNDMessageHandler::HasChildRenderingWindow() { hwnd()); } @@ -62,7 +62,7 @@ index e51d2f358319108e1f5dd70898070caf655265bf..5efcdf139ef331f09f427f75a9a75ed2 HICON GetDefaultWindowIcon() const override; HICON GetSmallWindowIcon() const override; diff --git a/ui/views/win/hwnd_message_handler_delegate.h b/ui/views/win/hwnd_message_handler_delegate.h -index 3b06661ed6d694a6209f8584065391e074e3e6b3..c8d2583db0b102628f53f554785e5282d8008830 100644 +index 45c4e5b29d05ea0323596fa2c5034c2e30a68f70..e25aac69b09954fbc267309beba98ec0877fa2ac 100644 --- a/ui/views/win/hwnd_message_handler_delegate.h +++ b/ui/views/win/hwnd_message_handler_delegate.h @@ -46,6 +46,8 @@ class VIEWS_EXPORT HWNDMessageHandlerDelegate { diff --git a/patches/common/chromium/disable_color_correct_rendering.patch b/patches/common/chromium/disable_color_correct_rendering.patch index 89ad15f7114..10ca0c2b70b 100644 --- a/patches/common/chromium/disable_color_correct_rendering.patch +++ b/patches/common/chromium/disable_color_correct_rendering.patch @@ -32,7 +32,7 @@ index 092fb1b7ea3626b7649472c35ec20bf1a6aaf4cd..fed8dd322faba387ebd0508228f84776 // Image Decode Service and raster tiles without images until the decode is // ready. diff --git a/components/viz/common/display/renderer_settings.h b/components/viz/common/display/renderer_settings.h -index fc3bd4e31a24fa9135381959c8729a5e13368d48..5ab9b8c63128a5b964457eed2100316e777f542e 100644 +index 78041fcb9647f740c6a142ec65f2418712c6286c..04e75ac40c38a38bdec634d1aa645854cb1a80d6 100644 --- a/components/viz/common/display/renderer_settings.h +++ b/components/viz/common/display/renderer_settings.h @@ -23,6 +23,7 @@ class VIZ_COMMON_EXPORT RendererSettings { @@ -65,7 +65,7 @@ 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 faa61cee3a961b57c2abc5f4bdf6e8cd0954985b..76a73e7bb9dc1954da9a9f9f548c9e8d2a4c05c7 100644 +index a70fb439a3bf3ef210d1ea3a9256353bda6a02bb..c90de321edfc101f7c22b42936044bb3dde5eeb2 100644 --- a/components/viz/service/display/gl_renderer.cc +++ b/components/viz/service/display/gl_renderer.cc @@ -79,6 +79,9 @@ @@ -90,7 +90,7 @@ index faa61cee3a961b57c2abc5f4bdf6e8cd0954985b..76a73e7bb9dc1954da9a9f9f548c9e8d // Use the full quad_rect for debug quads to not move the edges based on // partial swaps. -@@ -1372,7 +1376,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params, +@@ -1406,7 +1410,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 faa61cee3a961b57c2abc5f4bdf6e8cd0954985b..76a73e7bb9dc1954da9a9f9f548c9e8d } void GLRenderer::UpdateRPDQUniforms(DrawRenderPassDrawQuadParams* params) { -@@ -1843,8 +1848,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad, +@@ -1877,8 +1882,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 faa61cee3a961b57c2abc5f4bdf6e8cd0954985b..76a73e7bb9dc1954da9a9f9f548c9e8d SetShaderColor(color, opacity); if (current_program_->rounded_corner_rect_location() != -1) { SetShaderRoundedCorner( -@@ -2000,8 +2005,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad, +@@ -2033,8 +2038,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad, : NON_PREMULTIPLIED_ALPHA, false, false, tint_gl_composited_content_, ShouldApplyRoundedCorner(quad)), @@ -122,7 +122,7 @@ index faa61cee3a961b57c2abc5f4bdf6e8cd0954985b..76a73e7bb9dc1954da9a9f9f548c9e8d if (current_program_->tint_color_matrix_location() != -1) { auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix(); -@@ -2098,8 +2103,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad, +@@ -2130,8 +2135,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad, !quad->ShouldDrawWithBlending(), has_tex_clamp_rect, tint_gl_composited_content_, ShouldApplyRoundedCorner(quad)), @@ -133,7 +133,7 @@ index faa61cee3a961b57c2abc5f4bdf6e8cd0954985b..76a73e7bb9dc1954da9a9f9f548c9e8d if (current_program_->tint_color_matrix_location() != -1) { auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix(); -@@ -2202,7 +2207,7 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad, +@@ -2234,7 +2239,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 faa61cee3a961b57c2abc5f4bdf6e8cd0954985b..76a73e7bb9dc1954da9a9f9f548c9e8d // 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. -@@ -2358,8 +2363,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad, +@@ -2390,8 +2395,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad, SetUseProgram(ProgramKey::VideoStream(tex_coord_precision, ShouldApplyRoundedCorner(quad)), @@ -153,7 +153,7 @@ index faa61cee3a961b57c2abc5f4bdf6e8cd0954985b..76a73e7bb9dc1954da9a9f9f548c9e8d DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_)); gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id()); -@@ -2416,8 +2421,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) { +@@ -2448,8 +2453,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 faa61cee3a961b57c2abc5f4bdf6e8cd0954985b..76a73e7bb9dc1954da9a9f9f548c9e8d if (current_program_->rounded_corner_rect_location() != -1) { SetShaderRoundedCorner( -@@ -3110,7 +3115,9 @@ void GLRenderer::PrepareGeometry(BoundGeometry binding) { +@@ -3142,7 +3147,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 faa61cee3a961b57c2abc5f4bdf6e8cd0954985b..76a73e7bb9dc1954da9a9f9f548c9e8d ProgramKey program_key = program_key_no_color; const gfx::ColorTransform* color_transform = -@@ -3464,7 +3471,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource( +@@ -3496,7 +3503,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource( *overlay_texture = FindOrCreateOverlayTexture( params.quad->render_pass_id, iosurface_width, iosurface_height, @@ -184,7 +184,7 @@ index faa61cee3a961b57c2abc5f4bdf6e8cd0954985b..76a73e7bb9dc1954da9a9f9f548c9e8d *new_bounds = gfx::RectF(updated_dst_rect.origin(), gfx::SizeF((*overlay_texture)->texture.size())); -@@ -3668,8 +3675,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) { +@@ -3700,8 +3707,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) { PrepareGeometry(SHARED_BINDING); @@ -196,17 +196,17 @@ index faa61cee3a961b57c2abc5f4bdf6e8cd0954985b..76a73e7bb9dc1954da9a9f9f548c9e8d gfx::Transform render_matrix; render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(), -@@ -3829,3 +3837,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize( +@@ -3861,3 +3869,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 53fc82c1f2cc0cfb7a6ce909fea6c025dff26b43..ec00a673df6a8f1c372fc8dff7cf508502c3767b 100644 +index 03af9941b7029f71c24785b45afeaa1fd05deebb..2af2a2a383270b89d945b6d5a08fedc936b60caf 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc -@@ -192,6 +192,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus( +@@ -191,6 +191,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus( // Command-line switches to propagate to the GPU process. static const char* const kSwitchNames[] = { @@ -215,10 +215,10 @@ index 53fc82c1f2cc0cfb7a6ce909fea6c025dff26b43..ec00a673df6a8f1c372fc8dff7cf5085 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 50f63a2c8f8ec447545d2b2c80afef34ad4a7fef..8728e19fe5087927b4d6aa8cccaf09258aae9ea4 100644 +index dffe06fa5262a0b6aebe064f8813b149439cb613..59c8ac411b4525f4a866b16c04c1a37a36aef7d5 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -220,6 +220,7 @@ +@@ -218,6 +218,7 @@ #include "ui/base/ui_base_switches.h" #include "ui/base/ui_base_switches_util.h" #include "ui/display/display_switches.h" @@ -226,7 +226,7 @@ index 50f63a2c8f8ec447545d2b2c80afef34ad4a7fef..8728e19fe5087927b4d6aa8cccaf0925 #include "ui/gl/gl_switches.h" #include "ui/native_theme/native_theme_features.h" -@@ -2935,6 +2936,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( +@@ -2925,6 +2926,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( // Propagate the following switches to the renderer command line (along // with any associated values) if present in the browser command line. static const char* const kSwitchNames[] = { @@ -235,10 +235,10 @@ index 50f63a2c8f8ec447545d2b2c80afef34ad4a7fef..8728e19fe5087927b4d6aa8cccaf0925 network::switches::kExplicitlyAllowedPorts, service_manager::switches::kDisableInProcessStackTraces, diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc -index abbcf4ba59a1f3f31ae83055030414de61ec20c5..0f34f2ef40afcda39bc3297dc69128e441be6cf5 100644 +index 530154f0b9544cff8e15270e6cf7fff41476f409..89d0e83551230a174d7d402bb7487329abc9b559 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc -@@ -2818,6 +2818,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings( +@@ -2803,6 +2803,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings( settings.main_frame_before_activation_enabled = cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation); @@ -288,7 +288,7 @@ index 88ec94963569588ed2882193a28197879dcb1090..eae37577bc9b1872c0162f55de218553 if (color_space == ColorSpace::CreateSRGB()) { base::ScopedCFTypeRef srgb_icc( diff --git a/ui/gfx/switches.cc b/ui/gfx/switches.cc -index 53de88695661a12f9820a0319901d4565a775c4a..12735b7b95a0bb45e08707467d21e59f4b77e2b5 100644 +index 189e147e908fdab38972f4f9b0ce212347a4ec2e..2a0a480d8513abc609b82f3d1eb24695d4f2146f 100644 --- a/ui/gfx/switches.cc +++ b/ui/gfx/switches.cc @@ -7,6 +7,8 @@ @@ -301,10 +301,10 @@ index 53de88695661a12f9820a0319901d4565a775c4a..12735b7b95a0bb45e08707467d21e59f // sharpness, kerning, hinting and layout. const char kDisableFontSubpixelPositioning[] = diff --git a/ui/gfx/switches.h b/ui/gfx/switches.h -index 3b87320bf5318ad4d30205f8a48f19c8037e61c6..f18f8db6feab73169ad9f95f33c52799d5d53049 100644 +index c95989ae7da12585fc417a680aef6c55e4b7a8d7..9e180a6decd72e510cecfec1f43fd1ac70e8b8f7 100644 --- a/ui/gfx/switches.h +++ b/ui/gfx/switches.h -@@ -11,6 +11,8 @@ +@@ -10,6 +10,8 @@ namespace switches { diff --git a/patches/common/chromium/disable_detach_webview_frame.patch b/patches/common/chromium/disable_detach_webview_frame.patch index bca002e9b69..d40366468bf 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 62436cdd04e7b7c83e04cd6339ccf8374c78e34a..1f006c181eee5d6cea95894fea1204ca75af0bee 100644 +index 011665473863e973b3fdb48bdee64efc51330a24..f16ee98fd1311a45c343fc0d397bc7703ec2e554 100644 --- a/content/browser/frame_host/render_frame_proxy_host.cc +++ b/content/browser/frame_host/render_frame_proxy_host.cc -@@ -269,6 +269,12 @@ void RenderFrameProxyHost::SetDestructionCallback( +@@ -276,6 +276,12 @@ void RenderFrameProxyHost::SetDestructionCallback( 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 0adb79545ae..50135cab03c 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 d9831e4d2cc2e24d07ab34957be0112992112b6e..5f0e4c3b44a4da7de94f2beb54cbc545c418679d 100644 +index 6098f3aadf61242549359d99b6f166e81e753223..47c804d40005f29aaf32e7ea22044b29e7955953 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 d9831e4d2cc2e24d07ab34957be0112992112b6e..5f0e4c3b44a4da7de94f2beb54cbc545 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 2bf7891372c8744edd2e99a0fb81ff2bd66e5952..cb37e6b0d0f2c6447a404312c4ef36622b8fdc9e 100644 +index 09dad0b91dfdf2b87e719f85986cbb3a34c6f880..25fa3f5178af9c451df64944a3214f28a221628d 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 afc8962fae1..3c0fc587fdb 100644 --- a/patches/common/chromium/disable_network_services_by_default.patch +++ b/patches/common/chromium/disable_network_services_by_default.patch @@ -12,7 +12,7 @@ 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 b12f83da65dd3d5f3959e8ea421fabb46dab7ad2..683890831cd9a34796caf26a80f2baf863d5f04f 100644 +index a73c894c6d3e549b10cbbeb8f74fda526f0f2a9e..2db7d3a9debd7329c09f748dbe1e24bc7c9a0f53 100644 --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc @@ -21,7 +21,7 @@ const base::Feature kNetworkService { 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 8838cd9b025..c3dd8814f19 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 30f6773e4d37c5e4523bb14a925df5685957b107..e2f9cada0171c5b85445d1d6a105250dd36f17a0 100644 +index d48b02a3aec299a443e05b65124b0b8a4bac992a..2d2701fa05366634fc780f47757d296f04b3ff2f 100644 --- a/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc -@@ -3596,7 +3596,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client, +@@ -3659,7 +3659,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/dom_storage_limits.patch b/patches/common/chromium/dom_storage_limits.patch index fd5a5762989..ba0d12cdb3c 100644 --- a/patches/common/chromium/dom_storage_limits.patch +++ b/patches/common/chromium/dom_storage_limits.patch @@ -97,7 +97,7 @@ index c04e0e8bff1a7a41a1e18aca5403aed16a80aead..d63cec971f0a98f7b8ff30c1f6a0fa84 EnsureLoaded(); bool result = false; diff --git a/third_party/blink/renderer/modules/storage/cached_storage_area.cc b/third_party/blink/renderer/modules/storage/cached_storage_area.cc -index 9430717450759c77e8164bc1c496c4a8e4e9ddb6..8a8ff0816d8c015ea8a0456ba66b702b765a128a 100644 +index 6a3a3718443aebf24fd60e00f8f01ba76575ebfa..fb8250553164ebaf1a5ccae4a1c8e2f660ea6e14 100644 --- a/third_party/blink/renderer/modules/storage/cached_storage_area.cc +++ b/third_party/blink/renderer/modules/storage/cached_storage_area.cc @@ -106,11 +106,13 @@ bool CachedStorageArea::SetItem(const String& key, @@ -115,12 +115,12 @@ index 9430717450759c77e8164bc1c496c4a8e4e9ddb6..8a8ff0816d8c015ea8a0456ba66b702b EnsureLoaded(); String old_value; diff --git a/third_party/blink/renderer/modules/storage/storage_area_map.cc b/third_party/blink/renderer/modules/storage/storage_area_map.cc -index 62ab01c2864baa2ef1945031faf42cbeefbfc72b..e7edaff1778c66812ab9f7058e89f84bfba94339 100644 +index 0da8a1e891edad60355792c40b7d15e90c1086e8..df71418d598d5bdf41e9a8a4340999d9d277aeef 100644 --- a/third_party/blink/renderer/modules/storage/storage_area_map.cc +++ b/third_party/blink/renderer/modules/storage/storage_area_map.cc -@@ -104,10 +104,12 @@ bool StorageAreaMap::SetItemInternal(const String& key, - size_t new_item_size = QuotaForString(key) + QuotaForString(value); +@@ -113,10 +113,12 @@ bool StorageAreaMap::SetItemInternal(const String& key, size_t new_quota_used = quota_used_ - old_item_size + new_item_size; + size_t new_memory_used = memory_used_ - old_item_memory + new_item_memory; +#if 0 // Only check quota if the size is increasing, this allows diff --git a/patches/common/chromium/dump_syms.patch b/patches/common/chromium/dump_syms.patch index ac21c11b5b2..d80eae9e8ad 100644 --- a/patches/common/chromium/dump_syms.patch +++ b/patches/common/chromium/dump_syms.patch @@ -8,10 +8,10 @@ this but it is not a blocker for releasing Electron. This patch removes the hard fail on dylib resolve failure from dump_syms diff --git a/components/crash/content/tools/generate_breakpad_symbols.py b/components/crash/content/tools/generate_breakpad_symbols.py -index c926de336a8bedb2b3b8870a5ad6ab374a9011c3..58558b6cd1e3af826a7066c035e1ad589eff4cb5 100755 +index 937548cc0303d67402f42a6910cfc57bf0e53d64..dce68b1bd1ef58a5dfddb2bbdb56930ed943ad1d 100755 --- a/components/crash/content/tools/generate_breakpad_symbols.py +++ b/components/crash/content/tools/generate_breakpad_symbols.py -@@ -160,7 +160,7 @@ def GetSharedLibraryDependenciesMac(binary, exe_path): +@@ -175,7 +175,7 @@ def GetSharedLibraryDependenciesMac(binary, exe_path): 'ERROR: failed to resolve %s, exe_path %s, loader_path %s, ' 'rpaths %s' % (m.group(1), exe_path, loader_path, ', '.join(rpaths))) diff --git a/patches/common/chromium/exclude-a-few-test-files-from-build.patch b/patches/common/chromium/exclude-a-few-test-files-from-build.patch index 023d0ed6fec..8ae27c12736 100644 --- a/patches/common/chromium/exclude-a-few-test-files-from-build.patch +++ b/patches/common/chromium/exclude-a-few-test-files-from-build.patch @@ -7,10 +7,10 @@ Compilation of those files fails with the Chromium 68. Remove the patch during the Chromium 69 upgrade. diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn -index 277254a4f8cd2c26d09cae73796e59353f7e7108..f9061edf1d17dae129210a7db1b8ff9a48be52f5 100644 +index aa6110be2ac2d3d0eea0ccc3616b1c1bf48fae91..43ef9cf475dd3b673c2e92d7a6e7b1a7ce91d09a 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1749,7 +1749,7 @@ jumbo_source_set("blink_platform_unittests_sources") { +@@ -1753,7 +1753,7 @@ jumbo_source_set("blink_platform_unittests_sources") { "graphics/paint/drawing_display_item_test.cc", "graphics/paint/drawing_recorder_test.cc", "graphics/paint/float_clip_rect_test.cc", diff --git a/patches/common/chromium/viz_osr.patch b/patches/common/chromium/feat_offscreen_rendering_with_viz_compositor.patch similarity index 97% rename from patches/common/chromium/viz_osr.patch rename to patches/common/chromium/feat_offscreen_rendering_with_viz_compositor.patch index 72d8c9a2fcb..03fe6cbe738 100644 --- a/patches/common/chromium/viz_osr.patch +++ b/patches/common/chromium/feat_offscreen_rendering_with_viz_compositor.patch @@ -97,10 +97,10 @@ index 93c52d2b928cba6e98723e19b005fb7bd7089a58..4dc645e770a2a039ed8e4ff4de555767 private: const HWND hwnd_; diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn -index 21345740188ebc13aefae524c9fe065168ccaf27..f56d94f8810063d36ee161b87dccfecbe6e3ab85 100644 +index e2bb3f029f754a5d4d3902af0c0c87da762182eb..10b369fe9ac1e7739c288c4ccf09f621ea444bab 100644 --- a/components/viz/service/BUILD.gn +++ b/components/viz/service/BUILD.gn -@@ -116,6 +116,8 @@ viz_component("service") { +@@ -117,6 +117,8 @@ viz_component("service") { "display_embedder/output_surface_provider_impl.h", "display_embedder/server_shared_bitmap_manager.cc", "display_embedder/server_shared_bitmap_manager.h", @@ -110,7 +110,7 @@ index 21345740188ebc13aefae524c9fe065168ccaf27..f56d94f8810063d36ee161b87dccfecb "display_embedder/software_output_surface.h", "display_embedder/viz_process_context_provider.cc", diff --git a/components/viz/service/display_embedder/output_surface_provider_impl.cc b/components/viz/service/display_embedder/output_surface_provider_impl.cc -index 264c56995171182940b223da06b809eebf78e918..cafc117436bdfb5600e5dfbcd2edf21fe505eeea 100644 +index 8fe397588eb47224d48a8642b814583d11cc9c09..a7072c8e16434d3b15db1599f43d8fab5a97bdf3 100644 --- a/components/viz/service/display_embedder/output_surface_provider_impl.cc +++ b/components/viz/service/display_embedder/output_surface_provider_impl.cc @@ -18,6 +18,7 @@ @@ -121,7 +121,7 @@ index 264c56995171182940b223da06b809eebf78e918..cafc117436bdfb5600e5dfbcd2edf21f #include "components/viz/service/display_embedder/software_output_surface.h" #include "components/viz/service/display_embedder/viz_process_context_provider.h" #include "components/viz/service/gl/gpu_service_impl.h" -@@ -240,6 +241,19 @@ OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform( +@@ -243,6 +244,19 @@ OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform( if (headless_) return std::make_unique(); @@ -139,8 +139,8 @@ index 264c56995171182940b223da06b809eebf78e918..cafc117436bdfb5600e5dfbcd2edf21f +#endif + #if defined(OS_WIN) - return CreateSoftwareOutputDeviceWinGpu( - surface_handle, &output_device_backing_, display_client); + return CreateSoftwareOutputDeviceWin(surface_handle, &output_device_backing_, + display_client); diff --git a/components/viz/service/display_embedder/software_output_device_mac.cc b/components/viz/service/display_embedder/software_output_device_mac.cc index b9357082293cc55650144ccbc8bada8fe6d1cac4..b4cb07e26d1504719f80e5835c1cb5f138b9f1ab 100644 --- a/components/viz/service/display_embedder/software_output_device_mac.cc @@ -442,7 +442,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 a339eaa4dc9ccec292b3df9f31adf1ad45119a77..33146bbe7bb01fbe24cea10d79cad2748dd04a24 100644 +index 0fcded13143bd40eaebedde09feb9b00cfe73fa8..ffcbfee599b007679fb46badea517c4e1f840b8f 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 +453,7 @@ index a339eaa4dc9ccec292b3df9f31adf1ad45119a77..33146bbe7bb01fbe24cea10d79cad274 #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" -@@ -321,7 +322,7 @@ void SoftwareOutputDeviceWinProxy::EndPaintDelegated( +@@ -265,7 +266,7 @@ void SoftwareOutputDeviceWinProxy::EndPaintDelegated( if (!canvas_) return; @@ -462,7 +462,7 @@ index a339eaa4dc9ccec292b3df9f31adf1ad45119a77..33146bbe7bb01fbe24cea10d79cad274 &SoftwareOutputDeviceWinProxy::DrawAck, base::Unretained(this))); waiting_on_draw_ack_ = true; -@@ -362,8 +363,13 @@ std::unique_ptr CreateSoftwareOutputDeviceWinGpu( +@@ -297,8 +298,13 @@ std::unique_ptr CreateSoftwareOutputDeviceWin( display_client->CreateLayeredWindowUpdater( mojo::MakeRequest(&layered_window_updater)); diff --git a/patches/common/chromium/frame_host_manager.patch b/patches/common/chromium/frame_host_manager.patch index e9cd8884c6f..3e5707aeac5 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 2314c6d1d29ebc61d5156644617e9eb088df5d43..9c75367a173b836027b3b7628b49b363e2875338 100644 +index de85226ab3644cc9af5de66a4c25be5902bab55f..028e57320b3def3cd1d948a479a2453fa193c5bb 100644 --- a/content/browser/frame_host/render_frame_host_manager.cc +++ b/content/browser/frame_host/render_frame_host_manager.cc -@@ -2108,6 +2108,16 @@ bool RenderFrameHostManager::InitRenderView( +@@ -2140,6 +2140,16 @@ bool RenderFrameHostManager::InitRenderView( scoped_refptr RenderFrameHostManager::GetSiteInstanceForNavigationRequest( const NavigationRequest& request) { @@ -27,7 +27,7 @@ index 2314c6d1d29ebc61d5156644617e9eb088df5d43..9c75367a173b836027b3b7628b49b363 // 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(); -@@ -2140,6 +2150,51 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( +@@ -2172,6 +2182,51 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( request.common_params().url); no_renderer_swap_allowed |= request.from_begin_navigation() && !can_renderer_initiate_transfer; @@ -79,7 +79,7 @@ index 2314c6d1d29ebc61d5156644617e9eb088df5d43..9c75367a173b836027b3b7628b49b363 } else { // Subframe navigations will use the current renderer, unless specifically // allowed to swap processes. -@@ -2151,23 +2206,17 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( +@@ -2183,23 +2238,17 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( if (no_renderer_swap_allowed && !should_swap_for_error_isolation) return scoped_refptr(current_site_instance); @@ -108,7 +108,7 @@ index 2314c6d1d29ebc61d5156644617e9eb088df5d43..9c75367a173b836027b3b7628b49b363 } diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc -index bac5261c293f1c9aeec1ce077d483378538b9046..d31af66d884a36b1f10ba845bd3df77394296cf1 100644 +index 66280289f51a89dcd17c288569348efa18227e9b..0569c5b0ae4bed017c9b240689aef647f099d57e 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 bac5261c293f1c9aeec1ce077d483378538b9046..d31af66d884a36b1f10ba845bd3df773 const MainFunctionParams& parameters) { return nullptr; diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 2539e6fce69fd0eb68f0439ae93393f88c670566..87967723939dc85f89ed0be793f3371200860e45 100644 +index f0e60c3e8c135712db5cb8e918109f249502bee9..6219857d40d63f1d6918d941b31c80f3729a8dba 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/gin_enable_disable_v8_platform.patch b/patches/common/chromium/gin_enable_disable_v8_platform.patch index 06e1649483a..f5b7689c7ab 100644 --- a/patches/common/chromium/gin_enable_disable_v8_platform.patch +++ b/patches/common/chromium/gin_enable_disable_v8_platform.patch @@ -36,7 +36,7 @@ index 413e6c5bcc74cd01730c5d4dc66eb92aaf7df8de..6c5d101fef97e880bee20d2f76e4b339 v8::Isolate* isolate() { return isolate_; } diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc -index c8baaa5e75582dd60072b5626388950893e70f2b..2ed448852721468124f550e4dc74a8bceeec15ce 100644 +index 770f3cb52990e2a4160050234e474889daab751c..ea9817bf4c0ab5d84ca21abcc573956e9f09b5d3 100644 --- a/gin/v8_initializer.cc +++ b/gin/v8_initializer.cc @@ -204,12 +204,14 @@ enum LoadV8FileResult { diff --git a/patches/common/chromium/gritsettings_resource_ids.patch b/patches/common/chromium/gritsettings_resource_ids.patch index 8ace3626a15..60901cf49be 100644 --- a/patches/common/chromium/gritsettings_resource_ids.patch +++ b/patches/common/chromium/gritsettings_resource_ids.patch @@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch Add electron resources file to the list of resource ids generation. diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids -index a1610f3c9b4bed651270eee9a44a7f6fa57b1059..65c06739b2ba014c603c59a2bee80a43ced2c3df 100644 +index 8f879aae6036650326cae426bf52bceb65aa48ec..a71ee07331c3c45d05689c619b3bc5780e62e798 100644 --- a/tools/gritsettings/resource_ids +++ b/tools/gritsettings/resource_ids -@@ -438,6 +438,11 @@ +@@ -448,6 +448,11 @@ "includes": [28880], }, diff --git a/patches/common/chromium/mas-cfisobjc.patch b/patches/common/chromium/mas-cfisobjc.patch index b20bd6f7530..a5863205bab 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 26a40417ae92c2e12c3901c50e1f101d9b0f57e9..810fbeae866a1507762703296fdd836dd3c9e4ba 100644 +index b5003fbf908fef375fb5daae040cb2e65e23e99e..e0ce94b3aaff00bb319cb0a18af4e70a9c61ca46 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 7a17bc5dc77..e4277b8e595 100644 --- a/patches/common/chromium/mas_no_private_api.patch +++ b/patches/common/chromium/mas_no_private_api.patch @@ -7,7 +7,7 @@ Guard usages in blink of private Mac APIs by MAS_BUILD, so they can be excluded for people who want to submit their apps to the Mac App store. diff --git a/content/browser/accessibility/browser_accessibility_cocoa.h b/content/browser/accessibility/browser_accessibility_cocoa.h -index d38fa48b8b890d90f2911995a2a51c249005c827..5fe68c71fe101a307ef565013a91b109393457dd 100644 +index 743d1364bcd13e24ecbe5ced730161d15b8c3e93..a7e81072194c00baa0aa3159a6bfe374aaffa54f 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.h +++ b/content/browser/accessibility/browser_accessibility_cocoa.h @@ -109,7 +109,9 @@ struct AXTextEdit { @@ -38,7 +38,7 @@ index d38fa48b8b890d90f2911995a2a51c249005c827..5fe68c71fe101a307ef565013a91b109 // is concerned. @property(nonatomic, readonly) NSString* subrole; diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm -index 21934df3a2bf46d54f65bff09ccd7c02b9fb6a40..0c1c8850f50808aab44892221d834f496b15ca99 100644 +index 1d8dbb5a781221dea2fb8138546461d0eddc0243..49a6ad7b31cf959cae19ef535290441598c9306a 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm @@ -141,6 +141,7 @@ @@ -85,7 +85,7 @@ index 21934df3a2bf46d54f65bff09ccd7c02b9fb6a40..0c1c8850f50808aab44892221d834f49 {NSAccessibilitySizeAttribute, @"size"}, {NSAccessibilitySortDirectionAttribute, @"sortDirection"}, {NSAccessibilitySubroleAttribute, @"subrole"}, -@@ -1143,6 +1151,7 @@ - (NSNumber*)enabled { +@@ -1144,6 +1152,7 @@ - (NSNumber*)enabled { ax::mojom::Restriction::kDisabled]; } @@ -93,7 +93,7 @@ index 21934df3a2bf46d54f65bff09ccd7c02b9fb6a40..0c1c8850f50808aab44892221d834f49 // Returns a text marker that points to the last character in the document that // can be selected with VoiceOver. - (id)endTextMarker { -@@ -1153,6 +1162,7 @@ - (id)endTextMarker { +@@ -1154,6 +1163,7 @@ - (id)endTextMarker { BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); return CreateTextMarker(position->CreatePositionAtEndOfAnchor()); } @@ -101,7 +101,7 @@ index 21934df3a2bf46d54f65bff09ccd7c02b9fb6a40..0c1c8850f50808aab44892221d834f49 - (NSNumber*)expanded { if (![self instanceActive]) -@@ -2028,6 +2038,7 @@ - (NSValue*)selectedTextRange { +@@ -2030,6 +2040,7 @@ - (NSValue*)selectedTextRange { return [NSValue valueWithRange:NSMakeRange(selStart, selLength)]; } @@ -109,7 +109,7 @@ index 21934df3a2bf46d54f65bff09ccd7c02b9fb6a40..0c1c8850f50808aab44892221d834f49 - (id)selectedTextMarkerRange { if (![self instanceActive]) return nil; -@@ -2060,6 +2071,7 @@ - (id)selectedTextMarkerRange { +@@ -2062,6 +2073,7 @@ - (id)selectedTextMarkerRange { anchorAffinity, *focusObject, focusOffset, focusAffinity)); } @@ -117,7 +117,7 @@ index 21934df3a2bf46d54f65bff09ccd7c02b9fb6a40..0c1c8850f50808aab44892221d834f49 - (NSValue*)size { if (![self instanceActive]) -@@ -2092,6 +2104,7 @@ - (NSString*)sortDirection { +@@ -2094,6 +2106,7 @@ - (NSString*)sortDirection { return nil; } @@ -125,7 +125,7 @@ index 21934df3a2bf46d54f65bff09ccd7c02b9fb6a40..0c1c8850f50808aab44892221d834f49 // Returns a text marker that points to the first character in the document that // can be selected with VoiceOver. - (id)startTextMarker { -@@ -2102,6 +2115,7 @@ - (id)startTextMarker { +@@ -2104,6 +2117,7 @@ - (id)startTextMarker { BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); return CreateTextMarker(position->CreatePositionAtStartOfAnchor()); } @@ -133,7 +133,7 @@ index 21934df3a2bf46d54f65bff09ccd7c02b9fb6a40..0c1c8850f50808aab44892221d834f49 // Returns a subrole based upon the role. - (NSString*)subrole { -@@ -2402,12 +2416,14 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range { +@@ -2404,12 +2418,14 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range { NSMutableAttributedString* attributedValue = [[[NSMutableAttributedString alloc] initWithString:value] autorelease]; @@ -148,7 +148,7 @@ index 21934df3a2bf46d54f65bff09ccd7c02b9fb6a40..0c1c8850f50808aab44892221d834f49 return [attributedValue attributedSubstringFromRange:range]; } -@@ -2492,6 +2508,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute +@@ -2494,6 +2510,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute return ToBrowserAccessibilityCocoa(cell); } @@ -156,7 +156,7 @@ index 21934df3a2bf46d54f65bff09ccd7c02b9fb6a40..0c1c8850f50808aab44892221d834f49 if ([attribute isEqualToString:@"AXUIElementForTextMarker"]) { BrowserAccessibilityPositionInstance position = CreatePositionFromTextMarker(parameter); -@@ -2669,6 +2686,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute +@@ -2671,6 +2688,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute NSString* text = GetTextForTextMarkerRange(parameter); return [NSNumber numberWithInt:[text length]]; } @@ -164,7 +164,7 @@ index 21934df3a2bf46d54f65bff09ccd7c02b9fb6a40..0c1c8850f50808aab44892221d834f49 if ([attribute isEqualToString: NSAccessibilityBoundsForRangeParameterizedAttribute]) { -@@ -2702,6 +2720,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute +@@ -2704,6 +2722,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute return nil; } @@ -172,7 +172,7 @@ index 21934df3a2bf46d54f65bff09ccd7c02b9fb6a40..0c1c8850f50808aab44892221d834f49 if ([attribute isEqualToString: NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) { -@@ -2782,6 +2801,7 @@ AXPlatformRange range(position->CreatePreviousLineStartPosition( +@@ -2784,6 +2803,7 @@ AXPlatformRange range(position->CreatePreviousLineStartPosition( return @(child->GetIndexInParent()); } @@ -181,10 +181,10 @@ index 21934df3a2bf46d54f65bff09ccd7c02b9fb6a40..0c1c8850f50808aab44892221d834f49 return nil; } diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm -index 350a17a75fed37eb887560956a6e5378a1b46759..e298becdb574fd254c131068ace58c0d1be49043 100644 +index e44929e37ddf2ddd2473e2cc92e94706aa43cdb4..43eb2a27486d12c7f9ce95b95e6dc418817bd097 100644 --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm -@@ -485,6 +485,7 @@ void PostAnnouncementNotification(NSString* announcement) { +@@ -488,6 +488,7 @@ void PostAnnouncementNotification(NSString* announcement) { [user_info setObject:native_focus_object forKey:NSAccessibilityTextChangeElement]; @@ -192,7 +192,7 @@ index 350a17a75fed37eb887560956a6e5378a1b46759..e298becdb574fd254c131068ace58c0d id selected_text = [native_focus_object selectedTextMarkerRange]; if (selected_text) { NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute = -@@ -492,6 +493,7 @@ void PostAnnouncementNotification(NSString* announcement) { +@@ -495,6 +496,7 @@ void PostAnnouncementNotification(NSString* announcement) { [user_info setObject:selected_text forKey:NSAccessibilitySelectedTextMarkerRangeAttribute]; } @@ -233,7 +233,7 @@ index e59ac93d0e1554a2df5d8c74db2beba25d090228..6657c48664bdec4964b382f80309d1bf } // namespace diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm -index fe0b73b51492ca08cbebf3aec74ea0a7caf44aef..fb8b362097f18d947219af36f84b9bea7d4eccf1 100644 +index 6151c7b0ce1325402668a17d35be72fd953fcd2d..1836a0fac0cc3561151067d3482a58dc20b07559 100644 --- a/device/bluetooth/bluetooth_adapter_mac.mm +++ b/device/bluetooth/bluetooth_adapter_mac.mm @@ -36,6 +36,7 @@ @@ -252,7 +252,7 @@ index fe0b73b51492ca08cbebf3aec74ea0a7caf44aef..fb8b362097f18d947219af36f84b9bea namespace { -@@ -128,8 +130,10 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) { +@@ -122,8 +124,10 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) { controller_state_function_( base::BindRepeating(&BluetoothAdapterMac::GetHostControllerState, base::Unretained(this))), @@ -263,7 +263,7 @@ index fe0b73b51492ca08cbebf3aec74ea0a7caf44aef..fb8b362097f18d947219af36f84b9bea should_update_name_(true), classic_discovery_manager_( BluetoothDiscoveryManagerMac::CreateClassic(this)), -@@ -327,8 +331,12 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) { +@@ -321,8 +325,12 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) { } bool BluetoothAdapterMac::SetPoweredImpl(bool powered) { @@ -294,7 +294,7 @@ index cb7a5305c2d6cbe7b3aa13efdfe6dcc6dfd857e9..e3f3ee7fee0a8f9cf7b3c1b6bed7c2a6 "AudioToolbox.framework", "AudioUnit.framework", diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc -index 11cc3843f58174b8f234517359bab3c973ccf622..078e97d62f269777ec6b065de064de6dd081860b 100644 +index a9d6babb03ca318ccd15b254d3785a9ad45698c0..34ba3bfb738226ed8b53a9c24d15af5a5176642f 100644 --- a/media/audio/mac/audio_manager_mac.cc +++ b/media/audio/mac/audio_manager_mac.cc @@ -882,7 +882,7 @@ AudioParameters AudioManagerMac::GetPreferredOutputStreamParameters( diff --git a/patches/common/chromium/no_cache_storage_check.patch b/patches/common/chromium/no_cache_storage_check.patch index c8ea50e99f2..39e68314b36 100644 --- a/patches/common/chromium/no_cache_storage_check.patch +++ b/patches/common/chromium/no_cache_storage_check.patch @@ -7,10 +7,10 @@ Do not check for unique origin in CacheStorage, in Electron we may have scripts running without an origin. diff --git a/content/browser/cache_storage/legacy/legacy_cache_storage.cc b/content/browser/cache_storage/legacy/legacy_cache_storage.cc -index 73d521edb2c85ad4fac6b6d691e77af1ff91caee..8c4a96de9c23ff48d11c67170c54418c9b0f2998 100644 +index 6250b9e0300745e632b3208223d00a8b97bd09f9..4663bfba7017241dde7c286541fcb33bd98f4fbe 100644 --- a/content/browser/cache_storage/legacy/legacy_cache_storage.cc +++ b/content/browser/cache_storage/legacy/legacy_cache_storage.cc -@@ -104,7 +104,7 @@ class LegacyCacheStorage::CacheLoader { +@@ -106,7 +106,7 @@ class LegacyCacheStorage::CacheLoader { cache_storage_(cache_storage), origin_(origin), owner_(owner) { diff --git a/patches/common/chromium/notification_provenance.patch b/patches/common/chromium/notification_provenance.patch index 34b6316940e..ecf1c4f2fed 100644 --- a/patches/common/chromium/notification_provenance.patch +++ b/patches/common/chromium/notification_provenance.patch @@ -109,10 +109,10 @@ index de7f9d4c1b670b6955ec62e562b133a86b770652..a7daada96b6ebed404d6fa3eef1048ab // Removes |service| from the list of owned services, for example because the diff --git a/content/browser/renderer_interface_binders.cc b/content/browser/renderer_interface_binders.cc -index d689e264d2b547c155c6e722bd6f6b81cefde3a2..1faf3d47b0207108183c1529928926e762143122 100644 +index 8a1d31e704be6fdf97c4cd20bd91ad36c6a6f1bd..e9244a5749d09e727df166004eba6fd9e5ff9d69 100644 --- a/content/browser/renderer_interface_binders.cc +++ b/content/browser/renderer_interface_binders.cc -@@ -196,7 +196,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() { +@@ -227,7 +227,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() { RenderProcessHost* host, const url::Origin& origin) { static_cast(host->GetStoragePartition()) ->GetPlatformNotificationContext() diff --git a/patches/common/chromium/out_of_process_instance.patch b/patches/common/chromium/out_of_process_instance.patch index ac7ee002c78..806987076bf 100644 --- a/patches/common/chromium/out_of_process_instance.patch +++ b/patches/common/chromium/out_of_process_instance.patch @@ -5,10 +5,10 @@ Subject: out_of_process_instance.patch diff --git a/pdf/out_of_process_instance.cc b/pdf/out_of_process_instance.cc -index 8c9d51010963cd01de1d42eeb790fad875046afb..821cbb5cda400ab545e545cc33d08112828a73bc 100644 +index a33c3391d05bd7cc2346906961baab39d088ca6e..1b8f587dda2f77374b4b01df22a11a03692a3afd 100644 --- a/pdf/out_of_process_instance.cc +++ b/pdf/out_of_process_instance.cc -@@ -471,7 +471,9 @@ bool OutOfProcessInstance::Init(uint32_t argc, +@@ -472,7 +472,9 @@ bool OutOfProcessInstance::Init(uint32_t argc, std::string document_url = document_url_var.AsString(); base::StringPiece document_url_piece(document_url); is_print_preview_ = IsPrintPreviewUrl(document_url_piece); diff --git a/patches/common/chromium/render_widget_host_view_base.patch b/patches/common/chromium/render_widget_host_view_base.patch index 114ddc448e0..b0dc000f3f9 100644 --- a/patches/common/chromium/render_widget_host_view_base.patch +++ b/patches/common/chromium/render_widget_host_view_base.patch @@ -5,10 +5,10 @@ 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 6986a9b55908f989275115ba8bd290f9e1d40ace..90c51ca81795547f7ec116e6c57af7043c162599 100644 +index 90a2587a6e746e3f46558c3295ec17fb27e615a0..4849045b97474584740154890c3d80da4b0d03ad 100644 --- a/content/browser/renderer_host/render_widget_host_view_base.cc +++ b/content/browser/renderer_host/render_widget_host_view_base.cc -@@ -666,6 +666,15 @@ viz::FrameSinkId RenderWidgetHostViewBase::FrameSinkIdAtPoint( +@@ -660,6 +660,15 @@ viz::FrameSinkId RenderWidgetHostViewBase::FrameSinkIdAtPoint( return frame_sink_id.is_valid() ? frame_sink_id : GetFrameSinkId(); } @@ -25,7 +25,7 @@ index 6986a9b55908f989275115ba8bd290f9e1d40ace..90c51ca81795547f7ec116e6c57af704 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 e8dadd66ca8b81638c198d6ce5490b43384116a9..82534c4d1cc44b0192fd0e9a5e082d7d01dfab41 100644 +index bb55eccad3edce7556e3f50b4a8be1db2fe823c8..ad1594af775cbcc0fe543eb3bac8c134d733bae5 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 @@ @@ -39,7 +39,7 @@ index e8dadd66ca8b81638c198d6ce5490b43384116a9..82534c4d1cc44b0192fd0e9a5e082d7d #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" -@@ -83,10 +85,12 @@ class CursorManager; +@@ -73,10 +75,12 @@ class CursorManager; class MouseWheelPhaseHandler; class RenderWidgetHostImpl; class RenderWidgetHostViewBaseObserver; @@ -52,7 +52,7 @@ index e8dadd66ca8b81638c198d6ce5490b43384116a9..82534c4d1cc44b0192fd0e9a5e082d7d class WebCursor; class DelegatedFrameHost; struct TextInputState; -@@ -142,6 +146,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase +@@ -132,6 +136,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase GetTouchSelectionControllerClientManager() override; void SetLastTabChangeStartTime(base::TimeTicks start_time) final; @@ -62,7 +62,7 @@ index e8dadd66ca8b81638c198d6ce5490b43384116a9..82534c4d1cc44b0192fd0e9a5e082d7d // This only needs to be overridden by RenderWidgetHostViewBase subclasses // that handle content embedded within other RenderWidgetHostViews. gfx::PointF TransformPointToRootCoordSpaceF( -@@ -368,6 +375,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase +@@ -358,6 +365,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 5b187013f90..ecb12b385d1 100644 --- a/patches/common/chromium/render_widget_host_view_mac.patch +++ b/patches/common/chromium/render_widget_host_view_mac.patch @@ -4,10 +4,10 @@ Date: Thu, 20 Sep 2018 17:46:28 -0700 Subject: render_widget_host_view_mac.patch -diff --git a/content/browser/renderer_host/render_widget_host_view_cocoa.mm b/content/browser/renderer_host/render_widget_host_view_cocoa.mm -index 5f6728312a5676285eebcb120a59b2e76a11d8bc..b7a1a16c1b282f7739638d8375117192da77b5e7 100644 ---- a/content/browser/renderer_host/render_widget_host_view_cocoa.mm -+++ b/content/browser/renderer_host/render_widget_host_view_cocoa.mm +diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm +index 41285370f97be53ec93249c4eb0caf8c77a595b9..3c7eee8a565444f0c66be88885f8826a56acfd18 100644 +--- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm ++++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm @@ -142,6 +142,11 @@ void ExtractUnderlines(NSAttributedString* string, } // namespace @@ -30,7 +30,7 @@ index 5f6728312a5676285eebcb120a59b2e76a11d8bc..b7a1a16c1b282f7739638d8375117192 return [self acceptsMouseEventsWhenInactive]; } -@@ -793,6 +801,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv { +@@ -792,6 +800,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv { eventType == NSKeyDown && !(modifierFlags & NSCommandKeyMask); @@ -41,7 +41,7 @@ index 5f6728312a5676285eebcb120a59b2e76a11d8bc..b7a1a16c1b282f7739638d8375117192 // We only handle key down events and just simply forward other events. if (eventType != NSKeyDown) { clientHelper_->ForwardKeyboardEvent(event, latency_info); -@@ -1547,9 +1559,11 @@ - (id)accessibilityFocusedUIElement { +@@ -1505,9 +1517,11 @@ - (NSAccessibilityRole)accessibilityRole { // Since this implementation doesn't have to wait any IPC calls, this doesn't // make any key-typing jank. --hbono 7/23/09 // @@ -53,7 +53,7 @@ index 5f6728312a5676285eebcb120a59b2e76a11d8bc..b7a1a16c1b282f7739638d8375117192 - (NSArray*)validAttributesForMarkedText { // This code is just copied from WebKit except renaming variables. -@@ -1558,7 +1572,10 @@ - (NSArray*)validAttributesForMarkedText { +@@ -1516,7 +1530,10 @@ - (NSArray*)validAttributesForMarkedText { initWithObjects:NSUnderlineStyleAttributeName, NSUnderlineColorAttributeName, NSMarkedClauseSegmentAttributeName, @@ -66,7 +66,7 @@ index 5f6728312a5676285eebcb120a59b2e76a11d8bc..b7a1a16c1b282f7739638d8375117192 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 2f23c1b11c41fc368ce5f05c6b8bf2c8e66849c2..7ab6f530193a7e19da6222c9b396733327ec6006 100644 +index 01341832627f168b9eb2deba471cf51e8e020d7c..89c2b5b06f3ffbd8fde2093853baf0733693ce46 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 @@ diff --git a/patches/common/chromium/resource_file_conflict.patch b/patches/common/chromium/resource_file_conflict.patch index d9d845503d4..2b8dcc89f3d 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 b51701cb23a746fa8c85dd308db40599ebb513c4..d40202886f0bafce384a13306de531845758eb1c 100644 +index 7878cd09863788f7c35e62a49f50a99a1fcf46d5..cabf18983e659e1608dd02109599b444990975a1 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -1646,7 +1646,7 @@ if (is_chrome_branded && !is_android) { +@@ -1719,7 +1719,7 @@ if (is_chrome_branded && !is_android) { } } @@ -64,7 +64,7 @@ index b51701cb23a746fa8c85dd308db40599ebb513c4..d40202886f0bafce384a13306de53184 chrome_paks("packed_resources") { if (is_mac) { output_dir = "$root_gen_dir/repack" -@@ -1670,6 +1670,12 @@ if (!is_android) { +@@ -1743,6 +1743,12 @@ if (!is_android) { } } diff --git a/patches/common/chromium/revert_build_swiftshader_for_arm32.patch b/patches/common/chromium/revert_build_swiftshader_for_arm32.patch index 89466538222..976d947ddd9 100644 --- a/patches/common/chromium/revert_build_swiftshader_for_arm32.patch +++ b/patches/common/chromium/revert_build_swiftshader_for_arm32.patch @@ -6,7 +6,7 @@ Subject: Revert "Build swiftshader for ARM32." This reverts commit e7caa7ca82fc015675aea8cecf178c83a94ab3a7. diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn -index 003730ab8f993637005c4152b5a3bd3660f88a95..b003bf86bb02fce349508a1ef20d5fe003e94c05 100644 +index 70246bcc843422f4ad3e63ce4905b639384e5798..7ca67cb078928025b654e4c36baf6ffd78594a1e 100644 --- a/ui/gl/BUILD.gn +++ b/ui/gl/BUILD.gn @@ -15,8 +15,8 @@ declare_args() { diff --git a/patches/common/chromium/revert_roll_clang_356356_357569.patch b/patches/common/chromium/revert_roll_clang_356356_357569.patch deleted file mode 100644 index 7269cd75758..00000000000 --- a/patches/common/chromium/revert_roll_clang_356356_357569.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jeremy Apthorp -Date: Thu, 18 Apr 2019 11:07:51 -0700 -Subject: Revert "Roll clang 356356:357569." - -This reverts commit a50f2f33843d26fd7c0d1f1a2331aa45a392c6cd. - -This roll broke ARM builds. Tracking bug: crbug.com/953815 - -diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py -index ab0311650bffadf8d3cfe03f8a55cea319e15550..b9faaefcd3c5f978af9d72f08f1ba230d5a27b24 100755 ---- a/tools/clang/scripts/update.py -+++ b/tools/clang/scripts/update.py -@@ -35,10 +35,10 @@ import zipfile - # Do NOT CHANGE this if you don't know what you're doing -- see - # https://chromium.googlesource.com/chromium/src/+/master/docs/updating_clang.md - # Reverting problematic clang rolls is safe, though. --CLANG_REVISION = '357692' -+CLANG_REVISION = '356356' - - # This is incremented when pushing a new build of Clang at the same revision. --CLANG_SUB_REVISION=1 -+CLANG_SUB_REVISION=3 - - PACKAGE_VERSION = "%s-%s" % (CLANG_REVISION, CLANG_SUB_REVISION) - diff --git a/patches/common/chromium/scroll_bounce_flag.patch b/patches/common/chromium/scroll_bounce_flag.patch index e93e4c589e9..605e222da5e 100644 --- a/patches/common/chromium/scroll_bounce_flag.patch +++ b/patches/common/chromium/scroll_bounce_flag.patch @@ -6,10 +6,10 @@ 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 d4c55a577bde40d8d28641a7aa42a5218540cb32..6dcd14f54ba4f0778fbcf1e82689755033feb1ca 100644 +index aea4d162b62a3b7c936889f1131e9e124630d4d8..9adecd86c760abf8b7d65afffa99acd90e91117a 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -1534,7 +1534,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() { +@@ -1513,7 +1513,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() { } bool RenderThreadImpl::IsElasticOverscrollEnabled() { diff --git a/patches/common/chromium/ssl_security_state_tab_helper.patch b/patches/common/chromium/ssl_security_state_tab_helper.patch index 3bd0b96ceef..8a2eaf71ff6 100644 --- a/patches/common/chromium/ssl_security_state_tab_helper.patch +++ b/patches/common/chromium/ssl_security_state_tab_helper.patch @@ -6,10 +6,10 @@ Subject: ssl_security_state_tab_helper.patch Allows populating security tab info for devtools in Electron. diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ssl/security_state_tab_helper.cc -index aef4333e3d769d26b71822294d5f2fcedf3141c5..fe3d44e33213daa89f6ea5f4f84103686db6aece 100644 +index 6ef33c5357cf08c1f17e9f20bd8d659bf4807d1c..a7062ccbb1c11c092e114fe498370f500c44c96b 100644 --- a/chrome/browser/ssl/security_state_tab_helper.cc +++ b/chrome/browser/ssl/security_state_tab_helper.cc -@@ -12,10 +12,12 @@ +@@ -13,10 +13,12 @@ #include "base/strings/pattern.h" #include "base/strings/string_util.h" #include "build/build_config.h" @@ -19,10 +19,10 @@ index aef4333e3d769d26b71822294d5f2fcedf3141c5..fe3d44e33213daa89f6ea5f4f8410368 #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/safe_browsing/ui_manager.h" +#endif - #include "chrome/common/chrome_switches.h" - #include "chrome/common/pref_names.h" #include "chrome/common/secure_origin_whitelist.h" -@@ -45,8 +47,10 @@ + #include "components/omnibox/browser/omnibox_field_trial.h" + #include "components/omnibox/common/omnibox_features.h" +@@ -42,8 +44,10 @@ #endif // defined(OS_CHROMEOS) #if defined(FULL_SAFE_BROWSING) @@ -33,7 +33,7 @@ index aef4333e3d769d26b71822294d5f2fcedf3141c5..fe3d44e33213daa89f6ea5f4f8410368 namespace { -@@ -82,7 +86,9 @@ bool IsOriginSecureWithWhitelist( +@@ -63,7 +67,9 @@ void RecordSecurityLevel( } // namespace @@ -43,7 +43,7 @@ index aef4333e3d769d26b71822294d5f2fcedf3141c5..fe3d44e33213daa89f6ea5f4f8410368 SecurityStateTabHelper::SecurityStateTabHelper( content::WebContents* web_contents) -@@ -149,6 +155,7 @@ void SecurityStateTabHelper::DidFinishNavigation( +@@ -129,6 +135,7 @@ void SecurityStateTabHelper::DidFinishNavigation( UMA_HISTOGRAM_BOOLEAN("interstitial.ssl.visited_site_after_warning", true); } @@ -51,7 +51,7 @@ index aef4333e3d769d26b71822294d5f2fcedf3141c5..fe3d44e33213daa89f6ea5f4f8410368 // Security indicator UI study (https://crbug.com/803501): Show a message in // the console to reduce developer confusion about the experimental UI // treatments for HTTPS pages with EV certificates. -@@ -176,6 +183,7 @@ void SecurityStateTabHelper::DidFinishNavigation( +@@ -156,6 +163,7 @@ void SecurityStateTabHelper::DidFinishNavigation( "Validation is still valid."); } } @@ -59,7 +59,7 @@ index aef4333e3d769d26b71822294d5f2fcedf3141c5..fe3d44e33213daa89f6ea5f4f8410368 } void SecurityStateTabHelper::DidChangeVisibleSecurityState() { -@@ -199,6 +207,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const { +@@ -179,6 +187,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const { web_contents()->GetController().GetVisibleEntry(); if (!entry) return security_state::MALICIOUS_CONTENT_STATUS_NONE; @@ -67,7 +67,7 @@ index aef4333e3d769d26b71822294d5f2fcedf3141c5..fe3d44e33213daa89f6ea5f4f8410368 safe_browsing::SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service(); if (!sb_service) -@@ -266,6 +275,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const { +@@ -246,6 +255,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const { break; } } @@ -75,24 +75,3 @@ index aef4333e3d769d26b71822294d5f2fcedf3141c5..fe3d44e33213daa89f6ea5f4f8410368 return security_state::MALICIOUS_CONTENT_STATUS_NONE; } -@@ -273,16 +283,20 @@ std::vector SecurityStateTabHelper::GetSecureOriginsAndPatterns() - const { - const base::CommandLine& command_line = - *base::CommandLine::ForCurrentProcess(); -+#if 0 - Profile* profile = - Profile::FromBrowserContext(web_contents()->GetBrowserContext()); - PrefService* prefs = profile->GetPrefs(); -+#endif - std::string origins_str = ""; - if (command_line.HasSwitch( - network::switches::kUnsafelyTreatInsecureOriginAsSecure)) { - origins_str = command_line.GetSwitchValueASCII( - network::switches::kUnsafelyTreatInsecureOriginAsSecure); -+#if 0 - } else if (prefs->HasPrefPath(prefs::kUnsafelyTreatInsecureOriginAsSecure)) { - origins_str = prefs->GetString(prefs::kUnsafelyTreatInsecureOriginAsSecure); -+#endif - } - return network::ParseSecureOriginAllowlist(origins_str); - } diff --git a/patches/common/chromium/support_mixed_sandbox_with_zygote.patch b/patches/common/chromium/support_mixed_sandbox_with_zygote.patch index 0c4515b9b10..97ee84b6726 100644 --- a/patches/common/chromium/support_mixed_sandbox_with_zygote.patch +++ b/patches/common/chromium/support_mixed_sandbox_with_zygote.patch @@ -22,10 +22,10 @@ However, the patch would need to be reviewed by the security team, as it does touch a security-sensitive class. diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc -index dd8bdad9432ef754b5f3bbfd97d94af9092714ae..50f63a2c8f8ec447545d2b2c80afef34ad4a7fef 100644 +index 0e9f6e57eac4c1fd1eaf8dd1c86ac1153d1a44b4..dffe06fa5262a0b6aebe064f8813b149439cb613 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -420,6 +420,10 @@ class RendererSandboxedProcessLauncherDelegate +@@ -418,6 +418,10 @@ class RendererSandboxedProcessLauncherDelegate : public SandboxedProcessLauncherDelegate { public: RendererSandboxedProcessLauncherDelegate() {} @@ -36,7 +36,7 @@ index dd8bdad9432ef754b5f3bbfd97d94af9092714ae..50f63a2c8f8ec447545d2b2c80afef34 ~RendererSandboxedProcessLauncherDelegate() override {} -@@ -439,6 +443,9 @@ class RendererSandboxedProcessLauncherDelegate +@@ -437,6 +441,9 @@ class RendererSandboxedProcessLauncherDelegate #if BUILDFLAG(USE_ZYGOTE_HANDLE) service_manager::ZygoteHandle GetZygote() override { @@ -46,7 +46,7 @@ index dd8bdad9432ef754b5f3bbfd97d94af9092714ae..50f63a2c8f8ec447545d2b2c80afef34 const base::CommandLine& browser_command_line = *base::CommandLine::ForCurrentProcess(); base::CommandLine::StringType renderer_prefix = -@@ -452,6 +459,11 @@ class RendererSandboxedProcessLauncherDelegate +@@ -450,6 +457,11 @@ class RendererSandboxedProcessLauncherDelegate service_manager::SandboxType GetSandboxType() override { return service_manager::SANDBOX_TYPE_RENDERER; } @@ -58,7 +58,7 @@ index dd8bdad9432ef754b5f3bbfd97d94af9092714ae..50f63a2c8f8ec447545d2b2c80afef34 }; const char kSessionStorageHolderKey[] = "kSessionStorageHolderKey"; -@@ -1734,11 +1746,18 @@ bool RenderProcessHostImpl::Init() { +@@ -1730,11 +1742,18 @@ bool RenderProcessHostImpl::Init() { cmd_line->PrependWrapper(renderer_prefix); AppendRendererCommandLine(cmd_line.get()); diff --git a/patches/common/chromium/sysroot.patch b/patches/common/chromium/sysroot.patch index 3b5d88a225e..fe7e303e34b 100644 --- a/patches/common/chromium/sysroot.patch +++ b/patches/common/chromium/sysroot.patch @@ -7,10 +7,10 @@ Make chrome's install-sysroot scripts point to our custom sysroot builds, which include extra deps that Electron needs (e.g. libnotify) diff --git a/build/linux/sysroot_scripts/install-sysroot.py b/build/linux/sysroot_scripts/install-sysroot.py -index 115dce4e23ae2a8dd771b73ddbcd1a5b12bcbf9b..12f944a95ad49842d2a53cdbe8eb157e7605b621 100755 +index 858589ae0a6774d6c34a51e1db1ef852f40ad68d..c4a0ac5c9e16a217634602233bd709af6943470e 100755 --- a/build/linux/sysroot_scripts/install-sysroot.py +++ b/build/linux/sysroot_scripts/install-sysroot.py -@@ -30,9 +30,11 @@ import sys +@@ -32,9 +32,11 @@ import sys import urllib2 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) @@ -24,7 +24,7 @@ index 115dce4e23ae2a8dd771b73ddbcd1a5b12bcbf9b..12f944a95ad49842d2a53cdbe8eb157e VALID_ARCHS = ('arm', 'arm64', 'i386', 'amd64', 'mips', 'mips64el') -@@ -96,7 +98,7 @@ def GetSysrootDict(target_platform, target_arch): +@@ -98,7 +100,7 @@ def GetSysrootDict(target_platform, target_arch): if target_arch not in VALID_ARCHS: raise Error('Unknown architecture: %s' % target_arch) diff --git a/patches/common/chromium/verbose_generate_breakpad_symbols.patch b/patches/common/chromium/verbose_generate_breakpad_symbols.patch index f83dee8d0d7..b090baa3cd8 100644 --- a/patches/common/chromium/verbose_generate_breakpad_symbols.patch +++ b/patches/common/chromium/verbose_generate_breakpad_symbols.patch @@ -7,7 +7,7 @@ Temporarily add additional debugging statements to generate_breakpad_symbols.py to determine why it is hanging. diff --git a/components/crash/content/tools/generate_breakpad_symbols.py b/components/crash/content/tools/generate_breakpad_symbols.py -index 58558b6cd1e3af826a7066c035e1ad589eff4cb5..d9f697749847caf59d78f5643d2efaf7815e050d 100755 +index dce68b1bd1ef58a5dfddb2bbdb56930ed943ad1d..4249d7b26f9037b60a40e073f56037f9ff036138 100755 --- a/components/crash/content/tools/generate_breakpad_symbols.py +++ b/components/crash/content/tools/generate_breakpad_symbols.py @@ -60,7 +60,10 @@ def Resolve(path, exe_path, loader_path, rpaths): @@ -22,7 +22,7 @@ index 58558b6cd1e3af826a7066c035e1ad589eff4cb5..d9f697749847caf59d78f5643d2efaf7 """Return absolute paths to all shared library dependencies of the binary. This implementation assumes that we're running on a Linux system.""" -@@ -74,6 +77,9 @@ def GetSharedLibraryDependenciesLinux(binary): +@@ -71,6 +74,9 @@ def GetSharedLibraryDependenciesLinux(binary): m = lib_re.match(line) if m: result.append(os.path.abspath(m.group(1))) @@ -32,16 +32,16 @@ index 58558b6cd1e3af826a7066c035e1ad589eff4cb5..d9f697749847caf59d78f5643d2efaf7 return result -@@ -168,7 +174,7 @@ def GetSharedLibraryDependencies(options, binary, exe_path): +@@ -183,7 +189,7 @@ def GetSharedLibraryDependencies(options, binary, exe_path): """Return absolute paths to all shared library dependencies of the binary.""" deps = [] - if sys.platform.startswith('linux'): + if options.platform == 'linux2': - deps = GetSharedLibraryDependenciesLinux(binary) + deps = GetSharedLibraryDependenciesLinux(binary, options) - elif sys.platform == 'darwin': - deps = GetSharedLibraryDependenciesMac(binary, exe_path) - else: -@@ -228,7 +234,8 @@ def GetBinaryInfoFromHeaderInfo(header_info): + elif options.platform == 'android': + deps = GetSharedLibraryDependenciesAndroid(binary) + elif options.platform == 'darwin': +@@ -257,7 +263,8 @@ def CreateSymbolDir(options, output_dir): def GenerateSymbols(options, binaries): """Dumps the symbols of binary and places them in the given directory.""" @@ -51,7 +51,7 @@ index 58558b6cd1e3af826a7066c035e1ad589eff4cb5..d9f697749847caf59d78f5643d2efaf7 queue = Queue.Queue() print_lock = threading.Lock() -@@ -248,8 +255,15 @@ def GenerateSymbols(options, binaries): +@@ -277,8 +284,15 @@ def GenerateSymbols(options, binaries): reason = "Could not locate dump_syms executable." break @@ -67,7 +67,7 @@ index 58558b6cd1e3af826a7066c035e1ad589eff4cb5..d9f697749847caf59d78f5643d2efaf7 if not binary_info: should_dump_syms = False reason = "Could not obtain binary information." -@@ -266,8 +280,14 @@ def GenerateSymbols(options, binaries): +@@ -296,8 +310,14 @@ def GenerateSymbols(options, binaries): # See if there is a symbol file already found next to the binary potential_symbol_files = glob.glob('%s.breakpad*' % binary) for potential_symbol_file in potential_symbol_files: @@ -80,5 +80,5 @@ index 58558b6cd1e3af826a7066c035e1ad589eff4cb5..d9f697749847caf59d78f5643d2efaf7 + with print_lock: + print "Got symbol_info for %s." % (potential_symbol_file) if symbol_info == binary_info: - mkdir_p(os.path.dirname(output_path)) + CreateSymbolDir(options, output_dir) shutil.copyfile(potential_symbol_file, output_path) diff --git a/patches/common/chromium/web_contents.patch b/patches/common/chromium/web_contents.patch index 462cc71bae0..90aecefe03d 100644 --- a/patches/common/chromium/web_contents.patch +++ b/patches/common/chromium/web_contents.patch @@ -5,7 +5,7 @@ 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 1729f407f21be18891393f08e763ab18eceb1c1a..fab77addce46c326aa1e493808a0f4b61ecadd0e 100644 +index aa8c31fe87a08fe3926d0b3ccb5a37d89276506d..65b7eab5b82f96a0572f3a6138f8d2eb76ea227d 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) { @@ -30,10 +30,10 @@ index 1729f407f21be18891393f08e763ab18eceb1c1a..fab77addce46c326aa1e493808a0f4b6 CHECK(view_.get()); diff --git a/content/browser/web_contents/web_contents_view_guest.cc b/content/browser/web_contents/web_contents_view_guest.cc -index 9d91d225fd9f3eeef7d9beec126e6cc6a58a76d7..8a443514dfbdab37f951bc7c54cf1989a2b01a16 100644 +index ecaf30bcb7b916a92a69641dd7b96a3633d407c0..0af625928ca6227a21cd4263a14a42b72095399c 100644 --- a/content/browser/web_contents/web_contents_view_guest.cc +++ b/content/browser/web_contents/web_contents_view_guest.cc -@@ -69,19 +69,26 @@ gfx::NativeWindow WebContentsViewGuest::GetTopLevelNativeWindow() const { +@@ -68,19 +68,27 @@ gfx::NativeWindow WebContentsViewGuest::GetTopLevelNativeWindow() const { void WebContentsViewGuest::OnGuestAttached(WebContentsView* parent_view) { #if defined(USE_AURA) @@ -44,25 +44,27 @@ index 9d91d225fd9f3eeef7d9beec126e6cc6a58a76d7..8a443514dfbdab37f951bc7c54cf1989 // view hierarchy. We add this view as embedder's child here. // This would go in WebContentsViewGuest::CreateView, but that is too early to // access embedder_web_contents(). Therefore, we do it here. -- if (!features::IsMultiProcessMash()) -+ if (!features::IsMultiProcessMash() && -+ parent_view->GetNativeView() != platform_view_->GetNativeView()) { - parent_view->GetNativeView()->AddChild(platform_view_->GetNativeView()); +- parent_view->GetNativeView()->AddChild(platform_view_->GetNativeView()); ++ if (parent_view->GetNativeView() != platform_view_->GetNativeView()) { ++ parent_view->GetNativeView()->AddChild(platform_view_->GetNativeView()); + } #endif // defined(USE_AURA) } void WebContentsViewGuest::OnGuestDetached(WebContentsView* old_parent_view) { #if defined(USE_AURA) -- if (!features::IsMultiProcessMash()) { +- old_parent_view->GetNativeView()->RemoveChild( +- platform_view_->GetNativeView()); + if (!platform_view_->GetNativeView()) + return; -+ if (!features::IsMultiProcessMash() && -+ old_parent_view->GetNativeView() != platform_view_->GetNativeView()) { - old_parent_view->GetNativeView()->RemoveChild( - platform_view_->GetNativeView()); - } -@@ -136,11 +143,22 @@ RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForWidget( ++ if (old_parent_view->GetNativeView() != platform_view_->GetNativeView()) { ++ old_parent_view->GetNativeView()->RemoveChild( ++ platform_view_->GetNativeView()); ++ } + #endif // defined(USE_AURA) + } + +@@ -132,11 +140,22 @@ RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForWidget( render_widget_host->GetView()); } diff --git a/patches/common/chromium/webview_cross_drag.patch b/patches/common/chromium/webview_cross_drag.patch index 216a0114f58..05d0754dc12 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 2ff912c1b4fbf02a5c00dfd0206f21f9a3608160..a81fce5c072b91f2dda2fea0f87110d1499603a1 100644 +index 6565781a84d50e1dfdea4086588e8dcf11579d32..1ec9d900346f506a3fd9b1bfcb7de3f38048842a 100644 --- a/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc -@@ -754,6 +754,7 @@ gfx::NativeView WebContentsViewAura::GetRenderWidgetHostViewParent() const { +@@ -742,6 +742,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 3d5100aad66..70a27b72267 100644 --- a/patches/common/chromium/worker_context_will_destroy.patch +++ b/patches/common/chromium/worker_context_will_destroy.patch @@ -5,10 +5,10 @@ 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 fad5f104f0113813133c69fe8a4392d73f153ba5..01c826ef12b4e04033377d4e5e50fcb871ca1e1d 100644 +index 9e405a1f92c8218387ca270c8d2ccdb7030d3ad6..bb625490e2dd86c72e903a5d713881fdf8185cff 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h -@@ -383,6 +383,11 @@ class CONTENT_EXPORT ContentRendererClient { +@@ -384,6 +384,11 @@ class CONTENT_EXPORT ContentRendererClient { virtual void DidInitializeWorkerContextOnWorkerThread( v8::Local context) {} @@ -21,10 +21,10 @@ index fad5f104f0113813133c69fe8a4392d73f153ba5..01c826ef12b4e04033377d4e5e50fcb8 // 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 812c9b48c817cf01837e6513336c9dc76f1fda60..440339726d0bd5359f98dda971dbc4fd806c4094 100644 +index 01b7e68dba2ccfedf0491cd0387e3e0729473c2a..1364adb8e06da07812137ff19e550b4ff3a345e9 100644 --- a/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc -@@ -1086,6 +1086,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { +@@ -1072,6 +1072,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread(); } @@ -38,10 +38,10 @@ index 812c9b48c817cf01837e6513336c9dc76f1fda60..440339726d0bd5359f98dda971dbc4fd 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 752d0929185111f4b8ad8bdb0ba5d54e4c9de294..924d3182acccf3e2f8030a3f7a7b1f62f5f29fc3 100644 +index 91345bba1ecd1a28e2588fa2f93b6226b3904467..5fb3283310675d15a5ed387fb33b1bc01b8ceff0 100644 --- a/content/renderer/renderer_blink_platform_impl.h +++ b/content/renderer/renderer_blink_platform_impl.h -@@ -212,6 +212,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { +@@ -205,6 +205,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 752d0929185111f4b8ad8bdb0ba5d54e4c9de294..924d3182acccf3e2f8030a3f7a7b1f62 void RecordMetricsForBackgroundedRendererPurge() override; diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h -index 89475620b73b66b336842cee144cee53242a1403..b0e110e04329b0e55b42e9f57aa0d28499049222 100644 +index cf06aa2c9beda4a2b6c7f484da971b1b5de2b79b..13b1bbe8098fdbe9096fc61e99d88b038a57df54 100644 --- a/third_party/blink/public/platform/platform.h +++ b/third_party/blink/public/platform/platform.h -@@ -676,6 +676,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -664,6 +664,7 @@ class BLINK_PLATFORM_EXPORT Platform { virtual void DidStartWorkerThread() {} virtual void WillStopWorkerThread() {} virtual void WorkerContextCreated(const v8::Local& worker) {} @@ -62,11 +62,11 @@ index 89475620b73b66b336842cee144cee53242a1403..b0e110e04329b0e55b42e9f57aa0d284 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 3b579edbe368f1974d352123729a748b7acf0583..9a0554c7cdd61ce73133a42ab10ba21e08430f07 100644 +index 4b2aacabf151c7aacf3a338cc47f1faf0c7b9391..308c10136d7ccf735b216ac5be4af846b218841a 100644 --- a/third_party/blink/renderer/core/workers/worker_thread.cc +++ b/third_party/blink/renderer/core/workers/worker_thread.cc -@@ -569,6 +569,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() { - SetExitCode(ExitCode::kGracefullyTerminated); +@@ -640,6 +640,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() { + nested_runner_->QuitNow(); } + { diff --git a/patches/common/v8/.patches b/patches/common/v8/.patches index daf9f50f896..e39b93747c1 100644 --- a/patches/common/v8/.patches +++ b/patches/common/v8/.patches @@ -3,6 +3,6 @@ build_gn.patch expose_mksnapshot.patch deps_provide_more_v8_backwards_compatibility.patch dcheck.patch -revert_cctest_add_v8_export_private_to_arm_arm64_ports.patch export_symbols_needed_for_windows_build.patch workaround_an_undefined_symbol_error.patch +revert_cctest_add_v8_export_private_to_arm_arm64_ports.patch diff --git a/patches/common/v8/add_realloc.patch b/patches/common/v8/add_realloc.patch index e073d6ef2d7..bf98e36ab03 100644 --- a/patches/common/v8/add_realloc.patch +++ b/patches/common/v8/add_realloc.patch @@ -12,10 +12,10 @@ when we override ReallocateBufferMemory, so we therefore need to implement Realloc on the v8 side. diff --git a/include/v8.h b/include/v8.h -index a3ae21f1a9fcacd1f007f9c77c9ba48c2818df05..0e21793b1214c681770b72f64b9f0d6188c6a385 100644 +index 8b23e02bf42ffdab5d8c6f36a4663ed0668531f7..742aaa1df005f28ba55b0c42a18d41e9a74a9b6a 100644 --- a/include/v8.h +++ b/include/v8.h -@@ -4647,6 +4647,13 @@ class V8_EXPORT ArrayBuffer : public Object { +@@ -4624,6 +4624,13 @@ class V8_EXPORT ArrayBuffer : public Object { */ virtual void* AllocateUninitialized(size_t length) = 0; @@ -30,7 +30,7 @@ index a3ae21f1a9fcacd1f007f9c77c9ba48c2818df05..0e21793b1214c681770b72f64b9f0d61 * 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 7c496e2e857073057cb519c4b66b867b4a16929e..c2fc1fc9827f896c521606a75baecef6c60e8f8a 100644 +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/patches/common/v8/build_gn.patch b/patches/common/v8/build_gn.patch index 2dd3168db7c..453971c1808 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 5b6ba9872f5b5b6844a6cd9094fc1d61b7089b5e..24bb79afe2458e64738ddd1b910250ede75c2a83 100644 +index 384a94766b4ca7707c991d45a3b7152910c98feb..1f16b3f1ce7a476d4a1e20b6437a305bb867b01b 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -262,7 +262,7 @@ config("internal_config") { +@@ -266,7 +266,7 @@ config("internal_config") { ":v8_header_features", ] @@ -17,7 +17,7 @@ index 5b6ba9872f5b5b6844a6cd9094fc1d61b7089b5e..24bb79afe2458e64738ddd1b910250ed defines += [ "BUILDING_V8_SHARED" ] } } -@@ -3708,7 +3708,7 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -3756,7 +3756,7 @@ if (current_toolchain == v8_generator_toolchain) { "src/interpreter/bytecodes.h", ] @@ -26,7 +26,7 @@ index 5b6ba9872f5b5b6844a6cd9094fc1d61b7089b5e..24bb79afe2458e64738ddd1b910250ed deps = [ ":v8_libbase", -@@ -3729,6 +3729,8 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) { +@@ -3777,6 +3777,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 750693d9501..830f3d995f9 100644 --- a/patches/common/v8/dcheck.patch +++ b/patches/common/v8/dcheck.patch @@ -5,10 +5,10 @@ Subject: dcheck.patch diff --git a/src/api.cc b/src/api.cc -index 679f7db6724976ae960182e838133d672c17f312..bd7cfa48aa219263551b7a9e523ae82324cac492 100644 +index c926d049ec4d04c40573b2e4d3608b59753a6050..1892ff80e75ca08f83ca26fd21126d8f6dbcc45b 100644 --- a/src/api.cc +++ b/src/api.cc -@@ -8592,7 +8592,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) { +@@ -8572,7 +8572,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) { void Isolate::RunMicrotasks() { @@ -18,10 +18,10 @@ index 679f7db6724976ae960182e838133d672c17f312..bd7cfa48aa219263551b7a9e523ae823 isolate->default_microtask_queue()->RunMicrotasks(isolate); } diff --git a/src/heap/heap.cc b/src/heap/heap.cc -index 4e1b1b8429b42f9d6b20faf60e45911656699021..c734ef5cb206a2d74c64f385ec45cb45fe38cef1 100644 +index 87ff3b12afec44cb9a7116892581edf8d1f633f9..e255691f013f80d5c2e84f43f48713353936683c 100644 --- a/src/heap/heap.cc +++ b/src/heap/heap.cc -@@ -4944,9 +4944,9 @@ void Heap::TearDown() { +@@ -4954,9 +4954,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 fff12a944d2..f00b1241297 100644 --- a/patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch +++ b/patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch @@ -22,10 +22,10 @@ Reviewed-By: Yang Guo Reviewed-By: Michaël Zasso diff --git a/include/v8.h b/include/v8.h -index 0e21793b1214c681770b72f64b9f0d6188c6a385..b5af3e191886db921ae811ef5f5db4aab39d6533 100644 +index 742aaa1df005f28ba55b0c42a18d41e9a74a9b6a..382a9eae997fbc399ee196d2fc58951a11675909 100644 --- a/include/v8.h +++ b/include/v8.h -@@ -1109,6 +1109,10 @@ class V8_EXPORT PrimitiveArray { +@@ -1108,6 +1108,10 @@ class V8_EXPORT PrimitiveArray { public: static Local New(Isolate* isolate, int length); int Length() const; @@ -36,7 +36,7 @@ index 0e21793b1214c681770b72f64b9f0d6188c6a385..b5af3e191886db921ae811ef5f5db4aa void Set(Isolate* isolate, int index, Local item); Local Get(Isolate* isolate, int index); }; -@@ -1817,6 +1821,8 @@ class V8_EXPORT StackTrace { +@@ -1816,6 +1820,8 @@ class V8_EXPORT StackTrace { /** * Returns a StackFrame at a particular index. */ @@ -45,7 +45,7 @@ index 0e21793b1214c681770b72f64b9f0d6188c6a385..b5af3e191886db921ae811ef5f5db4aa Local GetFrame(Isolate* isolate, uint32_t index) const; /** -@@ -2505,6 +2511,13 @@ class V8_EXPORT Value : public Data { +@@ -2509,6 +2515,13 @@ class V8_EXPORT Value : public Data { Local ToBoolean(Isolate* isolate) const; @@ -59,7 +59,7 @@ index 0e21793b1214c681770b72f64b9f0d6188c6a385..b5af3e191886db921ae811ef5f5db4aa /** * Attempts to convert a string to an array index. * Returns an empty handle if the conversion fails. -@@ -2521,7 +2534,14 @@ class V8_EXPORT Value : public Data { +@@ -2525,7 +2538,14 @@ class V8_EXPORT Value : public Data { Local context) const; V8_WARN_UNUSED_RESULT Maybe Int32Value(Local context) const; @@ -74,7 +74,7 @@ index 0e21793b1214c681770b72f64b9f0d6188c6a385..b5af3e191886db921ae811ef5f5db4aa V8_WARN_UNUSED_RESULT Maybe Equals(Local context, Local that) const; bool StrictEquals(Local that) const; -@@ -2628,6 +2648,8 @@ class V8_EXPORT String : public Name { +@@ -2632,6 +2652,8 @@ class V8_EXPORT String : public Name { * Returns the number of bytes in the UTF-8 encoded * representation of this string. */ @@ -83,7 +83,7 @@ index 0e21793b1214c681770b72f64b9f0d6188c6a385..b5af3e191886db921ae811ef5f5db4aa int Utf8Length(Isolate* isolate) const; /** -@@ -2684,12 +2706,23 @@ class V8_EXPORT String : public Name { +@@ -2688,12 +2710,23 @@ class V8_EXPORT String : public Name { // 16-bit character codes. int Write(Isolate* isolate, uint16_t* buffer, int start = 0, int length = -1, int options = NO_OPTIONS) const; @@ -107,7 +107,7 @@ index 0e21793b1214c681770b72f64b9f0d6188c6a385..b5af3e191886db921ae811ef5f5db4aa /** * A zero length string. -@@ -2877,6 +2910,9 @@ class V8_EXPORT String : public Name { +@@ -2861,6 +2894,9 @@ class V8_EXPORT String : public Name { */ static Local Concat(Isolate* isolate, Local left, Local right); @@ -117,7 +117,7 @@ index 0e21793b1214c681770b72f64b9f0d6188c6a385..b5af3e191886db921ae811ef5f5db4aa /** * Creates a new external string using the data defined in the given -@@ -2945,6 +2981,8 @@ class V8_EXPORT String : public Name { +@@ -2925,6 +2961,8 @@ class V8_EXPORT String : public Name { */ class V8_EXPORT Utf8Value { public: @@ -126,7 +126,7 @@ index 0e21793b1214c681770b72f64b9f0d6188c6a385..b5af3e191886db921ae811ef5f5db4aa Utf8Value(Isolate* isolate, Local obj); ~Utf8Value(); char* operator*() { return str_; } -@@ -2968,6 +3006,7 @@ class V8_EXPORT String : public Name { +@@ -2948,6 +2986,7 @@ class V8_EXPORT String : public Name { */ class V8_EXPORT Value { public: @@ -134,7 +134,7 @@ index 0e21793b1214c681770b72f64b9f0d6188c6a385..b5af3e191886db921ae811ef5f5db4aa Value(Isolate* isolate, Local obj); ~Value(); uint16_t* operator*() { return str_; } -@@ -5336,6 +5375,8 @@ class V8_EXPORT BooleanObject : public Object { +@@ -5281,6 +5320,8 @@ class V8_EXPORT BooleanObject : public Object { class V8_EXPORT StringObject : public Object { public: static Local New(Isolate* isolate, Local value); @@ -143,7 +143,7 @@ index 0e21793b1214c681770b72f64b9f0d6188c6a385..b5af3e191886db921ae811ef5f5db4aa Local ValueOf() const; -@@ -10441,6 +10482,29 @@ template Value* Value::Cast(T* value) { +@@ -10370,6 +10411,29 @@ template Value* Value::Cast(T* value) { } @@ -174,10 +174,10 @@ index 0e21793b1214c681770b72f64b9f0d6188c6a385..b5af3e191886db921ae811ef5f5db4aa #ifdef V8_ENABLE_CHECKS CheckCast(value); diff --git a/src/api.cc b/src/api.cc -index c2fc1fc9827f896c521606a75baecef6c60e8f8a..679f7db6724976ae960182e838133d672c17f312 100644 +index e1f16d9594458b5e3aec3b6929634abcce5ee59a..c926d049ec4d04c40573b2e4d3608b59753a6050 100644 --- a/src/api.cc +++ b/src/api.cc -@@ -2227,6 +2227,10 @@ int PrimitiveArray::Length() const { +@@ -2230,6 +2230,10 @@ int PrimitiveArray::Length() const { return array->length(); } @@ -188,7 +188,7 @@ index c2fc1fc9827f896c521606a75baecef6c60e8f8a..679f7db6724976ae960182e838133d67 void PrimitiveArray::Set(Isolate* v8_isolate, int index, Local item) { i::Isolate* isolate = reinterpret_cast(v8_isolate); -@@ -2240,6 +2244,10 @@ void PrimitiveArray::Set(Isolate* v8_isolate, int index, +@@ -2243,6 +2247,10 @@ void PrimitiveArray::Set(Isolate* v8_isolate, int index, array->set(index, *i_item); } @@ -199,7 +199,7 @@ index c2fc1fc9827f896c521606a75baecef6c60e8f8a..679f7db6724976ae960182e838133d67 Local PrimitiveArray::Get(Isolate* v8_isolate, int index) { i::Isolate* isolate = reinterpret_cast(v8_isolate); i::Handle array = Utils::OpenHandle(this); -@@ -2945,6 +2953,10 @@ void Message::PrintCurrentStackTrace(Isolate* isolate, FILE* out) { +@@ -2956,6 +2964,10 @@ void Message::PrintCurrentStackTrace(Isolate* isolate, FILE* out) { // --- S t a c k T r a c e --- @@ -210,7 +210,7 @@ index c2fc1fc9827f896c521606a75baecef6c60e8f8a..679f7db6724976ae960182e838133d67 Local StackTrace::GetFrame(Isolate* v8_isolate, uint32_t index) const { i::Isolate* isolate = reinterpret_cast(v8_isolate); -@@ -3570,6 +3582,34 @@ MaybeLocal Value::ToBigInt(Local context) const { +@@ -3585,6 +3597,34 @@ MaybeLocal Value::ToBigInt(Local context) const { RETURN_ESCAPED(result); } @@ -245,7 +245,7 @@ index c2fc1fc9827f896c521606a75baecef6c60e8f8a..679f7db6724976ae960182e838133d67 bool Value::BooleanValue(Isolate* v8_isolate) const { return Utils::OpenHandle(this)->BooleanValue( reinterpret_cast(v8_isolate)); -@@ -3956,6 +3996,12 @@ MaybeLocal Value::ToArrayIndex(Local context) const { +@@ -3971,6 +4011,12 @@ MaybeLocal Value::ToArrayIndex(Local context) const { } @@ -258,7 +258,7 @@ index c2fc1fc9827f896c521606a75baecef6c60e8f8a..679f7db6724976ae960182e838133d67 Maybe Value::Equals(Local context, Local that) const { i::Isolate* isolate = Utils::OpenHandle(*context)->GetIsolate(); auto self = Utils::OpenHandle(this); -@@ -5234,6 +5280,10 @@ bool String::ContainsOnlyOneByte() const { +@@ -5249,6 +5295,10 @@ bool String::ContainsOnlyOneByte() const { return helper.Check(*str); } @@ -269,7 +269,7 @@ index c2fc1fc9827f896c521606a75baecef6c60e8f8a..679f7db6724976ae960182e838133d67 int String::Utf8Length(Isolate* isolate) const { i::Handle str = Utils::OpenHandle(this); str = i::String::Flatten(reinterpret_cast(isolate), str); -@@ -5386,6 +5436,14 @@ static int WriteUtf8Impl(i::Vector string, char* write_start, +@@ -5401,6 +5451,14 @@ static int WriteUtf8Impl(i::Vector string, char* write_start, } } // anonymous namespace @@ -284,7 +284,7 @@ index c2fc1fc9827f896c521606a75baecef6c60e8f8a..679f7db6724976ae960182e838133d67 int String::WriteUtf8(Isolate* v8_isolate, char* buffer, int capacity, int* nchars_ref, int options) const { i::Handle str = Utils::OpenHandle(this); -@@ -5426,6 +5484,18 @@ static inline int WriteHelper(i::Isolate* isolate, const String* string, +@@ -5441,6 +5499,18 @@ static inline int WriteHelper(i::Isolate* isolate, const String* string, } @@ -303,7 +303,7 @@ index c2fc1fc9827f896c521606a75baecef6c60e8f8a..679f7db6724976ae960182e838133d67 int String::WriteOneByte(Isolate* isolate, uint8_t* buffer, int start, int length, int options) const { return WriteHelper(reinterpret_cast(isolate), this, buffer, -@@ -6393,6 +6463,11 @@ MaybeLocal String::NewFromTwoByte(Isolate* isolate, +@@ -6385,6 +6455,11 @@ MaybeLocal String::NewFromTwoByte(Isolate* isolate, return result; } @@ -315,7 +315,7 @@ index c2fc1fc9827f896c521606a75baecef6c60e8f8a..679f7db6724976ae960182e838133d67 Local v8::String::Concat(Isolate* v8_isolate, Local left, Local right) { i::Isolate* isolate = reinterpret_cast(v8_isolate); -@@ -6675,6 +6750,11 @@ bool v8::BooleanObject::ValueOf() const { +@@ -6660,6 +6735,11 @@ bool v8::BooleanObject::ValueOf() const { } @@ -327,7 +327,7 @@ index c2fc1fc9827f896c521606a75baecef6c60e8f8a..679f7db6724976ae960182e838133d67 Local v8::StringObject::New(Isolate* v8_isolate, Local value) { i::Handle string = Utils::OpenHandle(*value); -@@ -8957,6 +9037,9 @@ bool MicrotasksScope::IsRunningMicrotasks(Isolate* v8_isolate) { +@@ -8937,6 +9017,9 @@ bool MicrotasksScope::IsRunningMicrotasks(Isolate* v8_isolate) { return microtask_queue->IsRunningMicrotasks(); } @@ -337,7 +337,7 @@ index c2fc1fc9827f896c521606a75baecef6c60e8f8a..679f7db6724976ae960182e838133d67 String::Utf8Value::Utf8Value(v8::Isolate* isolate, v8::Local obj) : str_(nullptr), length_(0) { if (obj.IsEmpty()) return; -@@ -8976,6 +9059,9 @@ String::Utf8Value::~Utf8Value() { +@@ -8956,6 +9039,9 @@ String::Utf8Value::~Utf8Value() { i::DeleteArray(str_); } 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 5b4cc178168..8e1008583f2 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 60f6557423cf1d2e844739484883985deb9c764d..5043de65fe5224742f701b9445d232ce92d7262a 100644 +index af6f5639604cdef8ad82289d1669635143091d38..169b38745e62a652531f70d8054e26eb1a7b9d18 100644 --- a/src/objects.h +++ b/src/objects.h -@@ -816,7 +816,7 @@ enum class KeyCollectionMode { +@@ -769,7 +769,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 e10f6e0e0b4..6b440e91171 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 24bb79afe2458e64738ddd1b910250ede75c2a83..6344f50aa999f38e95d04e62c64d76420f39eb84 100644 +index 1f16b3f1ce7a476d4a1e20b6437a305bb867b01b..121170ee0eaa1482497595337481589e06e0f9a2 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -3719,8 +3719,6 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -3767,8 +3767,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 0a3263d02bb..97f38894254 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 852b983ac4a40c33d23dba77e9c2b48f653d1b4f..b78a7651d1e5c54e32e08ecb6483e7ad9a734ee7 100644 +index 07a882a2becd759fd82adc6fb452c60621b51153..7e4a61fb46ee9002d04fe9af2019d3b14c10738f 100644 --- a/src/arm/assembler-arm.h +++ b/src/arm/assembler-arm.h @@ -79,7 +79,7 @@ enum Coprocessor { @@ -18,7 +18,7 @@ index 852b983ac4a40c33d23dba77e9c2b48f653d1b4f..b78a7651d1e5c54e32e08ecb6483e7ad public: // immediate V8_INLINE explicit Operand(int32_t immediate, -@@ -182,8 +182,9 @@ class V8_EXPORT_PRIVATE Operand { +@@ -185,8 +185,9 @@ class V8_EXPORT_PRIVATE Operand { friend class Assembler; }; @@ -29,7 +29,7 @@ index 852b983ac4a40c33d23dba77e9c2b48f653d1b4f..b78a7651d1e5c54e32e08ecb6483e7ad public: // [rn +/- offset] Offset/NegOffset // [rn +/- offset]! PreIndex/NegPreIndex -@@ -239,9 +240,10 @@ class V8_EXPORT_PRIVATE MemOperand { +@@ -242,9 +243,10 @@ class V8_EXPORT_PRIVATE MemOperand { friend class Assembler; }; @@ -41,7 +41,7 @@ index 852b983ac4a40c33d23dba77e9c2b48f653d1b4f..b78a7651d1e5c54e32e08ecb6483e7ad public: // [rn {:align}] Offset // [rn {:align}]! PostIndex -@@ -262,6 +264,7 @@ class V8_EXPORT_PRIVATE NeonMemOperand { +@@ -265,6 +267,7 @@ class V8_EXPORT_PRIVATE NeonMemOperand { int align_; }; @@ -49,7 +49,7 @@ index 852b983ac4a40c33d23dba77e9c2b48f653d1b4f..b78a7651d1e5c54e32e08ecb6483e7ad // Class NeonListOperand represents a list of NEON registers class NeonListOperand { public: -@@ -1396,7 +1399,7 @@ class PatchingAssembler : public Assembler { +@@ -1391,7 +1394,7 @@ class PatchingAssembler : public Assembler { // state, even if the list is modified by some other means. Note that this scope // can be nested but the destructors need to run in the opposite order as the // constructors. We do not have assertions for this. @@ -59,7 +59,7 @@ index 852b983ac4a40c33d23dba77e9c2b48f653d1b4f..b78a7651d1e5c54e32e08ecb6483e7ad explicit UseScratchRegisterScope(Assembler* assembler); ~UseScratchRegisterScope(); diff --git a/src/arm64/assembler-arm64.h b/src/arm64/assembler-arm64.h -index 8db1a571b7d198c03a6cb6f1a8ab04597bea2776..8614975a1dbe54fe655f5e050742ccc76faa21da 100644 +index 2185cad65b7791e65706685066a412ce660c5940..d6d8b4632791f4264ea7a245ef84dbf51fbb5be1 100644 --- a/src/arm64/assembler-arm64.h +++ b/src/arm64/assembler-arm64.h @@ -49,7 +49,7 @@ class Immediate { @@ -72,7 +72,7 @@ index 8db1a571b7d198c03a6cb6f1a8ab04597bea2776..8614975a1dbe54fe655f5e050742ccc7 int64_t value_; RelocInfo::Mode rmode_; diff --git a/src/arm64/decoder-arm64.h b/src/arm64/decoder-arm64.h -index 3bc6934e814539022681e8ad4523a68a8f79b07b..a89bf38980e711c16caaf7a0158e36480b8ba978 100644 +index 477a126344a50eb9cf29cce216792a53ae98393e..a89bf38980e711c16caaf7a0158e36480b8ba978 100644 --- a/src/arm64/decoder-arm64.h +++ b/src/arm64/decoder-arm64.h @@ -86,7 +86,7 @@ namespace internal { @@ -95,15 +95,6 @@ index 3bc6934e814539022681e8ad4523a68a8f79b07b..a89bf38980e711c16caaf7a0158e3648 public: DispatchingDecoderVisitor() {} virtual ~DispatchingDecoderVisitor() {} -@@ -120,7 +121,7 @@ class V8_EXPORT_PRIVATE DispatchingDecoderVisitor : public DecoderVisitor { - // - // will call in order visitor methods in V3, V2, V1, V4. - void AppendVisitor(DecoderVisitor* visitor); -- V8_EXPORT_PRIVATE void PrependVisitor(DecoderVisitor* visitor); -+ void PrependVisitor(DecoderVisitor* visitor); - void InsertVisitorBefore(DecoderVisitor* new_visitor, - DecoderVisitor* registered_visitor); - void InsertVisitorAfter(DecoderVisitor* new_visitor, @@ -141,6 +142,7 @@ class V8_EXPORT_PRIVATE DispatchingDecoderVisitor : public DecoderVisitor { std::list visitors_; }; @@ -245,10 +236,10 @@ 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 7521eadf696e9594d835d0088594da0ac768e9ff..6174e5b745976d0af5647ca945fcb8e72a0e6e91 100644 +index 114e19fba9bbafac974205d99c425ea98ed5bc0f..64f332af84843a3091b8b04aebd606dac200b56e 100644 --- a/src/arm64/macro-assembler-arm64.h +++ b/src/arm64/macro-assembler-arm64.h -@@ -2080,7 +2080,7 @@ class InstructionAccurateScope { +@@ -2082,7 +2082,7 @@ class InstructionAccurateScope { // original state, even if the lists were modified by some other means. Note // that this scope can be nested but the destructors need to run in the opposite // order as the constructors. We do not have assertions for this. @@ -257,25 +248,6 @@ index 7521eadf696e9594d835d0088594da0ac768e9ff..6174e5b745976d0af5647ca945fcb8e7 public: explicit UseScratchRegisterScope(TurboAssembler* tasm) : available_(tasm->TmpList()), -@@ -2091,7 +2091,7 @@ class V8_EXPORT_PRIVATE UseScratchRegisterScope { - DCHECK_EQ(availablefp_->type(), CPURegister::kVRegister); - } - -- V8_EXPORT_PRIVATE ~UseScratchRegisterScope(); -+ ~UseScratchRegisterScope(); - - // Take a register from the appropriate temps list. It will be returned - // automatically when the scope ends. -@@ -2108,8 +2108,7 @@ class V8_EXPORT_PRIVATE UseScratchRegisterScope { - VRegister AcquireSameSizeAs(const VRegister& reg); - - private: -- V8_EXPORT_PRIVATE static CPURegister AcquireNextAvailable( -- CPURegList* available); -+ static CPURegister AcquireNextAvailable(CPURegList* available); - - // Available scratch registers. - CPURegList* available_; // kRegister diff --git a/src/arm64/register-arm64.h b/src/arm64/register-arm64.h index b19f41ef8488a9a117a8c88305c6dbe0dc188d39..956fd9ab04bcc4b314eb6253636e776463332b1b 100644 --- a/src/arm64/register-arm64.h @@ -444,10 +416,10 @@ index d6bb84cd274575c78291eafdb6794d7ff690915c..5315d5598f3064cbf5563246bd5bd17f } // namespace internal diff --git a/src/objects.cc b/src/objects.cc -index cf301643a84e2a39a66909eab32a33c418990f28..bc526499502937a10eb56bfd6c75c0f5f9d678ad 100644 +index 70b6966ec0aacfc8df3caa5b73147bbe2691c929..8d6d09eca5ba9ff62744d5d774d7072ad363cf22 100644 --- a/src/objects.cc +++ b/src/objects.cc -@@ -1237,7 +1237,7 @@ bool Object::ToInt32(int32_t* value) { +@@ -1238,7 +1238,7 @@ bool Object::ToInt32(int32_t* value) { // static constexpr object declarations need a definition to make the // compiler happy. constexpr Object Smi::kZero; @@ -457,7 +429,7 @@ index cf301643a84e2a39a66909eab32a33c418990f28..bc526499502937a10eb56bfd6c75c0f5 Handle FunctionTemplateInfo::GetOrCreateSharedFunctionInfo( Isolate* isolate, Handle info, diff --git a/src/objects/code.h b/src/objects/code.h -index a02495c960d531355c62a11c26271ab08685b39e..310584c0b8808fa917f73fb822adaf855ac423a0 100644 +index fa2580db17c9bb5981800a146e245bf0ea1721a3..afd8fc265b8a2107169811d812e818386d7c539b 100644 --- a/src/objects/code.h +++ b/src/objects/code.h @@ -650,10 +650,9 @@ class DependentCode : public WeakFixedArray { @@ -475,10 +447,10 @@ index a02495c960d531355c62a11c26271ab08685b39e..310584c0b8808fa917f73fb822adaf85 void DeoptimizeDependentCodeGroup(Isolate* isolate, DependencyGroup group); diff --git a/src/objects/shared-function-info.h b/src/objects/shared-function-info.h -index 5b79098fc0619b0d6ebaf48b5d8c6e56af7c32f0..688890ccd5d6a7ea7c4e7e265cea0e4a41d008c5 100644 +index 31309dc5a89b6433479d95dc9de77401690b004a..ef205cdf90e4426d91c7b6551fd17c9e0667502a 100644 --- a/src/objects/shared-function-info.h +++ b/src/objects/shared-function-info.h -@@ -220,9 +220,7 @@ class InterpreterData : public Struct { +@@ -221,9 +221,7 @@ class InterpreterData : public Struct { class SharedFunctionInfo : public HeapObject { public: NEVER_READ_ONLY_SPACE @@ -490,10 +462,10 @@ index 5b79098fc0619b0d6ebaf48b5d8c6e56af7c32f0..688890ccd5d6a7ea7c4e7e265cea0e4a // [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 323d7ed73dd26531e436d504878ba3fe7c4df6d7..98579e5753a6eafbbd4f0e44b518dc5377631d8a 100644 +index f1fafa0c8e5e52d59ad717280a7ad4af978d88c2..d68a78939146085ee8cb381b856e1796bd47f07c 100644 --- a/src/objects/string.cc +++ b/src/objects/string.cc -@@ -1517,8 +1517,5 @@ String ConsStringIterator::NextLeaf(bool* blew_stack) { +@@ -1626,8 +1626,5 @@ String ConsStringIterator::NextLeaf(bool* blew_stack) { UNREACHABLE(); } @@ -503,7 +475,7 @@ index 323d7ed73dd26531e436d504878ba3fe7c4df6d7..98579e5753a6eafbbd4f0e44b518dc53 } // namespace internal } // namespace v8 diff --git a/src/objects/string.h b/src/objects/string.h -index 707f29a2ae1d6a0b5effc5e88b192ba1980a7be0..72359fd0c1ad9c1d816b325d263bb613c9de3af0 100644 +index 55e0a365c105a90ca09667c2657911750895c9bc..21cfaaf2abc0adcd09e76cf95cda8a6540b6c49a 100644 --- a/src/objects/string.h +++ b/src/objects/string.h @@ -6,7 +6,6 @@ @@ -514,7 +486,7 @@ index 707f29a2ae1d6a0b5effc5e88b192ba1980a7be0..72359fd0c1ad9c1d816b325d263bb613 #include "src/objects/instance-type.h" #include "src/objects/name.h" #include "src/objects/smi.h" -@@ -365,8 +364,8 @@ class String : public Name { +@@ -369,8 +368,8 @@ class String : public Name { // Helper function for flattening strings. template @@ -525,7 +497,7 @@ index 707f29a2ae1d6a0b5effc5e88b192ba1980a7be0..72359fd0c1ad9c1d816b325d263bb613 static inline bool IsAscii(const char* chars, int length) { return IsAscii(reinterpret_cast(chars), length); -@@ -422,11 +421,6 @@ class String : public Name { +@@ -426,11 +425,6 @@ class String : public Name { OBJECT_CONSTRUCTORS(String, Name); }; diff --git a/patches/common/v8/workaround_an_undefined_symbol_error.patch b/patches/common/v8/workaround_an_undefined_symbol_error.patch index 7f8aa5d9850..90b1db9d3ed 100644 --- a/patches/common/v8/workaround_an_undefined_symbol_error.patch +++ b/patches/common/v8/workaround_an_undefined_symbol_error.patch @@ -39,10 +39,10 @@ index eaafa2375b2746fb7a9f63a1fc6703660b2b123c..fa83830f21b068ff79872e5d9eb6031b const Operand& operand, FlagsUpdate S, AddSubOp op) { DCHECK_EQ(rd.SizeInBits(), rn.SizeInBits()); diff --git a/src/arm64/assembler-arm64.h b/src/arm64/assembler-arm64.h -index 8614975a1dbe54fe655f5e050742ccc76faa21da..1e0379b851a062c580cb5884176c3d4833ae5ea8 100644 +index 9d2f482f31ad9c056a0c65dbf0ff0980f28ee880..2185cad65b7791e65706685066a412ce660c5940 100644 --- a/src/arm64/assembler-arm64.h +++ b/src/arm64/assembler-arm64.h -@@ -2234,11 +2234,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase { +@@ -2230,11 +2230,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase { return rm.code() << Rm_offset; } @@ -55,7 +55,7 @@ index 8614975a1dbe54fe655f5e050742ccc76faa21da..1e0379b851a062c580cb5884176c3d48 static Instr Ra(CPURegister ra) { DCHECK_NE(ra.code(), kSPRegInternalCode); -@@ -2262,15 +2258,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase { +@@ -2258,15 +2254,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase { // These encoding functions allow the stack pointer to be encoded, and // disallow the zero register.