From 82674b4d2201f1bd0a135be8cd8da15a9d56b91b Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Tue, 23 Jun 2020 06:01:02 -0700 Subject: [PATCH 01/79] chore: bump chromium in DEPS to 7fb9778894d73378bff51087ce869ea5aa6e5d5d --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index b346f2cd0c8a4..73c89a6286747 100644 --- a/DEPS +++ b/DEPS @@ -13,7 +13,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - '9ae03ef8f7d4f6ac663f725bcfe70311987652f3', + '7fb9778894d73378bff51087ce869ea5aa6e5d5d', 'node_version': 'v12.18.1', 'nan_version': From a8d066554b5aef0ba5a881e2377bd19b27e22620 Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Wed, 24 Jun 2020 06:01:26 -0700 Subject: [PATCH 02/79] chore: bump chromium in DEPS to 83da426e53d423f0530fc23433b6d2c4d0548442 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 73c89a6286747..41e90f530fc9c 100644 --- a/DEPS +++ b/DEPS @@ -13,7 +13,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - '7fb9778894d73378bff51087ce869ea5aa6e5d5d', + '83da426e53d423f0530fc23433b6d2c4d0548442', 'node_version': 'v12.18.1', 'nan_version': From 8a2634757ebd656af94296d9a5d58b96f41760be Mon Sep 17 00:00:00 2001 From: Andy Locascio Date: Thu, 25 Jun 2020 11:23:46 -0700 Subject: [PATCH 03/79] update patches --- patches/chromium/.patches | 2 - ...client_precreatemessageloop_callback.patch | 6 +- .../add_didinstallconditionalfeatures.patch | 20 ++-- ...rustedauthclient_to_urlloaderfactory.patch | 2 +- patches/chromium/blink_local_frame.patch | 2 +- patches/chromium/blink_world_context.patch | 4 +- patches/chromium/can_create_window.patch | 22 ++-- ...esources_not_chrome_for_spellchecker.patch | 4 +- .../chromium/content_browser_main_loop.patch | 4 +- patches/chromium/dcheck.patch | 6 +- patches/chromium/disable-redraw-lock.patch | 4 +- .../disable_color_correct_rendering.patch | 44 +++---- ...that_fails_with_software_compositing.patch | 4 +- patches/chromium/disable_hidden.patch | 2 +- ...xpose_setuseragent_on_networkcontext.patch | 4 +- ...screen_rendering_with_viz_compositor.patch | 4 +- ...ointer_events_from_pen_on_windows_10.patch | 28 ----- ...ns_through_the_web_contents_delegate.patch | 4 +- patches/chromium/frame_host_manager.patch | 52 +++++---- ...gpu_notify_when_dxdiag_request_fails.patch | 18 +-- .../chromium/gritsettings_resource_ids.patch | 4 +- patches/chromium/mas_no_private_api.patch | 10 +- ...emote_certificate_verification_logic.patch | 4 +- .../chromium/notification_provenance.patch | 2 +- patches/chromium/printing.patch | 2 +- ...r_changes_to_the_webcontentsobserver.patch | 12 +- .../remove_menu_window_task_item.patch | 20 ---- patches/chromium/resource_file_conflict.patch | 6 +- ...ove_contentrendererclient_shouldfork.patch | 12 +- patches/chromium/scroll_bounce_flag.patch | 4 +- .../ssl_security_state_tab_helper.patch | 4 +- .../support_mixed_sandbox_with_zygote.patch | 2 +- patches/chromium/tts.patch | 21 ++-- patches/chromium/ui_gtk_public_header.patch | 2 +- patches/chromium/web_contents.patch | 8 +- patches/chromium/webview_cross_drag.patch | 4 +- .../worker_context_will_destroy.patch | 4 +- ...darray_max_length_to_2_32-1_elements.patch | 44 +++++++ ...vironment_into_createenvironment_and.patch | 69 +++++++++++ .../node/feat_enable_passing_cli_flags.patch | 107 ++++++++++++++++++ ...include_libuv_header_in_node_binding.patch | 23 ++++ ..._crashpad_pipe_name_in_child_process.patch | 22 ++++ ...mpdir_refresh_in_test-esm-windows_js.patch | 33 ++++++ 43 files changed, 454 insertions(+), 201 deletions(-) delete mode 100644 patches/chromium/fix_handling_non_client_pointer_events_from_pen_on_windows_10.patch delete mode 100644 patches/chromium/remove_menu_window_task_item.patch create mode 100644 patches/node/64bit_bump_typedarray_max_length_to_2_32-1_elements.patch create mode 100644 patches/node/chore_split_createenvironment_into_createenvironment_and.patch create mode 100644 patches/node/feat_enable_passing_cli_flags.patch create mode 100644 patches/node/fix_include_libuv_header_in_node_binding.patch create mode 100644 patches/node/inherit_electron_crashpad_pipe_name_in_child_process.patch create mode 100644 patches/node/test_use_tmpdir_refresh_in_test-esm-windows_js.patch diff --git a/patches/chromium/.patches b/patches/chromium/.patches index 135b6272c9053..8beb52bdeb2cb 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -98,5 +98,3 @@ disable_unnecessary_ischromefirstrun_check.patch disable_dcheck_that_fails_with_software_compositing.patch fix_swap_global_proxies_before_initializing_the_windows_proxies.patch feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch -fix_handling_non_client_pointer_events_from_pen_on_windows_10.patch -remove_menu_window_task_item.patch diff --git a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch index 7c55b8fcf728d..da1e6c893fef7 100644 --- a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch +++ b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch @@ -10,10 +10,10 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set. This should be upstreamed. diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc -index b502af8bb93dd45b5de046850f69ef34f9d04732..a6c84cd7909c6a1c70f3f4b5bd65531bf26f1a94 100644 +index bf8c86b08240dd6a229acd44305435fe8b964bc2..bf6a3ee6aa6fc30e6f2096c9354414ada2ca9bfc 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc -@@ -255,6 +255,10 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -256,6 +256,10 @@ int GpuMain(const MainFunctionParams& parameters) { // to the GpuProcessHost once the GpuServiceImpl has started. viz::GpuServiceImpl::InstallPreInitializeLogHandler(); @@ -24,7 +24,7 @@ index b502af8bb93dd45b5de046850f69ef34f9d04732..a6c84cd7909c6a1c70f3f4b5bd65531b // We are experiencing what appear to be memory-stomp issues in the GPU // process. These issues seem to be impacting the task executor and listeners // registered to it. Create the task executor on the heap to guard against -@@ -373,7 +377,6 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -375,7 +379,6 @@ int GpuMain(const MainFunctionParams& parameters) { } #endif diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index 79dd1bfe8df85..063ed7367748f 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -23,10 +23,10 @@ index 4e195f960d7b9bf50f6784ce380a84a10867914f..dbf85ffe8504bdbab1c4c29f085e5307 int32_t world_id) {} virtual void DidClearWindowObject() {} diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 0cb96dd693459a9747aa1e2c46c5257df510211a..010ed22b5da75c445b777bd0db503b268c7a767f 100644 +index 8bac6a6b55faf46637470e99701f489157a1f2f6..d24fc2a6d5f9406407392ae4fcf7890c7dc98310 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4745,6 +4745,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, +@@ -4737,6 +4737,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, observer.DidCreateScriptContext(context, world_id); } @@ -40,10 +40,10 @@ index 0cb96dd693459a9747aa1e2c46c5257df510211a..010ed22b5da75c445b777bd0db503b26 int world_id) { for (auto& observer : observers_) diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h -index b1465918040a8eaafd5780aaf9fb6f870c9ea943..2fb7927168ac62c52d2e65942608dd9b73ac3133 100644 +index c6d8de45561cbcb6beeb6a28ce0517587b72a030..aef52b00d00392490d43cf7b7ef96ebad7b227e4 100644 --- a/content/renderer/render_frame_impl.h +++ b/content/renderer/render_frame_impl.h -@@ -722,6 +722,8 @@ class CONTENT_EXPORT RenderFrameImpl +@@ -719,6 +719,8 @@ class CONTENT_EXPORT RenderFrameImpl bool ShouldTrackUseCounter(const blink::WebURL& url) override; void DidCreateScriptContext(v8::Local context, int world_id) override; @@ -53,10 +53,10 @@ index b1465918040a8eaafd5780aaf9fb6f870c9ea943..2fb7927168ac62c52d2e65942608dd9b int world_id) override; void DidChangeScrollOffset() override; diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h -index 902504b8399c53fee972fe5549a4dbd39274a3c8..ddf6b6b696f7d990b7455ac6c9b8156a733b6c07 100644 +index f0a05ead42b7a5eb70fc4e5cae13710391f14b5c..b1bbdcf6f69128b9943001a2b64e8a92e5148ab1 100644 --- a/third_party/blink/public/web/web_local_frame_client.h +++ b/third_party/blink/public/web/web_local_frame_client.h -@@ -542,6 +542,9 @@ class BLINK_EXPORT WebLocalFrameClient { +@@ -550,6 +550,9 @@ class BLINK_EXPORT WebLocalFrameClient { virtual void DidCreateScriptContext(v8::Local, int32_t world_id) {} @@ -79,10 +79,10 @@ index 5ac9a7ed3d0f91764452579992471c83104de64f..15ac214bc9177f2fc228cf93c459a7b3 if (World().IsMainWorld()) { GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld(); diff --git a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc -index ba02a164a799b2b9e92bbeeb2bff2a4a2fd7d662..42ed050d572b13f1302bfb9eb5b59b15ba5a6904 100644 +index adc00866f436b59bd50881949379014222d71a50..71631b77c13ea1e6e8a4f558ef5ac5a09886218d 100644 --- a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc +++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc -@@ -349,6 +349,13 @@ void LocalFrameClientImpl::DidCreateScriptContext( +@@ -363,6 +363,13 @@ void LocalFrameClientImpl::DidCreateScriptContext( web_frame_->Client()->DidCreateScriptContext(context, world_id); } @@ -97,7 +97,7 @@ index ba02a164a799b2b9e92bbeeb2bff2a4a2fd7d662..42ed050d572b13f1302bfb9eb5b59b15 v8::Local context, int32_t world_id) { diff --git a/third_party/blink/renderer/core/exported/local_frame_client_impl.h b/third_party/blink/renderer/core/exported/local_frame_client_impl.h -index 183a009cf58399966c9002786ede3d540aa068cb..dbe445cf40ec53e4b36e4a323334662c70359a38 100644 +index 23a196c72164b41bfff97d105957889cce3a7fbe..c702d1dc09b5026ab77a0ba8ec03c4d0cc7c2d67 100644 --- a/third_party/blink/renderer/core/exported/local_frame_client_impl.h +++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.h @@ -78,6 +78,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient { @@ -110,7 +110,7 @@ index 183a009cf58399966c9002786ede3d540aa068cb..dbe445cf40ec53e4b36e4a323334662c int32_t world_id) override; diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h -index a8443a8bfc2542ffad472206214279c1223d493f..8c7a4dec19d6fbca615b7bc282b0388189eef886 100644 +index 27ab3b3056c81ca367f45e0a1f7bd74a153353c4..790f7fac77677aad8c1d69c287273a9bf9436ac2 100644 --- a/third_party/blink/renderer/core/frame/local_frame_client.h +++ b/third_party/blink/renderer/core/frame/local_frame_client.h @@ -297,6 +297,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient { diff --git a/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch b/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch index 7795e7e96b0eb..39a20aa38ad2e 100644 --- a/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch +++ b/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch @@ -10,7 +10,7 @@ WebContents, and cancels the authentication if there's no WebContents available, which there isn't in the case of the 'net' module. diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom -index 842a4d27ee7a27a4e5c6d60033cee6526aac1bee..07682bd496e0872498f1fd404466408ebf21583c 100644 +index 6d15b6b5ff7b36b85f6b8200b76a32b285f0e675..c21234572976a6de7db5b0f2f7f44ec770832178 100644 --- a/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom @@ -214,6 +214,25 @@ struct CTPolicy { diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch index 1fa08adeba71e..ec242d988e5f7 100644 --- a/patches/chromium/blink_local_frame.patch +++ b/patches/chromium/blink_local_frame.patch @@ -14,7 +14,7 @@ when there is code doing that. This patch reverts the change to fix the crash in Electron. diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc -index ba48c66cc8a982dc66750673e9ea116f94710688..aca8f1173e4abfd4cb536543c1f98cf466776899 100644 +index 8f7a3a1e943b59044792cb19b02febcda8475b8f..88090ae29eb4cc5f8780a5bb7e16a71593b05a5e 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc @@ -538,10 +538,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { diff --git a/patches/chromium/blink_world_context.patch b/patches/chromium/blink_world_context.patch index 6bb8333c79047..840affe807c11 100644 --- a/patches/chromium/blink_world_context.patch +++ b/patches/chromium/blink_world_context.patch @@ -7,10 +7,10 @@ This exposes a method for obtaining a reference to an isolated world, which is otherwise not available in the Blink API. diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h -index dbc00b0e8e34ab0ba922cb4ad42a78bb188faccc..ce078ef2a5dbe360e1aff4926df4b5ac434c17a3 100644 +index be5efdc896fd9318b50c9e5ad02ec404ba7be23d..79234d0def2d4e97e05a03ecb1dbd7b077bc44b2 100644 --- a/third_party/blink/public/web/web_local_frame.h +++ b/third_party/blink/public/web/web_local_frame.h -@@ -352,6 +352,8 @@ class WebLocalFrame : public WebFrame { +@@ -354,6 +354,8 @@ class WebLocalFrame : public WebFrame { // Returns the world ID associated with |script_context|. virtual int32_t GetScriptContextWorldId( v8::Local script_context) const = 0; diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index 5052fca8d2505..884a82c79bfff 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -9,10 +9,10 @@ potentially prevent a window from being created. TODO(loc): this patch is currently broken. diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc -index be4d33c909a9bb953ed592d245d9bc2caf33f219..cfcfb2a501654f32d6be1b4807e0a097d02d5659 100644 +index 33869e7bf3aa6dd404f8413b817e544fb404bb43..98cfc99a3c917f9b6e7bc3b5c19479b81c114489 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc -@@ -4814,6 +4814,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -4809,6 +4809,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, @@ -21,10 +21,10 @@ index be4d33c909a9bb953ed592d245d9bc2caf33f219..cfcfb2a501654f32d6be1b4807e0a097 &no_javascript_access); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 36a6d0a1dd0480125d80cda76c49833aa2d48b76..87c8e45cbec22da82bb702412e9f706ff3f5c179 100644 +index 33072ecef6bcfb751ce81cf46e2609bddcca065b..1f5f7f217a7cb4013f6bfbb380b2b81214cc92b0 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3086,9 +3086,9 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow( +@@ -3087,9 +3087,9 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow( } if (delegate_) { @@ -53,10 +53,10 @@ index 322e2f0f4f023cd2e34163f623c5b52eaad51c1d..46ae29207c804ae3474ae3a3dd8f76de // 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 d2ddb9fae8630310e286174bae1205d46dd20636..456abd7838cff663805f09e8804ab8a2aa2f9b1b 100644 +index 329c797f5a5259e0862c115a5cf755a04db1a149..10ae2cc43cef72cbfa58b650852d0113083ad059 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc -@@ -530,6 +530,8 @@ bool ContentBrowserClient::CanCreateWindow( +@@ -529,6 +529,8 @@ bool ContentBrowserClient::CanCreateWindow( const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -66,7 +66,7 @@ index d2ddb9fae8630310e286174bae1205d46dd20636..456abd7838cff663805f09e8804ab8a2 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 3236df23868492d3c6a1850517dfa1fb4aecf623..3908e4e3398a53af8634a6a3ef74ab802cdfd33a 100644 +index d17c01ae4dc40e57eb190329dd05354016786141..2e50dfaeb1e97679ca84d3dd6daed121071ec013 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -146,6 +146,7 @@ class NetworkService; @@ -77,7 +77,7 @@ index 3236df23868492d3c6a1850517dfa1fb4aecf623..3908e4e3398a53af8634a6a3ef74ab80 } // namespace network namespace sandbox { -@@ -851,6 +852,8 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -848,6 +849,8 @@ class CONTENT_EXPORT ContentBrowserClient { const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -158,10 +158,10 @@ index 29220e08371ad0f7a400c81bd024c55130430767..57447f4529917692155d1861c7658156 // 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 021b06878da520d5e5576cb01c60a4a2e017b9ad..71d9fc7215180a47b45c924ed95fb8619db598f6 100644 +index 1d17a41e553bf4d7181a1dcfac9f9e379b6dffcb..384d7150daaeda547e0085e3031b706784ceb7dd 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 -@@ -400,6 +400,8 @@ bool WebTestContentBrowserClient::CanCreateWindow( +@@ -399,6 +399,8 @@ bool WebTestContentBrowserClient::CanCreateWindow( const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -171,7 +171,7 @@ index 021b06878da520d5e5576cb01c60a4a2e017b9ad..71d9fc7215180a47b45c924ed95fb861 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 45b6bbbd41bbe19a39edb83b6ced844cb4c97244..90b5c696f4cc6b77d1377a628c9d8166c773bb60 100644 +index 21f7e0d85006bc35872c237b98a14d9644bb1488..d3fef30d9731e4cc6cfe404003b9b1fa8cea53e1 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 @@ -79,6 +79,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient { diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch index fd813ec183bf5..1e017594efd9c 100644 --- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch +++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch @@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from Electrons grit header instead of Chromes diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index e954de3ef7ea3c246e4574e70e1ae04d288f14e4..35c6d5c6342c816bbf5a62152f535c1cfc961fe0 100644 +index 5bea95b8f8f37c2d361577fb6ef6c50d40b98eb2..f445c96fef1a75fb90bee9a49d982a4466ac41b3 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -5455,6 +5455,7 @@ static_library("browser") { +@@ -5500,6 +5500,7 @@ static_library("browser") { deps += [ "//components/spellcheck/browser", "//components/spellcheck/common", diff --git a/patches/chromium/content_browser_main_loop.patch b/patches/chromium/content_browser_main_loop.patch index cee130d84008c..0850900ceaa9e 100644 --- a/patches/chromium/content_browser_main_loop.patch +++ b/patches/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 264b6609ad4f068b2de7d2010e3b71faf1554298..eed7d007ede958aebc45c1ba3b3a855d4b7b4aab 100644 +index 064d60f239b962fc27c08e892b410ad8f2642dc0..dc98dc7e1d803b512e195ddcc376044b3fffdc4e 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc -@@ -1431,7 +1431,7 @@ void BrowserMainLoop::MainMessageLoopRun() { +@@ -1436,7 +1436,7 @@ void BrowserMainLoop::MainMessageLoopRun() { NOTREACHED(); #else base::RunLoop run_loop; diff --git a/patches/chromium/dcheck.patch b/patches/chromium/dcheck.patch index 88c91bf99fe2e..b2007195db5ff 100644 --- a/patches/chromium/dcheck.patch +++ b/patches/chromium/dcheck.patch @@ -17,10 +17,10 @@ only one or two specific checks fail. Then it's better to simply comment out the failing checks and allow the rest of the target to have them enabled. diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc -index 25e5a2c20452da3db4c648dfa678d8bd1f7d01cc..5947254f096c78d0ac4b97e4700a77cd2461ba96 100644 +index 92ab6517792a02f33803accbe12cdfc9202dabcf..b0c5b3c29e778655e9c6393299ef8e358c257709 100644 --- a/content/browser/frame_host/navigation_controller_impl.cc +++ b/content/browser/frame_host/navigation_controller_impl.cc -@@ -1264,8 +1264,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation( +@@ -1267,8 +1267,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation( return NAVIGATION_TYPE_NEW_SUBFRAME; } @@ -33,7 +33,7 @@ index 25e5a2c20452da3db4c648dfa678d8bd1f7d01cc..5947254f096c78d0ac4b97e4700a77cd if (rfh->GetParent()) { // All manual subframes would be did_create_new_entry and handled above, so -@@ -1521,7 +1523,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage( +@@ -1524,7 +1526,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage( new_entry->GetFavicon() = GetLastCommittedEntry()->GetFavicon(); } diff --git a/patches/chromium/disable-redraw-lock.patch b/patches/chromium/disable-redraw-lock.patch index a8d4eaa6801c7..5f7d59e7358d0 100644 --- a/patches/chromium/disable-redraw-lock.patch +++ b/patches/chromium/disable-redraw-lock.patch @@ -15,7 +15,7 @@ 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 a47389ee5387b4d08eb293355eca9ecae41d6522..db101407da7678b61af311791dcc6689a51e35b5 100644 +index c3062870d9655b06374a4708b41d618d1942e948..73462190057aa5d12162cf011ba50d8a737db95e 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc @@ -306,6 +306,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500; @@ -49,7 +49,7 @@ index a47389ee5387b4d08eb293355eca9ecae41d6522..db101407da7678b61af311791dcc6689 // HWNDMessageHandler, gfx::WindowImpl overrides: diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h -index 90aab6ae2d180431912c979dc253791f92f17595..88ee06c3b52c506076f71edbb9cc8e55660a1fba 100644 +index 7118ff56f0dd1c6291e4095ce7f3d8fc723f0398..5dbaab15ee1667ed1caf0b746b8e31d1b12a7b52 100644 --- a/ui/views/win/hwnd_message_handler.h +++ b/ui/views/win/hwnd_message_handler.h @@ -203,6 +203,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl, diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch index c0dedc8deef31..f7e571faf2de5 100644 --- a/patches/chromium/disable_color_correct_rendering.patch +++ b/patches/chromium/disable_color_correct_rendering.patch @@ -20,10 +20,10 @@ to deal with color spaces. That is being tracked at https://crbug.com/634542 and https://crbug.com/711107. diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc -index 3f281a56c2b9f367e2085b876ecbcc9b79c46b09..0b103af953ee9b5ca78554ef32d768dd352d1b17 100644 +index eeab47ebc93b9a75775faee87037049541f71dd6..54c3d886a18d25f02e37686dca123d9256a5af34 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc -@@ -1863,6 +1863,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw( +@@ -1862,6 +1862,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw( gfx::ColorSpace LayerTreeHostImpl::GetRasterColorSpace( gfx::ContentColorUsage content_color_usage) const { @@ -60,7 +60,7 @@ index 8bde4796ebcf40f7f10c62f4005eabb84af9de04..913ab005e582b3d1ab0df8f88ac1df62 bool force_antialiasing = false; bool force_blending_with_shaders = false; diff --git a/components/viz/host/renderer_settings_creation.cc b/components/viz/host/renderer_settings_creation.cc -index 0fc4813b2f76fe6154ebdc60ffabd278bed75653..7423c91d661adcf9e761b93ddbfa4ea8ce1c02da 100644 +index f28c3218baa08e7ae885567e0ede1d8108f8a373..a5f4a4a10a776fc92a5e9fbc9593563d548ccbc8 100644 --- a/components/viz/host/renderer_settings_creation.cc +++ b/components/viz/host/renderer_settings_creation.cc @@ -14,6 +14,7 @@ @@ -71,7 +71,7 @@ index 0fc4813b2f76fe6154ebdc60ffabd278bed75653..7423c91d661adcf9e761b93ddbfa4ea8 #if defined(OS_MACOSX) #include "ui/base/cocoa/remote_layer_api.h" -@@ -50,6 +51,8 @@ bool GetSwitchValueAsInt(const base::CommandLine* command_line, +@@ -51,6 +52,8 @@ bool GetSwitchValueAsInt(const base::CommandLine* command_line, RendererSettings CreateRendererSettings() { RendererSettings renderer_settings; base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); @@ -81,10 +81,10 @@ index 0fc4813b2f76fe6154ebdc60ffabd278bed75653..7423c91d661adcf9e761b93ddbfa4ea8 !command_line->HasSwitch(switches::kUIDisablePartialSwap); #if defined(OS_MACOSX) diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc -index 8ed1da04200eaf1b350fe95a3d9525648638b272..ca5f0d16a00c1d65bc059c68d7f0fe50ef493cff 100644 +index 5fd60eb6b1540bd51b3b19df6201ebf91de0bb09..678702151310ad7837df9b2cdf554755464f3431 100644 --- a/components/viz/service/display/gl_renderer.cc +++ b/components/viz/service/display/gl_renderer.cc -@@ -85,6 +85,9 @@ +@@ -89,6 +89,9 @@ using gpu::gles2::GLES2Interface; @@ -94,7 +94,7 @@ index 8ed1da04200eaf1b350fe95a3d9525648638b272..ca5f0d16a00c1d65bc059c68d7f0fe50 namespace viz { namespace { -@@ -583,8 +586,9 @@ void GLRenderer::DoDrawQuad(const DrawQuad* quad, +@@ -587,8 +590,9 @@ void GLRenderer::DoDrawQuad(const DrawQuad* quad, void GLRenderer::DrawDebugBorderQuad(const DebugBorderDrawQuad* quad) { SetBlendEnabled(quad->ShouldDrawWithBlending()); @@ -106,7 +106,7 @@ index 8ed1da04200eaf1b350fe95a3d9525648638b272..ca5f0d16a00c1d65bc059c68d7f0fe50 // Use the full quad_rect for debug quads to not move the edges based on // partial swaps. -@@ -1554,7 +1558,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params, +@@ -1558,7 +1562,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params, params->use_color_matrix, tint_gl_composited_content_, params->apply_shader_based_rounded_corner && ShouldApplyRoundedCorner(params->quad)), @@ -116,7 +116,7 @@ index 8ed1da04200eaf1b350fe95a3d9525648638b272..ca5f0d16a00c1d65bc059c68d7f0fe50 } void GLRenderer::UpdateRPDQUniforms(DrawRenderPassDrawQuadParams* params) { -@@ -2025,7 +2030,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad, +@@ -2029,7 +2034,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad, SetUseProgram(ProgramKey::SolidColor(use_aa ? USE_AA : NO_AA, tint_gl_composited_content_, ShouldApplyRoundedCorner(quad)), @@ -126,7 +126,7 @@ index 8ed1da04200eaf1b350fe95a3d9525648638b272..ca5f0d16a00c1d65bc059c68d7f0fe50 SetShaderColor(color, opacity); if (current_program_->rounded_corner_rect_location() != -1) { SetShaderRoundedCorner( -@@ -2180,7 +2186,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad, +@@ -2184,7 +2190,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad, : NON_PREMULTIPLIED_ALPHA, false, false, tint_gl_composited_content_, ShouldApplyRoundedCorner(quad)), @@ -136,7 +136,7 @@ index 8ed1da04200eaf1b350fe95a3d9525648638b272..ca5f0d16a00c1d65bc059c68d7f0fe50 if (current_program_->tint_color_matrix_location() != -1) { auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix(); -@@ -2276,7 +2283,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad, +@@ -2280,7 +2287,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad, !quad->ShouldDrawWithBlending(), has_tex_clamp_rect, tint_gl_composited_content_, ShouldApplyRoundedCorner(quad)), @@ -146,7 +146,7 @@ index 8ed1da04200eaf1b350fe95a3d9525648638b272..ca5f0d16a00c1d65bc059c68d7f0fe50 if (current_program_->tint_color_matrix_location() != -1) { auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix(); -@@ -2378,7 +2386,8 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad, +@@ -2382,7 +2390,8 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad, // The source color space should never be RGB. DCHECK_NE(src_color_space, src_color_space.GetAsFullRangeRGB()); @@ -156,7 +156,7 @@ index 8ed1da04200eaf1b350fe95a3d9525648638b272..ca5f0d16a00c1d65bc059c68d7f0fe50 #if defined(OS_WIN) // Force sRGB output on Windows for overlay candidate video quads to match -@@ -2542,7 +2551,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad, +@@ -2546,7 +2555,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad, SetUseProgram(ProgramKey::VideoStream(tex_coord_precision, ShouldApplyRoundedCorner(quad)), @@ -166,7 +166,7 @@ index 8ed1da04200eaf1b350fe95a3d9525648638b272..ca5f0d16a00c1d65bc059c68d7f0fe50 DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_)); gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id()); -@@ -2607,8 +2617,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) { +@@ -2611,8 +2621,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) { draw_cache_.nearest_neighbor ? GL_NEAREST : GL_LINEAR); // Bind the program to the GL state. @@ -177,7 +177,7 @@ index 8ed1da04200eaf1b350fe95a3d9525648638b272..ca5f0d16a00c1d65bc059c68d7f0fe50 if (current_program_->rounded_corner_rect_location() != -1) { SetShaderRoundedCorner( -@@ -3347,7 +3357,9 @@ void GLRenderer::PrepareGeometry(BoundGeometry binding) { +@@ -3356,7 +3366,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) { @@ -188,7 +188,7 @@ index 8ed1da04200eaf1b350fe95a3d9525648638b272..ca5f0d16a00c1d65bc059c68d7f0fe50 // If the input color space is PQ, and it did not specify a white level, // override it with the frame's white level. -@@ -3729,9 +3741,9 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource( +@@ -3738,9 +3750,9 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource( cc::MathUtil::CheckedRoundUp(iosurface_height, iosurface_multiple); } @@ -201,7 +201,7 @@ index 8ed1da04200eaf1b350fe95a3d9525648638b272..ca5f0d16a00c1d65bc059c68d7f0fe50 *new_bounds = gfx::RectF(updated_dst_rect.origin(), gfx::SizeF((*overlay_texture)->texture.size())); -@@ -3950,8 +3962,8 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) { +@@ -3959,8 +3971,8 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) { PrepareGeometry(SHARED_BINDING); @@ -212,14 +212,14 @@ index 8ed1da04200eaf1b350fe95a3d9525648638b272..ca5f0d16a00c1d65bc059c68d7f0fe50 gfx::Transform render_matrix; render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(), -@@ -4068,3 +4080,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize( +@@ -4077,3 +4089,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 6ec6024a9447817926acf551e23e6ae84a45eded..395633bb6f00d5363a1540ab67c730e507712f2e 100644 +index 55e4567abb1218ae99eda15d3cabbf408843a18b..59e8e4b4a9d490b0383fc5013e495d607f4cd84a 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc @@ -210,6 +210,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus( @@ -231,7 +231,7 @@ index 6ec6024a9447817926acf551e23e6ae84a45eded..395633bb6f00d5363a1540ab67c730e5 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 7733e7adb0f166cb2ebf7fbede82cd0fc53df4e9..b40da6648c9bc14a505f1f8f5ef898208e0f8ff3 100644 +index 03c5e4cc58ae9321dc2a89cef43d615ac2023916..1800a97025d03d7fbf8cf5ab7a632277dd32202e 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -227,6 +227,7 @@ @@ -251,10 +251,10 @@ index 7733e7adb0f166cb2ebf7fbede82cd0fc53df4e9..b40da6648c9bc14a505f1f8f5ef89820 service_manager::switches::kDisableInProcessStackTraces, service_manager::switches::kDisableSeccompFilterSandbox, diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc -index 14d836019d49fcf90a8e8863a9a0ca4148fd3894..02f9fb2e8564756c07c51637faa77b05c7f8af7a 100644 +index d56b2a18c3e1edc5c02ceb99d695dde3023f94dc..9e44fd8e77d5fcf651ab1bd9399317bd58881423 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc -@@ -2238,6 +2238,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings( +@@ -2216,6 +2216,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings( settings.main_frame_before_activation_enabled = cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation); diff --git a/patches/chromium/disable_dcheck_that_fails_with_software_compositing.patch b/patches/chromium/disable_dcheck_that_fails_with_software_compositing.patch index b6ecf3926b5dd..ea9fb863000e4 100644 --- a/patches/chromium/disable_dcheck_that_fails_with_software_compositing.patch +++ b/patches/chromium/disable_dcheck_that_fails_with_software_compositing.patch @@ -7,10 +7,10 @@ Should be removed once https://bugs.chromium.org/p/chromium/issues/detail?id=108 is addressed. diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc -index db101407da7678b61af311791dcc6689a51e35b5..6191775ea0566862722741a3c6102867082f33d6 100644 +index 73462190057aa5d12162cf011ba50d8a737db95e..1799392ca89f174bfbe56c272d809570386b7614 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc -@@ -2421,13 +2421,13 @@ void HWNDMessageHandler::OnPaint(HDC dc) { +@@ -2436,13 +2436,13 @@ void HWNDMessageHandler::OnPaint(HDC dc) { RECT cr; if (GetClientRect(hwnd(), &cr)) { if (exposed_pixels_.height() > 0) { diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch index a8efecd29e359..059ba9d8f7fd1 100644 --- a/patches/chromium/disable_hidden.patch +++ b/patches/chromium/disable_hidden.patch @@ -20,7 +20,7 @@ index 1bce7961d24d29cf8d14c8f7646e88e5f9d72ee6..bf6baff690af930acf19c2a544c8f00a blink::mojom::PointerLockResult::kWrongDocument); diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h -index 8ead45fa9273d1d7971b7e0c29bc973adc362838..4e5979aeca7509736d35f5f9cdbcc16a66fd9f42 100644 +index 5f3f2feec8c787ff1e086bf256ef9353732037af..a127ec54042ef869f0e19ba6b86b86d4d071304c 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h @@ -177,6 +177,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl diff --git a/patches/chromium/expose_setuseragent_on_networkcontext.patch b/patches/chromium/expose_setuseragent_on_networkcontext.patch index 2dcb31a004a91..e623cdc499182 100644 --- a/patches/chromium/expose_setuseragent_on_networkcontext.patch +++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch @@ -63,10 +63,10 @@ index dd65d1560daa8fde7d76e0dec8e1cdcb6c76b318..042f62dafcb027f0a65318d09dfadf75 void SetEnableReferrers(bool enable_referrers) override; #if defined(OS_CHROMEOS) diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom -index aa70ae61d095e91861cc8ebde0818ba72704e6ee..842a4d27ee7a27a4e5c6d60033cee6526aac1bee 100644 +index 577c2b431ae8026b34fa1d881b0b29db478dc213..6d15b6b5ff7b36b85f6b8200b76a32b285f0e675 100644 --- a/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom -@@ -1044,6 +1044,9 @@ interface NetworkContext { +@@ -1050,6 +1050,9 @@ interface NetworkContext { SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id, NetworkConditions? conditions); diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch index 7d3dac58c0a3f..8d2bd27ae12ca 100644 --- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch +++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch @@ -107,7 +107,7 @@ index 8c4f933b32420d2cfc40d5bc5883fda61636b52a..6f2322736e570b1e994a4f0c39396261 "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 c5bd0c657501cf7fc7e746c79b8661df7fbe8d5e..6abf07975a263e8aa51ecba5a829cf0268d5c192 100644 +index da8936a87cfe156a90952c1ca79d9faf6ef2cd1f..6fd321aaf610ee985868af62b0e856f19e8be264 100644 --- a/components/viz/service/display_embedder/output_surface_provider_impl.cc +++ b/components/viz/service/display_embedder/output_surface_provider_impl.cc @@ -21,6 +21,7 @@ @@ -126,7 +126,7 @@ index c5bd0c657501cf7fc7e746c79b8661df7fbe8d5e..6abf07975a263e8aa51ecba5a829cf02 #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_context.h" #include "ui/gl/init/gl_factory.h" -@@ -238,6 +240,22 @@ OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform( +@@ -223,6 +225,22 @@ OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform( if (headless_) return std::make_unique(); diff --git a/patches/chromium/fix_handling_non_client_pointer_events_from_pen_on_windows_10.patch b/patches/chromium/fix_handling_non_client_pointer_events_from_pen_on_windows_10.patch deleted file mode 100644 index 731b19453ba8d..0000000000000 --- a/patches/chromium/fix_handling_non_client_pointer_events_from_pen_on_windows_10.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Cheng Zhao -Date: Thu, 4 Oct 2018 14:57:02 -0700 -Subject: fix: handle non client pointer events from pen on Windows 10 - -Refs: https://github.com/electron/electron/issues/21440 -Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2237535 - -diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc -index 6191775ea0566862722741a3c6102867082f33d6..48f32cc9b820156ee7bca9381611b8aff7953fdf 100644 ---- a/ui/views/win/hwnd_message_handler.cc -+++ b/ui/views/win/hwnd_message_handler.cc -@@ -2002,6 +2002,15 @@ LRESULT HWNDMessageHandler::OnPointerEvent(UINT message, - return -1; - } - -+ // Pen may also send non client pointer messages, treat them as normal -+ // touch events so they can be properly handled. -+ if (pointer_type == PT_PEN && -+ (message == WM_NCPOINTERDOWN || -+ message == WM_NCPOINTERUP || -+ message == WM_NCPOINTERUPDATE)) { -+ pointer_type = PT_TOUCH; -+ } -+ - switch (pointer_type) { - case PT_PEN: - return HandlePointerEventTypePen(message, w_param, l_param); diff --git a/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch b/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch index 80db872380c02..b98b871c815bf 100644 --- a/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch +++ b/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch @@ -13,10 +13,10 @@ This patch can be removed once app.allowRendererProcessReuse is forced to true as then Chromiums assumptions around processes become correct. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 87c8e45cbec22da82bb702412e9f706ff3f5c179..d202b4f7fe4dba39c6818cd20e69fa51d90e1f8a 100644 +index 1f5f7f217a7cb4013f6bfbb380b2b81214cc92b0..9ac8c8ea965a33e64a656f4478b217d3e6288597 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -2491,11 +2491,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) { +@@ -2492,11 +2492,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) { WebContentsImpl* outermost = GetOutermostWebContents(); if (event.button == blink::WebPointerProperties::Button::kBack && outermost->controller_.CanGoBack()) { diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index 7edd23d776f73..21b8b8c416c35 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -42,7 +42,7 @@ index 6b03c07316eaab83a50afc123fc9f17b1c1dfa3b..e821571731e4e1a93f873477c7410de7 // another SiteInstance for the same site. void RegisterSiteInstance(SiteInstanceImpl* site_instance); diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc -index bda5c1f709729ea11f78049492d24fb978ed5ed9..c19b2ce56350f422a4e84fd974abf78c0f9c69af 100644 +index 6c3252af5e5f6dac3045f6315704ba9d494add4c..12ff9285320ca3c49bfdffb8a358024e80d18bd2 100644 --- a/content/browser/frame_host/navigation_request.cc +++ b/content/browser/frame_host/navigation_request.cc @@ -1406,6 +1406,21 @@ void NavigationRequest::BeginNavigation() { @@ -67,27 +67,31 @@ index bda5c1f709729ea11f78049492d24fb978ed5ed9..c19b2ce56350f422a4e84fd974abf78c // Select an appropriate RenderFrameHost. render_frame_host_ = frame_tree_node_->render_manager()->GetFrameHostForNavigation(this); -@@ -4765,13 +4780,15 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { - {WAITING_FOR_RENDERER_RESPONSE, {WILL_START_NAVIGATION}}, - {WILL_START_NAVIGATION, {WILL_START_REQUEST, WILL_FAIL_REQUEST}}, - {WILL_START_REQUEST, -- {WILL_REDIRECT_REQUEST, WILL_PROCESS_RESPONSE, READY_TO_COMMIT, -- DID_COMMIT, CANCELING, WILL_FAIL_REQUEST, DID_COMMIT_ERROR_PAGE}}, -+ {WILL_REDIRECT_REQUEST, WILL_PROCESS_RESPONSE, REUSE_SITE_INSTANCE, -+ READY_TO_COMMIT, DID_COMMIT, CANCELING, WILL_FAIL_REQUEST, -+ DID_COMMIT_ERROR_PAGE}}, - {WILL_REDIRECT_REQUEST, - {WILL_REDIRECT_REQUEST, WILL_PROCESS_RESPONSE, CANCELING, - WILL_FAIL_REQUEST}}, - {WILL_PROCESS_RESPONSE, -- {READY_TO_COMMIT, CANCELING, WILL_FAIL_REQUEST}}, -+ {REUSE_SITE_INSTANCE, READY_TO_COMMIT, CANCELING, WILL_FAIL_REQUEST}}, -+ {REUSE_SITE_INSTANCE, {READY_TO_COMMIT}}, - {READY_TO_COMMIT, {NOT_STARTED, DID_COMMIT, DID_COMMIT_ERROR_PAGE}}, - {DID_COMMIT, {}}, - {CANCELING, {READY_TO_COMMIT, WILL_FAIL_REQUEST}}, +@@ -4783,6 +4798,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { + {WILL_START_REQUEST, { + WILL_REDIRECT_REQUEST, + WILL_PROCESS_RESPONSE, ++ REUSE_SITE_INSTANCE, + READY_TO_COMMIT, + DID_COMMIT, + CANCELING, +@@ -4796,10 +4812,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { + WILL_FAIL_REQUEST, + }}, + {WILL_PROCESS_RESPONSE, { ++ REUSE_SITE_INSTANCE, + READY_TO_COMMIT, + CANCELING, + WILL_FAIL_REQUEST, + }}, ++ {REUSE_SITE_INSTANCE, { ++ READY_TO_COMMIT, ++ }}, + {READY_TO_COMMIT, { + NOT_STARTED, + DID_COMMIT, diff --git a/content/browser/frame_host/navigation_request.h b/content/browser/frame_host/navigation_request.h -index 8ba74e2fa32b6d9b1a3d60d0d5f24b8f755d7a4e..55f418110d4a32e13d16d2eb3c403b1ec9f1d1e9 100644 +index 6941326796bb7e7b056ae0f83345edb2e4cb0479..8e8e1e6d994809159cf0433a4feeec85e68814f2 100644 --- a/content/browser/frame_host/navigation_request.h +++ b/content/browser/frame_host/navigation_request.h @@ -142,6 +142,10 @@ class CONTENT_EXPORT NavigationRequest @@ -225,7 +229,7 @@ index 571e6381f2456450a07b64c3a84d1f15f4cbbefa..cb342a6c4915c4b2cc7fe0c1b3c7219f size_t GetRelatedActiveContentsCount() override; bool RequiresDedicatedProcess() override; diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc -index 456abd7838cff663805f09e8804ab8a2aa2f9b1b..6daec7affce6c0ca1254a6404dd5e575492be237 100644 +index 10ae2cc43cef72cbfa58b650852d0113083ad059..58047cefa66435237bc8b63be240fad5dbe4b78c 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -59,6 +59,21 @@ @@ -251,10 +255,10 @@ index 456abd7838cff663805f09e8804ab8a2aa2f9b1b..6daec7affce6c0ca1254a6404dd5e575 const MainFunctionParams& parameters) { return nullptr; diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 3908e4e3398a53af8634a6a3ef74ab802cdfd33a..fde1ac29a06f034278c55bed30704770649cba96 100644 +index 2e50dfaeb1e97679ca84d3dd6daed121071ec013..fd04397b43eecb3342b79b4cc5a13f54d39ba13c 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -236,8 +236,45 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -239,8 +239,45 @@ class CONTENT_EXPORT ContentBrowserClient { using IsClipboardPasteAllowedCallback = base::OnceCallback; diff --git a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch index 69d117089ce21..a616a03a85d6c 100644 --- a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch +++ b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch @@ -12,10 +12,10 @@ rendering and there is no signal from browser process on this event to identify it. diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc -index 572ada5883716fcd7f8d1eb274405308747efa38..106f3237db5482b511789158229269cf2c42df83 100644 +index 0f73a8d0da336036e663927424a3a0ccba9e4f7b..e2fe4908e8e459bb277dfd6becdc486714e814ea 100644 --- a/content/browser/gpu/gpu_data_manager_impl.cc +++ b/content/browser/gpu/gpu_data_manager_impl.cc -@@ -174,6 +174,11 @@ void GpuDataManagerImpl::TerminateInfoCollectionGpuProcess() { +@@ -188,6 +188,11 @@ void GpuDataManagerImpl::TerminateInfoCollectionGpuProcess() { base::AutoLock auto_lock(lock_); private_->TerminateInfoCollectionGpuProcess(); } @@ -28,10 +28,10 @@ index 572ada5883716fcd7f8d1eb274405308747efa38..106f3237db5482b511789158229269cf void GpuDataManagerImpl::UpdateGpuFeatureInfo( diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h -index 10cec4f37ad3ac13816047b9bbd44323af28627f..7cd91daede31c29d6f231f9a351326c3747872c4 100644 +index 2e069f00bb0f2c263b60662988548b246b74e5d9..82e9a19b6502aeab8f5d14098f2e5c5f995c3425 100644 --- a/content/browser/gpu/gpu_data_manager_impl.h +++ b/content/browser/gpu/gpu_data_manager_impl.h -@@ -93,6 +93,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDataManager, +@@ -95,6 +95,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDataManager, // Called from BrowserMainLoop::BrowserThreadsStarted(). void OnBrowserThreadsStarted(); void TerminateInfoCollectionGpuProcess(); @@ -40,10 +40,10 @@ index 10cec4f37ad3ac13816047b9bbd44323af28627f..7cd91daede31c29d6f231f9a351326c3 // Update the GPU feature info. This updates the blacklist and enabled status // of GPU rasterization. In the future this will be used for more features. diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc -index b93f088bc12209b62fb12ecd2c7e635359127810..5b1ea3da37892ccd893b09cdc13367ae824fff94 100644 +index 54a2d002794e3cf3c40799e437456dd37df51503..777dcd996ff2a9584824e527b7b371da7878d14b 100644 --- a/content/browser/gpu/gpu_data_manager_impl_private.cc +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -970,6 +970,10 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() { +@@ -1063,6 +1063,10 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() { host->ForceShutdown(); } @@ -55,11 +55,11 @@ index b93f088bc12209b62fb12ecd2c7e635359127810..5b1ea3da37892ccd893b09cdc13367ae void GpuDataManagerImplPrivate::UpdateGpuFeatureInfo( diff --git a/content/browser/gpu/gpu_data_manager_impl_private.h b/content/browser/gpu/gpu_data_manager_impl_private.h -index 7f1b9ac981fbb94895d975a4cb32bb54b2a9e649..30c64e09608d4fb7a5dbf7bf94e398ec646d4098 100644 +index ef74bd7541a2a47e71289b154221a5f5adf1e90b..100d393550d57c24bb0c9dc6d604ed925930bb07 100644 --- a/content/browser/gpu/gpu_data_manager_impl_private.h +++ b/content/browser/gpu/gpu_data_manager_impl_private.h -@@ -73,6 +73,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { - bool Dx12VulkanRequested() const; +@@ -75,6 +75,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { + bool VulkanRequested() const; void OnBrowserThreadsStarted(); void TerminateInfoCollectionGpuProcess(); + bool DxdiagDx12VulkanRequested() const; diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch index 46fd05651849a..d77b92840a9a5 100644 --- a/patches/chromium/gritsettings_resource_ids.patch +++ b/patches/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.spec b/tools/gritsettings/resource_ids.spec -index 399d58a0616e3f137db0b13b67e5ac1dbc944afe..3169e2149ed52843c18d79296100bd20bd7a7bab 100644 +index 8dbdb572647ce6e07f509778ecea43a05aaaf3c0..6d315c4673d6b7c87f4211a29cafad2b9df81c4c 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec -@@ -626,6 +626,11 @@ +@@ -636,6 +636,11 @@ "includes": [3880], }, diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch index 0416d744d88e9..62314a0ef99d6 100644 --- a/patches/chromium/mas_no_private_api.patch +++ b/patches/chromium/mas_no_private_api.patch @@ -7,10 +7,10 @@ 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/accessibility_tree_formatter_mac.mm b/content/browser/accessibility/accessibility_tree_formatter_mac.mm -index 177a7321153f68008f7c122b4f73e200feed72e9..f03c4fbad79ea829c440f13885a9005a46bc0640 100644 +index c2a7ecffc64eba8ab95835afed035d987fb5c36b..586e49904ff3ef9728207d6f7361a014562b6bb6 100644 --- a/content/browser/accessibility/accessibility_tree_formatter_mac.mm +++ b/content/browser/accessibility/accessibility_tree_formatter_mac.mm -@@ -449,7 +449,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( +@@ -482,7 +482,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( 0 == strcmp([value objCType], @encode(NSRange))) { return PopulateRange([value rangeValue]); } @@ -19,7 +19,7 @@ index 177a7321153f68008f7c122b4f73e200feed72e9..f03c4fbad79ea829c440f13885a9005a // AXTextMarker if (content::IsAXTextMarker(value)) { return PopulateTextPosition(content::AXTextMarkerToPosition(value).get(), -@@ -460,7 +460,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( +@@ -493,7 +493,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( if (content::IsAXTextMarkerRange(value)) { return PopulateTextMarkerRange(value, line_indexes_map); } @@ -28,7 +28,7 @@ index 177a7321153f68008f7c122b4f73e200feed72e9..f03c4fbad79ea829c440f13885a9005a // Accessible object if ([value isKindOfClass:[BrowserAccessibilityCocoa class]]) { return base::Value(NodeToLineIndex(value, line_indexes_map)); -@@ -511,7 +511,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextPosition( +@@ -544,7 +544,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextPosition( kConstValuePrefix + affinity); return set; } @@ -37,7 +37,7 @@ index 177a7321153f68008f7c122b4f73e200feed72e9..f03c4fbad79ea829c440f13885a9005a base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( id object, const LineIndexesMap& line_indexes_map) const { -@@ -526,7 +526,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( +@@ -559,7 +559,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( dict.SetPath("focus", PopulateTextPosition(range.focus(), line_indexes_map)); return dict; } diff --git a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch index a5b949f6119fb..be34d2253c582 100644 --- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch +++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch @@ -208,7 +208,7 @@ index 6989b0367ea1abcd46a110b738adc18227ab6846..dd65d1560daa8fde7d76e0dec8e1cdcb // CertNetFetcher is not used by the current platform, or if the actual // net::CertVerifier is instantiated outside of the network service. diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom -index 96992c80f8646fd8450665f76d3306fb22b5e5f3..aa70ae61d095e91861cc8ebde0818ba72704e6ee 100644 +index 6d5110add0e37fee81337a79f33c7b9266a2a9b0..577c2b431ae8026b34fa1d881b0b29db478dc213 100644 --- a/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom @@ -214,6 +214,17 @@ struct CTPolicy { @@ -229,7 +229,7 @@ index 96992c80f8646fd8450665f76d3306fb22b5e5f3..aa70ae61d095e91861cc8ebde0818ba7 // Parameters for constructing a network context. struct NetworkContextParams { // Name used by memory tools to identify the context. -@@ -850,6 +861,9 @@ interface NetworkContext { +@@ -856,6 +867,9 @@ interface NetworkContext { // Sets a client for this network context. SetClient(pending_remote client); diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch index 8977d1b1e214d..0a943aeae5bed 100644 --- a/patches/chromium/notification_provenance.patch +++ b/patches/chromium/notification_provenance.patch @@ -108,7 +108,7 @@ index 4bf25bf1fa69f7d3869369172d375e2e489e62a1..f80ef2cecc8b111dc54e109646573a59 mojo::PendingReceiver receiver); diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc -index 65bbefe6d5faf2778836a7e8cdbc885846de778f..e7e04894101ebe9964a4a34f361a114990f1d63c 100644 +index 792e359038592c6cb5bc9da319cbd5b383d5ca12..5f73faa60d4e8d8688af6513134a7696fd464026 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -2148,7 +2148,7 @@ void RenderProcessHostImpl::CreateNotificationService( diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch index 6a8baa609d298..08192b26354ba 100644 --- a/patches/chromium/printing.patch +++ b/patches/chromium/printing.patch @@ -31,7 +31,7 @@ index 668a14bff461e83b2c6d9d7f23d9674ff081ef12..674f141e80c0316fd47558c4d428a970 using RenderMode = PdfRenderSettings::Mode; RenderMode mode; diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc -index adb208ba3589e32536527219aaf4e89e3ee3311a..301f6416898445eed814d67901254ef8e5915e2a 100644 +index c8e626a79f6105421a1feecd294231467f63510e..b5ee1d3c919d3ad48b4e17a1515870e113155263 100644 --- a/chrome/browser/printing/print_job_worker.cc +++ b/chrome/browser/printing/print_job_worker.cc @@ -20,7 +20,6 @@ diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch index 6774161931fac..874b05a35d20d 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -8,7 +8,7 @@ Chrome moved the SetCursor IPC message to mojo, which we use to tell OSR about ` Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2172779 diff --git a/content/browser/renderer_host/render_widget_host_delegate.h b/content/browser/renderer_host/render_widget_host_delegate.h -index 7e9bddc9f002b938ed7804af7c484f4500988a9e..f77130c39b853ed6ba30e62dd59c4afec93d8d31 100644 +index 2cf28550517cd4df7bd8a0cf8d954169acce5955..0c1358cc6ffb149ac640525a4e9383744b6e1ae8 100644 --- a/content/browser/renderer_host/render_widget_host_delegate.h +++ b/content/browser/renderer_host/render_widget_host_delegate.h @@ -15,6 +15,7 @@ @@ -19,7 +19,7 @@ index 7e9bddc9f002b938ed7804af7c484f4500988a9e..f77130c39b853ed6ba30e62dd59c4afe #include "content/common/drag_event_source_info.h" #include "content/public/common/drop_data.h" #include "services/metrics/public/cpp/ukm_recorder.h" -@@ -281,6 +282,9 @@ class CONTENT_EXPORT RenderWidgetHostDelegate { +@@ -282,6 +283,9 @@ class CONTENT_EXPORT RenderWidgetHostDelegate { // Allow the delegate to handle the cursor update. Returns true if handled. virtual bool OnUpdateDragCursor(); @@ -43,10 +43,10 @@ index bf6baff690af930acf19c2a544c8f00ab492bb8e..8d205a1b052c6d670c0c2e38852734c5 void RenderWidgetHostImpl::OnCursorVisibilityStateChanged(bool is_visible) { diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index a4f2947ea70dd7135cccefee5214ca7586f4cf31..24b1483af38ba7807677638fa8d44591610180ad 100644 +index ca90c21170ff3405efa1da230944faaaf12ce1b4..11560e87eab8d4aec49be358be92c0af7ad402f7 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3587,6 +3587,11 @@ bool WebContentsImpl::OnUpdateDragCursor() { +@@ -3588,6 +3588,11 @@ bool WebContentsImpl::OnUpdateDragCursor() { browser_plugin_embedder_->OnUpdateDragCursor(); } @@ -59,10 +59,10 @@ index a4f2947ea70dd7135cccefee5214ca7586f4cf31..24b1483af38ba7807677638fa8d44591 RenderWidgetHostImpl* render_widget_host) { return render_widget_host == GetMainFrame()->GetRenderWidgetHost(); diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h -index 84e8eb2838a696eaeac13919f151d85e4abf2224..9e1953fa2e1b3e3957b1d6f023bfaae4530288ef 100644 +index 5209401c03325f420d14d984a6b3b05391ff41e1..1bde6eae0148bdc60ded08ee2327b3b3799157bb 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h -@@ -920,6 +920,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, +@@ -921,6 +921,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, void SendScreenRects() override; TextInputManager* GetTextInputManager() override; bool OnUpdateDragCursor() override; diff --git a/patches/chromium/remove_menu_window_task_item.patch b/patches/chromium/remove_menu_window_task_item.patch deleted file mode 100644 index c63ec4be7a81f..0000000000000 --- a/patches/chromium/remove_menu_window_task_item.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Cheng Zhao -Date: Thu, 4 Oct 2018 14:57:02 -0700 -Subject: fix: remove menu window from taskbar - -Refs https://chromium-review.googlesource.com/c/chromium/src/+/2245941 - -diff --git a/ui/views/widget/widget_hwnd_utils.cc b/ui/views/widget/widget_hwnd_utils.cc -index 40e66a212e3ea158b61f11d804a3c1644023b2d7..89f5b62f95dfec59bacf79f33895438039fac1c5 100644 ---- a/ui/views/widget/widget_hwnd_utils.cc -+++ b/ui/views/widget/widget_hwnd_utils.cc -@@ -118,6 +118,8 @@ void CalculateWindowStylesFromInitParams( - else - *style |= WS_BORDER; - } -+ if (!params.force_show_in_taskbar) -+ *ex_style |= WS_EX_TOOLWINDOW; - break; - case Widget::InitParams::TYPE_TOOLTIP: - *style |= WS_POPUP; diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch index f6616f8554a86..2f365030ab0a8 100644 --- a/patches/chromium/resource_file_conflict.patch +++ b/patches/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 4894620e63bda3946292eb43ae19078172860843..b7c6293dfb3177164a34254613b320c690563a37 100644 +index e890623fe19255bb8628fbf64cc521062f8bd41b..8ced3d436ab4db28414de5312fb125144c0e26b6 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -1386,7 +1386,7 @@ if (is_chrome_branded && !is_android) { +@@ -1388,7 +1388,7 @@ if (is_chrome_branded && !is_android) { } } @@ -64,7 +64,7 @@ index 4894620e63bda3946292eb43ae19078172860843..b7c6293dfb3177164a34254613b320c6 chrome_paks("packed_resources") { if (is_mac) { output_dir = "$root_gen_dir/repack" -@@ -1406,6 +1406,12 @@ if (!is_android) { +@@ -1408,6 +1408,12 @@ if (!is_android) { } } diff --git a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch index f53bd54501f76..99c76725f3d2b 100644 --- a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch +++ b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch @@ -9,7 +9,7 @@ for every navigation to keep Node.js working properly. Once Native Modules in th are required to be NAPI or context aware (Electron v11), this patch can be removed. diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc -index 80b6c97c7301eaf432e3dbfd547e0d6763eedb52..15e50bde0419718f52ddd6ed439e45e6b33d3260 100644 +index 0f17eadbb2d3913f44fb19643e143f62eaf7b4a3..e7706e8761eb401db589f45dea2c443f3b0aa4f1 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -1296,6 +1296,25 @@ bool ChromeContentRendererClient::AllowPopup() { @@ -39,7 +39,7 @@ index 80b6c97c7301eaf432e3dbfd547e0d6763eedb52..15e50bde0419718f52ddd6ed439e45e6 WebLocalFrame* frame, ui::PageTransition transition_type, diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h -index 416b7a8f3ba1b6941761c1df4ea108219c415489..2733d0dbbc10c5465a319b080d9b079258ba896d 100644 +index ea214daadf1e5613ab2e402f5d3783b150c41ede..31513568737c0cb9639451b74b0172825f6e8fc4 100644 --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h @@ -127,6 +127,11 @@ class ChromeContentRendererClient @@ -55,7 +55,7 @@ index 416b7a8f3ba1b6941761c1df4ea108219c415489..2733d0dbbc10c5465a319b080d9b0792 ui::PageTransition transition_type, const blink::WebURL& url, diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc -index ea6d8e6357233f519c3cf41a96d8453993a9ce71..c513aff3e1c3da45e45954bc0beb80469de6a450 100644 +index 064d0a433dbe67cd24b92b78fab2f294ce5d320a..e38490b3cbfc62ed29ff93452814a9e65cd8bca6 100644 --- a/content/public/renderer/content_renderer_client.cc +++ b/content/public/renderer/content_renderer_client.cc @@ -114,6 +114,14 @@ bool ContentRendererClient::HandleNavigation( @@ -74,7 +74,7 @@ index ea6d8e6357233f519c3cf41a96d8453993a9ce71..c513aff3e1c3da45e45954bc0beb8046 blink::WebLocalFrame* frame, ui::PageTransition transition_type, diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h -index 9d321040de33acac09e83cc582f685740f425009..8f328979cc232c4f81a7f040e2424273a8248015 100644 +index d57edc0cea54b9d78700c3b9acdcfcc5f17341dd..e56aae188d7d8f46a4438b8e99f7e9b714c5875a 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h @@ -228,6 +228,13 @@ class CONTENT_EXPORT ContentRendererClient { @@ -92,10 +92,10 @@ index 9d321040de33acac09e83cc582f685740f425009..8f328979cc232c4f81a7f040e2424273 // |url|. If the function returns a valid |new_url|, the request must be // updated to use it. The |force_ignore_site_for_cookies| output parameter diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 010ed22b5da75c445b777bd0db503b268c7a767f..848fc0f31e2cf6795e88040c34b41647ca1256f6 100644 +index d24fc2a6d5f9406407392ae4fcf7890c7dc98310..2dbf6643537e217b2f41e55e1c3444b46414eb18 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -5488,6 +5488,23 @@ void RenderFrameImpl::BeginNavigation( +@@ -5480,6 +5480,23 @@ void RenderFrameImpl::BeginNavigation( // we can do a per-frame check here rather than a process-wide check. bool should_fork = HasWebUIScheme(url) || HasWebUIScheme(old_url) || (enabled_bindings_ & kWebUIBindingsPolicyMask); diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch index d40366f98f308..d6cbdaaaa131f 100644 --- a/patches/chromium/scroll_bounce_flag.patch +++ b/patches/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 9043430c94b444a5c1992d916eaec28af306ed11..5300feff137f57c85a76bbf07328d37b872a11db 100644 +index 8cbd82f65e4cec63aba72e6559909cd19a8265b7..adb8206e3a8af152b392227c862244672c8ad203 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -1356,7 +1356,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() { +@@ -1357,7 +1357,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() { } bool RenderThreadImpl::IsElasticOverscrollEnabled() { diff --git a/patches/chromium/ssl_security_state_tab_helper.patch b/patches/chromium/ssl_security_state_tab_helper.patch index 31904bbded891..7542e6e4d407b 100644 --- a/patches/chromium/ssl_security_state_tab_helper.patch +++ b/patches/chromium/ssl_security_state_tab_helper.patch @@ -6,7 +6,7 @@ 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 13fb888b94aff3846576e304cccfecd3b9fdac5d..11ecafa48f08ac5cfa1f841b7346cdacc62444fb 100644 +index 16d1ca932afddc1f2502e99384141b0814beb75c..8c91f5943228083f375d1e668acb9e5b75230232 100644 --- a/chrome/browser/ssl/security_state_tab_helper.cc +++ b/chrome/browser/ssl/security_state_tab_helper.cc @@ -13,22 +13,26 @@ @@ -25,7 +25,7 @@ index 13fb888b94aff3846576e304cccfecd3b9fdac5d..11ecafa48f08ac5cfa1f841b7346cdac #include "chrome/common/chrome_features.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" - #include "chrome/common/secure_origin_whitelist.h" + #include "chrome/common/secure_origin_allowlist.h" +#if 0 #include "components/omnibox/browser/omnibox_field_trial.h" #include "components/omnibox/common/omnibox_features.h" diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch index d3d56dbb68446..aa4991d6fc240 100644 --- a/patches/chromium/support_mixed_sandbox_with_zygote.patch +++ b/patches/chromium/support_mixed_sandbox_with_zygote.patch @@ -22,7 +22,7 @@ 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 e7e04894101ebe9964a4a34f361a114990f1d63c..7733e7adb0f166cb2ebf7fbede82cd0fc53df4e9 100644 +index 5f73faa60d4e8d8688af6513134a7696fd464026..03c5e4cc58ae9321dc2a89cef43d615ac2023916 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -414,6 +414,11 @@ class RendererSandboxedProcessLauncherDelegate diff --git a/patches/chromium/tts.patch b/patches/chromium/tts.patch index 416d36317dfb2..d3de1fb20a84f 100644 --- a/patches/chromium/tts.patch +++ b/patches/chromium/tts.patch @@ -10,22 +10,23 @@ Subject: tts.patch destruction from content layer. diff --git a/chrome/browser/speech/tts_controller_delegate_impl.cc b/chrome/browser/speech/tts_controller_delegate_impl.cc -index cce8cad71b9f620a3d26946a7df937a1336d741e..ea5db4e66f1cbbb2728558091dc07a413a536e1f 100644 +index a0503e80805d47167cbce9deb848cdf14024f17a..da970c937f75b2048b035d34d977fbe67a428a39 100644 --- a/chrome/browser/speech/tts_controller_delegate_impl.cc +++ b/chrome/browser/speech/tts_controller_delegate_impl.cc -@@ -213,6 +213,7 @@ void TtsControllerDelegateImpl::UpdateUtteranceDefaultsFromPrefs( +@@ -103,6 +103,7 @@ void TtsControllerDelegateImpl::UpdateUtteranceDefaultsFromPrefs( + const PrefService* TtsControllerDelegateImpl::GetPrefService( content::TtsUtterance* utterance) { - const PrefService* prefs = nullptr; +#if 0 // The utterance->GetBrowserContext() is null in tests. - if (utterance->GetBrowserContext()) { - const Profile* profile = -@@ -220,6 +221,7 @@ const PrefService* TtsControllerDelegateImpl::GetPrefService( - if (profile) - prefs = profile->GetPrefs(); - } + if (!utterance->GetBrowserContext()) + return nullptr; +@@ -110,6 +111,8 @@ const PrefService* TtsControllerDelegateImpl::GetPrefService( + const Profile* profile = + Profile::FromBrowserContext(utterance->GetBrowserContext()); + return profile ? profile->GetPrefs() : nullptr; +#endif - return prefs; ++ return nullptr; } + const base::DictionaryValue* TtsControllerDelegateImpl::GetLangToVoicePref( diff --git a/patches/chromium/ui_gtk_public_header.patch b/patches/chromium/ui_gtk_public_header.patch index fb4cbd9c0d5d9..1307ecd09c583 100644 --- a/patches/chromium/ui_gtk_public_header.patch +++ b/patches/chromium/ui_gtk_public_header.patch @@ -6,7 +6,7 @@ Subject: ui_gtk_public_header.patch Allow electron to depend on //ui/gtk/gtk_util.h diff --git a/ui/gtk/BUILD.gn b/ui/gtk/BUILD.gn -index ad23dafe05acd1eabad737a16a4ea86d47ee53c8..0eab0fee9becf33e9337eb0d87f64d33ae123b3b 100644 +index d849743769837288848fd1a6e9ed75127e1a6d1d..bcdc4df20d86ac7f2b9a8a0327dd4d71aced9b20 100644 --- a/ui/gtk/BUILD.gn +++ b/ui/gtk/BUILD.gn @@ -22,13 +22,15 @@ component("gtk_ui_delegate") { diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch index c02ae9078544e..7d6d8c654b2c9 100644 --- a/patches/chromium/web_contents.patch +++ b/patches/chromium/web_contents.patch @@ -9,10 +9,10 @@ is needed for OSR. Originally landed in https://github.com/electron/libchromiumcontent/pull/226. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index d202b4f7fe4dba39c6818cd20e69fa51d90e1f8a..a4f2947ea70dd7135cccefee5214ca7586f4cf31 100644 +index 9ac8c8ea965a33e64a656f4478b217d3e6288597..ca90c21170ff3405efa1da230944faaaf12ce1b4 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -2224,6 +2224,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -2225,6 +2225,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { std::string unique_name; frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name); @@ -25,7 +25,7 @@ index d202b4f7fe4dba39c6818cd20e69fa51d90e1f8a..a4f2947ea70dd7135cccefee5214ca75 WebContentsViewDelegate* delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -2234,6 +2240,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -2235,6 +2241,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { view_.reset(CreateWebContentsView(this, delegate, &render_view_host_delegate_view_)); } @@ -34,7 +34,7 @@ index d202b4f7fe4dba39c6818cd20e69fa51d90e1f8a..a4f2947ea70dd7135cccefee5214ca75 CHECK(view_.get()); diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h -index c0712e442c3beebc9235a364e55e26a34e244642..acf50172508e0b4eb4f38297ab2ca8577d935962 100644 +index 40b5d17d9c73370bc128f5305aaf6ed6711d338a..f2bef5bd135825639201a88c98b68c044618473c 100644 --- a/content/public/browser/web_contents.h +++ b/content/public/browser/web_contents.h @@ -82,8 +82,11 @@ class BrowserContext; diff --git a/patches/chromium/webview_cross_drag.patch b/patches/chromium/webview_cross_drag.patch index 75b7f14094df8..94843102d181e 100644 --- a/patches/chromium/webview_cross_drag.patch +++ b/patches/chromium/webview_cross_drag.patch @@ -8,10 +8,10 @@ This allows dragging and dropping between s. Originally landed in https://github.com/electron/libchromiumcontent/pull/267 diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc -index 3e382a6aaa621f91abd9553b3ba9f77a38dad3bd..6b0706c20367b26258df8990ec393e06ffa12f95 100644 +index b332c568cb33544ef37c8d149ec36127571696bc..92049b3fb017013ad8afb4a7b89d71fba6fe920b 100644 --- a/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc -@@ -784,9 +784,7 @@ gfx::NativeView WebContentsViewAura::GetRenderWidgetHostViewParent() const { +@@ -789,9 +789,7 @@ gfx::NativeView WebContentsViewAura::GetRenderWidgetHostViewParent() const { bool WebContentsViewAura::IsValidDragTarget( RenderWidgetHostImpl* target_rwh) const { diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch index 832fc3ead2a4c..f13278fe544c7 100644 --- a/patches/chromium/worker_context_will_destroy.patch +++ b/patches/chromium/worker_context_will_destroy.patch @@ -10,10 +10,10 @@ An attempt to upstream this was made, but rejected: https://chromium-review.googlesource.com/c/chromium/src/+/1954347 diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h -index 4cc9d55795035e6857f6e4ceb839d056d48c96cd..9d321040de33acac09e83cc582f685740f425009 100644 +index f6d2f50e8d6b4a5df796f2d4478ccd3048101532..d57edc0cea54b9d78700c3b9acdcfcc5f17341dd 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h -@@ -395,6 +395,11 @@ class CONTENT_EXPORT ContentRendererClient { +@@ -397,6 +397,11 @@ class CONTENT_EXPORT ContentRendererClient { virtual void DidInitializeWorkerContextOnWorkerThread( v8::Local context) {} diff --git a/patches/node/64bit_bump_typedarray_max_length_to_2_32-1_elements.patch b/patches/node/64bit_bump_typedarray_max_length_to_2_32-1_elements.patch new file mode 100644 index 0000000000000..ab95b4f2e0340 --- /dev/null +++ b/patches/node/64bit_bump_typedarray_max_length_to_2_32-1_elements.patch @@ -0,0 +1,44 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: John Kleinschmidt +Date: Tue, 28 Jan 2020 12:16:11 -0500 +Subject: Bump TypedArray max length to 2**32-1 elements + +TypedArray max length for 64 bit has been changed to 2**32-1 elements +See: https://source.chromium.org/chromium/_/chromium/v8/v8.git/+/3bff8fa5ea29c0623c0a5601b6fa67c64cbcc319 + +diff --git a/test/parallel/test-buffer-alloc.js b/test/parallel/test-buffer-alloc.js +index de3e7fa52390f0631b93fb4adf2e8a4e31bdc572..eae7533250599cfc649a17c19c8b0fa268155b69 100644 +--- a/test/parallel/test-buffer-alloc.js ++++ b/test/parallel/test-buffer-alloc.js +@@ -8,8 +8,8 @@ const SlowBuffer = require('buffer').SlowBuffer; + // Verify the maximum Uint8Array size. There is no concrete limit by spec. The + // internal limits should be updated if this fails. + assert.throws( +- () => new Uint8Array(2 ** 31), +- { message: 'Invalid typed array length: 2147483648' } ++ () => new Uint8Array(2 ** 32), ++ { message: 'Invalid typed array length: 4294967296' } + ); + + const b = Buffer.allocUnsafe(1024); +diff --git a/test/parallel/test-buffer-over-max-length.js b/test/parallel/test-buffer-over-max-length.js +index b1267b19ff439e344417a85649667facb0d2add7..5a738050eda9c0adad862d318f390af112330c14 100644 +--- a/test/parallel/test-buffer-over-max-length.js ++++ b/test/parallel/test-buffer-over-max-length.js +@@ -10,7 +10,7 @@ const bufferMaxSizeMsg = common.expectsError({ + code: 'ERR_INVALID_OPT_VALUE', + type: RangeError, + message: /^The value "[^"]*" is invalid for option "size"$/ +-}, 12); ++}, 10); + + assert.throws(() => Buffer((-1 >>> 0) + 1), bufferMaxSizeMsg); + assert.throws(() => SlowBuffer((-1 >>> 0) + 1), bufferMaxSizeMsg); +@@ -23,7 +23,3 @@ assert.throws(() => SlowBuffer(kMaxLength + 1), bufferMaxSizeMsg); + assert.throws(() => Buffer.alloc(kMaxLength + 1), bufferMaxSizeMsg); + assert.throws(() => Buffer.allocUnsafe(kMaxLength + 1), bufferMaxSizeMsg); + assert.throws(() => Buffer.allocUnsafeSlow(kMaxLength + 1), bufferMaxSizeMsg); +- +-// issue GH-4331 +-assert.throws(() => Buffer.allocUnsafe(0xFFFFFFFF), bufferMaxSizeMsg); +-assert.throws(() => Buffer.allocUnsafe(0xFFFFFFFFF), bufferMaxSizeMsg); diff --git a/patches/node/chore_split_createenvironment_into_createenvironment_and.patch b/patches/node/chore_split_createenvironment_into_createenvironment_and.patch new file mode 100644 index 0000000000000..3b25d46fe2066 --- /dev/null +++ b/patches/node/chore_split_createenvironment_into_createenvironment_and.patch @@ -0,0 +1,69 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Samuel Attard +Date: Wed, 17 Jul 2019 14:45:59 -0700 +Subject: chore: split CreateEnvironment into CreateEnvironment and + BootstrapEnvironment + +This allows us to run operations on a created but not yet bootstrapped +environment such as setting up an InspectorAgent + +diff --git a/src/api/environment.cc b/src/api/environment.cc +index 356131156b4a714eebf4e202cd105f0f184e3852..96192f0ea4174315d73e03849ce1bed996afc44c 100644 +--- a/src/api/environment.cc ++++ b/src/api/environment.cc +@@ -263,7 +263,8 @@ Environment* CreateEnvironment(IsolateData* isolate_data, + int argc, + const char* const* argv, + int exec_argc, +- const char* const* exec_argv) { ++ const char* const* exec_argv, ++ bool bootstrap) { + Isolate* isolate = context->GetIsolate(); + HandleScope handle_scope(isolate); + Context::Scope context_scope(context); +@@ -281,9 +282,16 @@ Environment* CreateEnvironment(IsolateData* isolate_data, + Environment::kOwnsProcessState | + Environment::kOwnsInspector)); + env->InitializeLibuv(per_process::v8_is_profiling); +- if (env->RunBootstrapping().IsEmpty()) { ++ if (bootstrap && !BootstrapEnvironment(env)) { + return nullptr; + } ++ return env; ++} ++ ++bool BootstrapEnvironment(Environment* env) { ++ if (env->RunBootstrapping().IsEmpty()) { ++ return false; ++ } + + std::vector> parameters = { + env->require_string(), +@@ -296,9 +304,10 @@ Environment* CreateEnvironment(IsolateData* isolate_data, + if (ExecuteBootstrapper( + env, "internal/bootstrap/environment", ¶meters, &arguments) + .IsEmpty()) { +- return nullptr; ++ return false; + } +- return env; ++ ++ return true; + } + + void FreeEnvironment(Environment* env) { +diff --git a/src/node.h b/src/node.h +index e3258434eba34124c71562225e295cd1807fdf7c..2ac35208ae8b2cfd067b5b712d4447121ef6e47d 100644 +--- a/src/node.h ++++ b/src/node.h +@@ -326,7 +326,9 @@ NODE_EXTERN Environment* CreateEnvironment(IsolateData* isolate_data, + int argc, + const char* const* argv, + int exec_argc, +- const char* const* exec_argv); ++ const char* const* exec_argv, ++ bool bootstrap = true); ++NODE_EXTERN bool BootstrapEnvironment(Environment* env); + + NODE_EXTERN void LoadEnvironment(Environment* env); + NODE_EXTERN void FreeEnvironment(Environment* env); diff --git a/patches/node/feat_enable_passing_cli_flags.patch b/patches/node/feat_enable_passing_cli_flags.patch new file mode 100644 index 0000000000000..73e53ae70497c --- /dev/null +++ b/patches/node/feat_enable_passing_cli_flags.patch @@ -0,0 +1,107 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Shelley Vohr +Date: Wed, 13 Nov 2019 15:39:48 +0000 +Subject: feat: enable passing cli flags + +This patches enables passing safelisted cli flags to Node.js. +Upstreamed in https://github.com/nodejs/node/pull/30466. + +diff --git a/src/node.cc b/src/node.cc +index 38c467c7d49589ef5d985ad999fe22d9462f07f6..37c6e9c516da3c1f208c065978c2c044c7ff8dba 100644 +--- a/src/node.cc ++++ b/src/node.cc +@@ -113,8 +113,6 @@ + namespace node { + + using native_module::NativeModuleEnv; +-using options_parser::kAllowedInEnvironment; +-using options_parser::kDisallowedInEnvironment; + + using v8::Boolean; + using v8::EscapableHandleScope; +@@ -645,7 +643,7 @@ void ResetStdio() { + int ProcessGlobalArgs(std::vector* args, + std::vector* exec_args, + std::vector* errors, +- bool is_env) { ++ OptionEnvvarSettings settings) { + // Parse a few arguments which are specific to Node. + std::vector v8_args; + +@@ -655,7 +653,7 @@ int ProcessGlobalArgs(std::vector* args, + exec_args, + &v8_args, + per_process::cli_options.get(), +- is_env ? kAllowedInEnvironment : kDisallowedInEnvironment, ++ settings, + errors); + + if (!errors->empty()) return 9; +@@ -819,7 +817,7 @@ int InitializeNodeWithArgs(std::vector* argv, + return 9; + } + +- const int exit_code = ProcessGlobalArgs(&env_argv, nullptr, errors, true); ++ const int exit_code = ProcessGlobalArgs(&env_argv, nullptr, errors, kAllowedInEnvironment); + if (exit_code != 0) return exit_code; + } + #endif +@@ -827,7 +825,7 @@ int InitializeNodeWithArgs(std::vector* argv, + if (g_upstream_node_mode) { + // NOTE(jeremy): indentation is intentionally wrong here, to ease rebasing. + +- const int exit_code = ProcessGlobalArgs(argv, exec_argv, errors, false); ++ const int exit_code = ProcessGlobalArgs(argv, exec_argv, errors, kDisallowedInEnvironment); + if (exit_code != 0) return exit_code; + + // Set the process.title immediately after processing argv if --title is set. +diff --git a/src/node.h b/src/node.h +index 2ac35208ae8b2cfd067b5b712d4447121ef6e47d..2c085d71d056e89ea57fb738f8acd2c9e1ff539a 100644 +--- a/src/node.h ++++ b/src/node.h +@@ -223,6 +223,16 @@ NODE_EXTERN void Init(int* argc, + int* exec_argc, + const char*** exec_argv); + ++enum OptionEnvvarSettings { ++ kAllowedInEnvironment, ++ kDisallowedInEnvironment ++}; ++ ++NODE_EXTERN int ProcessGlobalArgs(std::vector* args, ++ std::vector* exec_args, ++ std::vector* errors, ++ OptionEnvvarSettings settings); ++ + class NodeArrayBufferAllocator; + + // An ArrayBuffer::Allocator class with some Node.js-specific tweaks. If you do +diff --git a/src/node_options.h b/src/node_options.h +index c0fd198ed3a210640e75d764c795d8f5ab21591b..4a20b732164ab97c9f8175bd517e07622fb73a8f 100644 +--- a/src/node_options.h ++++ b/src/node_options.h +@@ -250,11 +250,6 @@ HostPort SplitHostPort(const std::string& arg, + std::vector* errors); + void GetOptions(const v8::FunctionCallbackInfo& args); + +-enum OptionEnvvarSettings { +- kAllowedInEnvironment, +- kDisallowedInEnvironment +-}; +- + enum OptionType { + kNoOp, + kV8Option, +diff --git a/src/node_worker.cc b/src/node_worker.cc +index ab442a4a34a8c633834abd46fef52baf7d377705..9751dd8c1ea47b76832112cad43af99c881cf382 100644 +--- a/src/node_worker.cc ++++ b/src/node_worker.cc +@@ -16,7 +16,7 @@ + #include + #include + +-using node::options_parser::kDisallowedInEnvironment; ++using node::kDisallowedInEnvironment; + using v8::Array; + using v8::Boolean; + using v8::Context; diff --git a/patches/node/fix_include_libuv_header_in_node_binding.patch b/patches/node/fix_include_libuv_header_in_node_binding.patch new file mode 100644 index 0000000000000..6bc4c4dbae7ab --- /dev/null +++ b/patches/node/fix_include_libuv_header_in_node_binding.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Shelley Vohr +Date: Wed, 8 Jan 2020 12:54:07 -0800 +Subject: fix: include libuv header in node_binding + +The libuv header uv.h was removed in +https://github.com/nodejs/node/commit/3bb085dbad4d23030c731834e35b2804c8a50b23, +but is necessary for Windows to understand what uv_lib_t is. + +Upstreamed in https://github.com/nodejs/node/pull/31265. + +diff --git a/src/node_binding.h b/src/node_binding.h +index cefb6419ebb7f5c5c79927d179eef0a790e234ad..4233ee968fb4b3b5456997cbf1450ecf07392455 100644 +--- a/src/node_binding.h ++++ b/src/node_binding.h +@@ -10,6 +10,7 @@ + #include "node.h" + #define NAPI_EXPERIMENTAL + #include "node_api.h" ++#include "uv.h" + + enum { + NM_F_BUILTIN = 1 << 0, // Unused. diff --git a/patches/node/inherit_electron_crashpad_pipe_name_in_child_process.patch b/patches/node/inherit_electron_crashpad_pipe_name_in_child_process.patch new file mode 100644 index 0000000000000..15a8fec80b233 --- /dev/null +++ b/patches/node/inherit_electron_crashpad_pipe_name_in_child_process.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cheng Zhao +Date: Tue, 4 Jun 2019 17:42:11 +0900 +Subject: Inherit ELECTRON_CRASHPAD_PIPE_NAME in child process + +This is required for crashReporter to work correctly in node process. + +diff --git a/lib/child_process.js b/lib/child_process.js +index d5d97c9da90281e0c24fe97a4914db12d685c7bc..a6d058c92dff927cd2fc6bcb2bb304e9ca497a31 100644 +--- a/lib/child_process.js ++++ b/lib/child_process.js +@@ -107,6 +107,10 @@ function fork(modulePath /* , args, options */) { + options.env = Object.create(options.env || process.env) + options.env.ELECTRON_RUN_AS_NODE = 1; + ++ if (process.platform === 'win32') { ++ options.env.ELECTRON_CRASHPAD_PIPE_NAME = process.env.ELECTRON_CRASHPAD_PIPE_NAME; ++ } ++ + if (!options.execPath && process.type && process.platform == 'darwin') { + options.execPath = process.helperExecPath; + } diff --git a/patches/node/test_use_tmpdir_refresh_in_test-esm-windows_js.patch b/patches/node/test_use_tmpdir_refresh_in_test-esm-windows_js.patch new file mode 100644 index 0000000000000..43bcd6811ac4f --- /dev/null +++ b/patches/node/test_use_tmpdir_refresh_in_test-esm-windows_js.patch @@ -0,0 +1,33 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Richard Lau +Date: Mon, 16 Dec 2019 16:25:31 -0500 +Subject: test: use tmpdir.refresh() in test-esm-windows.js + +Use `tmpdir.refresh()` in `test/es-module/test-esm-windows.js` so +that the temporary directory is cleaned before use and when the test +exits. + +PR-URL: https://github.com/nodejs/node/pull/30997 +Reviewed-By: Denys Otrishko +Reviewed-By: Colin Ihrig +Reviewed-By: Rich Trott +Reviewed-By: Luigi Pinca +Reviewed-By: James M Snell +(cherry picked from commit e23aebc684a45f725811211f9740bcee3bcdbe26) + +diff --git a/test/es-module/test-esm-windows.js b/test/es-module/test-esm-windows.js +index 64ba1249a76c06ee3461b56f7ac69a650e6fbfcc..44af65d6a4e0315b31508cab3183c0142ff0d17c 100644 +--- a/test/es-module/test-esm-windows.js ++++ b/test/es-module/test-esm-windows.js +@@ -15,9 +15,8 @@ const imp = (file) => { + }; + + (async () => { +- const tmp = tmpdir.path; +- await fs.mkdir(tmp).catch(() => {}); +- const rel = (file) => path.join(tmp, file); ++ tmpdir.refresh(); ++ const rel = (file) => path.join(tmpdir.path, file); + + { // Load a single script + const file = rel('con.mjs'); From f975f84a3c63204b3b20fe90e7f38731b59b0aef Mon Sep 17 00:00:00 2001 From: Andy Locascio Date: Thu, 25 Jun 2020 11:29:35 -0700 Subject: [PATCH 04/79] remove chromeos-only TtsControllerDelegate Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2255314 --- chromium_src/BUILD.gn | 7 ------ patches/chromium/.patches | 1 - patches/chromium/tts.patch | 32 ------------------------ shell/browser/electron_browser_client.cc | 13 +++------- shell/browser/electron_browser_client.h | 3 ++- 5 files changed, 5 insertions(+), 51 deletions(-) delete mode 100644 patches/chromium/tts.patch diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn index dd692d7a34b96..97087c4924c5c 100644 --- a/chromium_src/BUILD.gn +++ b/chromium_src/BUILD.gn @@ -153,13 +153,6 @@ static_library("chrome") { } } - if (enable_tts) { - sources += [ - "//chrome/browser/speech/tts_controller_delegate_impl.cc", - "//chrome/browser/speech/tts_controller_delegate_impl.h", - ] - } - if (enable_widevine) { sources += [ "//chrome/renderer/media/chrome_key_systems.cc", diff --git a/patches/chromium/.patches b/patches/chromium/.patches index 8beb52bdeb2cb..c9ffe300436c4 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -44,7 +44,6 @@ notification_provenance.patch content_browser_main_loop.patch dump_syms.patch command-ismediakey.patch -tts.patch printing.patch support_mixed_sandbox_with_zygote.patch fix_disable_usage_of_abort_report_np_in_mas_builds.patch diff --git a/patches/chromium/tts.patch b/patches/chromium/tts.patch deleted file mode 100644 index d3de1fb20a84f..0000000000000 --- a/patches/chromium/tts.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Heilig Benedek -Date: Thu, 18 Oct 2018 17:08:03 -0700 -Subject: tts.patch - -* Adds patch in //chrome/browser/speech/tts_controller_impl.cc - to disable calls using chrome profile class. -* Adds patch in //chrome/browser/speech/tts_message_filter.cc - to remove reference to browser context when its signaled for - destruction from content layer. - -diff --git a/chrome/browser/speech/tts_controller_delegate_impl.cc b/chrome/browser/speech/tts_controller_delegate_impl.cc -index a0503e80805d47167cbce9deb848cdf14024f17a..da970c937f75b2048b035d34d977fbe67a428a39 100644 ---- a/chrome/browser/speech/tts_controller_delegate_impl.cc -+++ b/chrome/browser/speech/tts_controller_delegate_impl.cc -@@ -103,6 +103,7 @@ void TtsControllerDelegateImpl::UpdateUtteranceDefaultsFromPrefs( - - const PrefService* TtsControllerDelegateImpl::GetPrefService( - content::TtsUtterance* utterance) { -+#if 0 - // The utterance->GetBrowserContext() is null in tests. - if (!utterance->GetBrowserContext()) - return nullptr; -@@ -110,6 +111,8 @@ const PrefService* TtsControllerDelegateImpl::GetPrefService( - const Profile* profile = - Profile::FromBrowserContext(utterance->GetBrowserContext()); - return profile ? profile->GetPrefs() : nullptr; -+#endif -+ return nullptr; - } - - const base::DictionaryValue* TtsControllerDelegateImpl::GetLangToVoicePref( diff --git a/shell/browser/electron_browser_client.cc b/shell/browser/electron_browser_client.cc index 35f92bd1a389e..b392d5a690c43 100644 --- a/shell/browser/electron_browser_client.cc +++ b/shell/browser/electron_browser_client.cc @@ -39,6 +39,8 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" +#include "content/public/browser/tts_controller.h" +#include "content/public/browser/tts_platform.h" #include "content/public/common/content_descriptors.h" #include "content/public/common/content_paths.h" #include "content/public/common/content_switches.h" @@ -129,10 +131,6 @@ #include "shell/browser/fake_location_provider.h" #endif // BUILDFLAG(OVERRIDE_LOCATION_PROVIDER) -#if BUILDFLAG(ENABLE_TTS) -#include "chrome/browser/speech/tts_controller_delegate_impl.h" -#endif // BUILDFLAG(ENABLE_TTS) - #if BUILDFLAG(ENABLE_PRINTING) #include "chrome/browser/printing/printing_message_filter.h" #endif // BUILDFLAG(ENABLE_PRINTING) @@ -566,13 +564,8 @@ ElectronBrowserClient::CreateSpeechRecognitionManagerDelegate() { return new ElectronSpeechRecognitionManagerDelegate; } -content::TtsControllerDelegate* -ElectronBrowserClient::GetTtsControllerDelegate() { -#if BUILDFLAG(ENABLE_TTS) - return TtsControllerDelegateImpl::GetInstance(); -#else +content::TtsPlatform* ElectronBrowserClient::GetTtsPlatform() { return nullptr; -#endif } void ElectronBrowserClient::OverrideWebkitPrefs( diff --git a/shell/browser/electron_browser_client.h b/shell/browser/electron_browser_client.h index 36d6257f95832..6968e3d865053 100644 --- a/shell/browser/electron_browser_client.h +++ b/shell/browser/electron_browser_client.h @@ -87,7 +87,8 @@ class ElectronBrowserClient : public content::ContentBrowserClient, void RenderProcessWillLaunch(content::RenderProcessHost* host) override; content::SpeechRecognitionManagerDelegate* CreateSpeechRecognitionManagerDelegate() override; - content::TtsControllerDelegate* GetTtsControllerDelegate() override; + content::TtsPlatform* GetTtsPlatform() override; + void OverrideWebkitPrefs(content::RenderViewHost* render_view_host, content::WebPreferences* prefs) override; SiteInstanceForNavigationType ShouldOverrideSiteInstanceForNavigation( From 5857126fe0e05ab0769f29a40a1b5abae12bbb77 Mon Sep 17 00:00:00 2001 From: Andy Locascio Date: Thu, 25 Jun 2020 11:32:08 -0700 Subject: [PATCH 05/79] SharedUserScriptMaster -> SharedUserScriptManager Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2258357 --- shell/browser/extensions/electron_extension_system.cc | 10 +++++----- shell/browser/extensions/electron_extension_system.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/shell/browser/extensions/electron_extension_system.cc b/shell/browser/extensions/electron_extension_system.cc index d18e31ae36d97..7e51adfd4118f 100644 --- a/shell/browser/extensions/electron_extension_system.cc +++ b/shell/browser/extensions/electron_extension_system.cc @@ -30,7 +30,7 @@ #include "extensions/browser/quota_service.h" #include "extensions/browser/runtime_data.h" #include "extensions/browser/service_worker_manager.h" -#include "extensions/browser/shared_user_script_master.h" +#include "extensions/browser/shared_user_script_manager.h" #include "extensions/browser/value_store/value_store_factory_impl.h" #include "extensions/common/constants.h" #include "extensions/common/file_util.h" @@ -83,8 +83,8 @@ void ElectronExtensionSystem::InitForRegularProfile(bool extensions_enabled) { runtime_data_ = std::make_unique(ExtensionRegistry::Get(browser_context_)); quota_service_ = std::make_unique(); - shared_user_script_master_ = - std::make_unique(browser_context_); + shared_user_script_manager_ = + std::make_unique(browser_context_); app_sorting_ = std::make_unique(); extension_loader_ = std::make_unique(browser_context_); @@ -137,8 +137,8 @@ ServiceWorkerManager* ElectronExtensionSystem::service_worker_manager() { return service_worker_manager_.get(); } -SharedUserScriptMaster* ElectronExtensionSystem::shared_user_script_master() { - return new SharedUserScriptMaster(browser_context_); +SharedUserScriptManager* ElectronExtensionSystem::shared_user_script_manager() { + return new SharedUserScriptManager(browser_context_); } StateStore* ElectronExtensionSystem::state_store() { diff --git a/shell/browser/extensions/electron_extension_system.h b/shell/browser/extensions/electron_extension_system.h index c2c3a208d6567..ea5e07b84330b 100644 --- a/shell/browser/extensions/electron_extension_system.h +++ b/shell/browser/extensions/electron_extension_system.h @@ -60,7 +60,7 @@ class ElectronExtensionSystem : public ExtensionSystem { RuntimeData* runtime_data() override; ManagementPolicy* management_policy() override; ServiceWorkerManager* service_worker_manager() override; - SharedUserScriptMaster* shared_user_script_master() override; + SharedUserScriptManager* shared_user_script_manager() override; StateStore* state_store() override; StateStore* rules_store() override; scoped_refptr store_factory() override; @@ -102,7 +102,7 @@ class ElectronExtensionSystem : public ExtensionSystem { std::unique_ptr service_worker_manager_; std::unique_ptr runtime_data_; std::unique_ptr quota_service_; - std::unique_ptr shared_user_script_master_; + std::unique_ptr shared_user_script_manager_; std::unique_ptr app_sorting_; std::unique_ptr extension_loader_; From ef2f54dbfbf08a4b406b6ac4ce95b333bbe4a82e Mon Sep 17 00:00:00 2001 From: Andy Locascio Date: Thu, 25 Jun 2020 11:53:23 -0700 Subject: [PATCH 06/79] avoid deprecated DISALLOW_COPY_AND_ASSIGN https://groups.google.com/a/chromium.org/forum/#!msg/cxx/qwH2hxaEjac/TUKq6eqfCwAJ --- shell/browser/ui/inspectable_web_contents_view_mac.h | 5 +++-- shell/common/asar/scoped_temporary_file.h | 4 ++-- shell/common/gin_helper/wrappable_base.h | 4 ++-- shell/renderer/api/electron_api_spell_check_client.cc | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/shell/browser/ui/inspectable_web_contents_view_mac.h b/shell/browser/ui/inspectable_web_contents_view_mac.h index cd83588be20fd..c2ab54529bf1f 100644 --- a/shell/browser/ui/inspectable_web_contents_view_mac.h +++ b/shell/browser/ui/inspectable_web_contents_view_mac.h @@ -20,6 +20,9 @@ class InspectableWebContentsViewMac : public InspectableWebContentsView { public: explicit InspectableWebContentsViewMac( InspectableWebContentsImpl* inspectable_web_contents_impl); + InspectableWebContentsViewMac(const InspectableWebContentsViewMac&) = delete; + InspectableWebContentsViewMac& operator=( + const InspectableWebContentsViewMac&) = delete; ~InspectableWebContentsViewMac() override; gfx::NativeView GetNativeView() const override; @@ -41,8 +44,6 @@ class InspectableWebContentsViewMac : public InspectableWebContentsView { InspectableWebContentsImpl* inspectable_web_contents_; base::scoped_nsobject view_; - - DISALLOW_COPY_AND_ASSIGN(InspectableWebContentsViewMac); }; } // namespace electron diff --git a/shell/common/asar/scoped_temporary_file.h b/shell/common/asar/scoped_temporary_file.h index 9aadb1ade77f5..e42a244e12204 100644 --- a/shell/common/asar/scoped_temporary_file.h +++ b/shell/common/asar/scoped_temporary_file.h @@ -20,6 +20,8 @@ namespace asar { class ScopedTemporaryFile { public: ScopedTemporaryFile(); + ScopedTemporaryFile(const ScopedTemporaryFile&) = delete; + ScopedTemporaryFile& operator=(const ScopedTemporaryFile&) = delete; virtual ~ScopedTemporaryFile(); // Init an empty temporary file with a certain extension. @@ -35,8 +37,6 @@ class ScopedTemporaryFile { private: base::FilePath path_; - - DISALLOW_COPY_AND_ASSIGN(ScopedTemporaryFile); }; } // namespace asar diff --git a/shell/common/gin_helper/wrappable_base.h b/shell/common/gin_helper/wrappable_base.h index 40d227f79d117..b8cf200f7fa09 100644 --- a/shell/common/gin_helper/wrappable_base.h +++ b/shell/common/gin_helper/wrappable_base.h @@ -32,6 +32,8 @@ namespace gin_helper { class WrappableBase { public: WrappableBase(); + WrappableBase(const WrappableBase&) = delete; + WrappableBase& operator=(const WrappableBase&) = delete; virtual ~WrappableBase(); // Retrieve the v8 wrapper object cooresponding to this object. @@ -61,8 +63,6 @@ class WrappableBase { const v8::WeakCallbackInfo& data); v8::Isolate* isolate_ = nullptr; - - DISALLOW_COPY_AND_ASSIGN(WrappableBase); }; } // namespace gin_helper diff --git a/shell/renderer/api/electron_api_spell_check_client.cc b/shell/renderer/api/electron_api_spell_check_client.cc index e5529e96d6b3e..6adc795f4199f 100644 --- a/shell/renderer/api/electron_api_spell_check_client.cc +++ b/shell/renderer/api/electron_api_spell_check_client.cc @@ -55,6 +55,8 @@ class SpellCheckClient::SpellcheckRequest { const base::string16& text, std::unique_ptr completion) : text_(text), completion_(std::move(completion)) {} + SpellcheckRequest(const SpellcheckRequest&) = delete; + SpellcheckRequest& operator=(const SpellcheckRequest&) = delete; ~SpellcheckRequest() = default; const base::string16& text() const { return text_; } @@ -66,8 +68,6 @@ class SpellCheckClient::SpellcheckRequest { std::vector word_list_; // List of Words found in text // The interface to send the misspelled ranges to WebKit. std::unique_ptr completion_; - - DISALLOW_COPY_AND_ASSIGN(SpellcheckRequest); }; SpellCheckClient::SpellCheckClient(const std::string& language, From 348b9afad40b1914cde06d6e2986731ba5a01702 Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Thu, 25 Jun 2020 06:01:02 -0700 Subject: [PATCH 07/79] chore: bump chromium in DEPS to b2eaf9ff4e6b03267bf279583ea20ceb2b25e9d0 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 41e90f530fc9c..1a8f1bef616a4 100644 --- a/DEPS +++ b/DEPS @@ -13,7 +13,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - '83da426e53d423f0530fc23433b6d2c4d0548442', + 'b2eaf9ff4e6b03267bf279583ea20ceb2b25e9d0', 'node_version': 'v12.18.1', 'nan_version': From 450e54606e189ff5c56b140cf65aa17913255089 Mon Sep 17 00:00:00 2001 From: Andy Locascio Date: Thu, 25 Jun 2020 16:48:29 -0700 Subject: [PATCH 08/79] update patches --- ...client_precreatemessageloop_callback.patch | 4 +- ...rustedauthclient_to_urlloaderfactory.patch | 12 +- ..._secondary_label_via_simplemenumodel.patch | 10 +- patches/chromium/blink_world_context.patch | 2 +- patches/chromium/build_gn.patch | 2 +- patches/chromium/can_create_window.patch | 20 ++-- ...esources_not_chrome_for_spellchecker.patch | 4 +- patches/chromium/dcheck.patch | 6 +- ...xpose_setuseragent_on_networkcontext.patch | 8 +- ...dd_set_theme_source_to_allow_apps_to.patch | 6 +- ..._scheduler_throttling_per_renderview.patch | 10 +- ...screen_rendering_with_viz_compositor.patch | 2 +- ...ns_through_the_web_contents_delegate.patch | 2 +- patches/chromium/frame_host_manager.patch | 14 +-- .../chromium/gritsettings_resource_ids.patch | 4 +- .../mas_disable_custom_window_frame.patch | 6 +- .../mas_disable_remote_accessibility.patch | 2 +- .../chromium/mas_disable_remote_layer.patch | 8 +- patches/chromium/mas_no_private_api.patch | 10 +- ...emote_certificate_verification_logic.patch | 20 ++-- patches/chromium/printing.patch | 8 +- ...r_changes_to_the_webcontentsobserver.patch | 6 +- patches/chromium/ui_gtk_public_header.patch | 2 +- patches/chromium/web_contents.patch | 2 +- .../worker_context_will_destroy.patch | 12 +- ...darray_max_length_to_2_32-1_elements.patch | 44 ------- ...vironment_into_createenvironment_and.patch | 69 ----------- .../node/feat_enable_passing_cli_flags.patch | 107 ------------------ ...include_libuv_header_in_node_binding.patch | 23 ---- ..._crashpad_pipe_name_in_child_process.patch | 22 ---- ...mpdir_refresh_in_test-esm-windows_js.patch | 33 ------ patches/v8/add_realloc.patch | 6 +- patches/v8/build_gn.patch | 6 +- patches/v8/dcheck.patch | 8 +- ...export_private_v8_symbols_on_windows.patch | 2 +- patches/v8/expose_mksnapshot.patch | 4 +- 36 files changed, 104 insertions(+), 402 deletions(-) delete mode 100644 patches/node/64bit_bump_typedarray_max_length_to_2_32-1_elements.patch delete mode 100644 patches/node/chore_split_createenvironment_into_createenvironment_and.patch delete mode 100644 patches/node/feat_enable_passing_cli_flags.patch delete mode 100644 patches/node/fix_include_libuv_header_in_node_binding.patch delete mode 100644 patches/node/inherit_electron_crashpad_pipe_name_in_child_process.patch delete mode 100644 patches/node/test_use_tmpdir_refresh_in_test-esm-windows_js.patch diff --git a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch index da1e6c893fef7..fca1f1de0f4d2 100644 --- a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch +++ b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch @@ -10,7 +10,7 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set. This should be upstreamed. diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc -index bf8c86b08240dd6a229acd44305435fe8b964bc2..bf6a3ee6aa6fc30e6f2096c9354414ada2ca9bfc 100644 +index 826755d4d1ded89ab2b2f873f2ac0d4a38183089..9151dbcf31b6c8adedcae27e0628b51d6d6e7681 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -256,6 +256,10 @@ int GpuMain(const MainFunctionParams& parameters) { @@ -24,7 +24,7 @@ index bf8c86b08240dd6a229acd44305435fe8b964bc2..bf6a3ee6aa6fc30e6f2096c9354414ad // We are experiencing what appear to be memory-stomp issues in the GPU // process. These issues seem to be impacting the task executor and listeners // registered to it. Create the task executor on the heap to guard against -@@ -375,7 +379,6 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -390,7 +394,6 @@ int GpuMain(const MainFunctionParams& parameters) { } #endif diff --git a/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch b/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch index 39a20aa38ad2e..e4f38e268bfc9 100644 --- a/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch +++ b/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch @@ -49,10 +49,10 @@ index 6d15b6b5ff7b36b85f6b8200b76a32b285f0e675..c21234572976a6de7db5b0f2f7f44ec7 // the per-context allow patterns that is managed via NetworkContext // interface. This still respects the per-context block lists. diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc -index 80dc1f91fd4051dc054f1c9e9a5ab0087c4d66fd..4eec90182ae4944f219e12ff2673d0fbd24e112d 100644 +index 628b38e9db47f9730aebd5dfe9c785ceea28ea0a..6007a8f2d350b8951ba5f2ce910813f044bcf381 100644 --- a/services/network/url_loader.cc +++ b/services/network/url_loader.cc -@@ -437,6 +437,7 @@ URLLoader::URLLoader( +@@ -470,6 +470,7 @@ URLLoader::URLLoader( base::WeakPtr keepalive_statistics_recorder, base::WeakPtr network_usage_accumulator, mojom::TrustedURLLoaderHeaderClient* url_loader_header_client, @@ -60,7 +60,7 @@ index 80dc1f91fd4051dc054f1c9e9a5ab0087c4d66fd..4eec90182ae4944f219e12ff2673d0fb mojom::OriginPolicyManager* origin_policy_manager, std::unique_ptr trust_token_helper_factory, mojo::PendingRemote cookie_observer) -@@ -497,6 +498,11 @@ URLLoader::URLLoader( +@@ -533,6 +534,11 @@ URLLoader::URLLoader( header_client_.set_disconnect_handler( base::BindOnce(&URLLoader::OnMojoDisconnect, base::Unretained(this))); } @@ -72,7 +72,7 @@ index 80dc1f91fd4051dc054f1c9e9a5ab0087c4d66fd..4eec90182ae4944f219e12ff2673d0fb if (want_raw_headers_) { options_ |= mojom::kURLLoadOptionSendSSLInfoWithResponse | mojom::kURLLoadOptionSendSSLInfoForCertificateError; -@@ -1016,7 +1022,7 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request, +@@ -1056,7 +1062,7 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request, // |this| may have been deleted. return; } @@ -81,7 +81,7 @@ index 80dc1f91fd4051dc054f1c9e9a5ab0087c4d66fd..4eec90182ae4944f219e12ff2673d0fb OnAuthCredentials(base::nullopt); return; } -@@ -1032,11 +1038,20 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request, +@@ -1072,11 +1078,20 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request, if (url_request->response_headers()) head->headers = url_request->response_headers(); head->auth_challenge_info = auth_info; @@ -108,7 +108,7 @@ index 80dc1f91fd4051dc054f1c9e9a5ab0087c4d66fd..4eec90182ae4944f219e12ff2673d0fb auth_challenge_responder_receiver_.set_disconnect_handler( base::BindOnce(&URLLoader::DeleteSelf, base::Unretained(this))); diff --git a/services/network/url_loader.h b/services/network/url_loader.h -index f5436f10a312c713e95fac4670eab3edf048a742..02212de14459ee6cd15492e7b35cd2791f48205c 100644 +index 33e6b100ef3ebfea62a9445bb8aa4b45034f7f25..b70780428d056e5306e215ba7d86a2e729ffaeda 100644 --- a/services/network/url_loader.h +++ b/services/network/url_loader.h @@ -115,6 +115,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader diff --git a/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch b/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch index 10fe0cb906ebd..13ee77b28663e 100644 --- a/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch +++ b/patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch @@ -6,7 +6,7 @@ Subject: Allow setting secondary label via SimpleMenuModel Builds on https://chromium-review.googlesource.com/c/chromium/src/+/2208976 diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc -index 88053e9d501413d18b6a6ae36b76668431db7ee9..481a04c4835d246cfa20edfc4f1dd10ce93fcdb8 100644 +index 1fc029cb37562dc32a961666c3af3b0c27b04e5a..e1c6fe2ea2c3c89e10ff4ae27d16baf053e8a3a0 100644 --- a/ui/base/models/simple_menu_model.cc +++ b/ui/base/models/simple_menu_model.cc @@ -49,6 +49,11 @@ base::string16 SimpleMenuModel::Delegate::GetLabelForCommandId( @@ -33,7 +33,7 @@ index 88053e9d501413d18b6a6ae36b76668431db7ee9..481a04c4835d246cfa20edfc4f1dd10c void SimpleMenuModel::SetMinorText(int index, const base::string16& minor_text) { items_[ValidateItemIndex(index)].minor_text = minor_text; -@@ -364,6 +374,12 @@ base::string16 SimpleMenuModel::GetLabelAt(int index) const { +@@ -368,6 +378,12 @@ base::string16 SimpleMenuModel::GetLabelAt(int index) const { return items_[ValidateItemIndex(index)].label; } @@ -47,7 +47,7 @@ index 88053e9d501413d18b6a6ae36b76668431db7ee9..481a04c4835d246cfa20edfc4f1dd10c return items_[ValidateItemIndex(index)].minor_text; } diff --git a/ui/base/models/simple_menu_model.h b/ui/base/models/simple_menu_model.h -index 92975ff7dc5c5ca217717da6faa0042467076005..84cf58456cd8a879dbf5940737713027057546cd 100644 +index 3067f9beba9e79e18d341aea052d82aad34039d0..ffd8d7c53378b490e54af430371dc8a44121f72b 100644 --- a/ui/base/models/simple_menu_model.h +++ b/ui/base/models/simple_menu_model.h @@ -44,6 +44,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel { @@ -68,7 +68,7 @@ index 92975ff7dc5c5ca217717da6faa0042467076005..84cf58456cd8a879dbf5940737713027 // Sets the minor text for the item at |index|. void SetMinorText(int index, const base::string16& minor_text); -@@ -173,6 +177,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel { +@@ -176,6 +180,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel { ui::MenuSeparatorType GetSeparatorTypeAt(int index) const override; int GetCommandIdAt(int index) const override; base::string16 GetLabelAt(int index) const override; @@ -76,7 +76,7 @@ index 92975ff7dc5c5ca217717da6faa0042467076005..84cf58456cd8a879dbf5940737713027 base::string16 GetMinorTextAt(int index) const override; ImageModel GetMinorIconAt(int index) const override; bool IsItemDynamicAt(int index) const override; -@@ -207,6 +212,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel { +@@ -211,6 +216,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel { int command_id = 0; ItemType type = TYPE_COMMAND; base::string16 label; diff --git a/patches/chromium/blink_world_context.patch b/patches/chromium/blink_world_context.patch index 840affe807c11..8e0fec36b5fa0 100644 --- a/patches/chromium/blink_world_context.patch +++ b/patches/chromium/blink_world_context.patch @@ -20,7 +20,7 @@ index be5efdc896fd9318b50c9e5ad02ec404ba7be23d..79234d0def2d4e97e05a03ecb1dbd7b0 // Executes script in the context of the current page and returns the value // that the script evaluated to with callback. Script execution can be 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 ad206e51535ebf3e44de6dcfa98c2ba28e67e825..08bc2ce2f6cc938c22172ee03eeb807d3a4a2fd9 100644 +index b94a424b644e5ccb2214499e708187427e80c701..9460471d34336f7b33c2e368f0da393d2a180edf 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 @@ -967,6 +967,13 @@ v8::Local WebLocalFrameImpl::GlobalProxy() const { diff --git a/patches/chromium/build_gn.patch b/patches/chromium/build_gn.patch index 645d0ff8ce633..a53e1df449b08 100644 --- a/patches/chromium/build_gn.patch +++ b/patches/chromium/build_gn.patch @@ -14,7 +14,7 @@ tradeoff is that switching from MAS_BUILD to !MAS_BUILD or vice-versa will rebuild the entire tree. diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn -index 33416d571f2d2a672daf62be21bfb97dfc998b51..a1f21871c1806857723d3a421e5ef3917d7f1ef0 100644 +index 4cc6bfc45e647e656934b331793faef1ba0f4b14..b585c11f9b43bfd9f0d79dc5103fd844224e3586 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -123,6 +123,9 @@ if (current_os == "") { diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index 884a82c79bfff..dd74889aff564 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -9,10 +9,10 @@ potentially prevent a window from being created. TODO(loc): this patch is currently broken. diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc -index 33869e7bf3aa6dd404f8413b817e544fb404bb43..98cfc99a3c917f9b6e7bc3b5c19479b81c114489 100644 +index 012615782c6aba669cb973945e2603b70e548173..b456378b2d1414720b285a6f18fe71adb8e1e6d6 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc -@@ -4809,6 +4809,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -4787,6 +4787,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, @@ -21,7 +21,7 @@ index 33869e7bf3aa6dd404f8413b817e544fb404bb43..98cfc99a3c917f9b6e7bc3b5c19479b8 &no_javascript_access); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 33072ecef6bcfb751ce81cf46e2609bddcca065b..1f5f7f217a7cb4013f6bfbb380b2b81214cc92b0 100644 +index 1afd8ac2c2cf78efa1386b89227e4a5d2ca0ce60..4a576f48e677c7d91726e9c59dd4a24a4d64c792 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -3087,9 +3087,9 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow( @@ -53,10 +53,10 @@ index 322e2f0f4f023cd2e34163f623c5b52eaad51c1d..46ae29207c804ae3474ae3a3dd8f76de // 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 329c797f5a5259e0862c115a5cf755a04db1a149..10ae2cc43cef72cbfa58b650852d0113083ad059 100644 +index c5e90f4e5e706b84f5a5eec537f5c6886986a28b..b2b0acfbfe0ee0d808ec973164b85eedd20eee00 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc -@@ -529,6 +529,8 @@ bool ContentBrowserClient::CanCreateWindow( +@@ -524,6 +524,8 @@ bool ContentBrowserClient::CanCreateWindow( const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -66,10 +66,10 @@ index 329c797f5a5259e0862c115a5cf755a04db1a149..10ae2cc43cef72cbfa58b650852d0113 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 d17c01ae4dc40e57eb190329dd05354016786141..2e50dfaeb1e97679ca84d3dd6daed121071ec013 100644 +index 45900c9a9ef7d482af769fb2b95a5a6614ab400e..5fb6724a95d9fde9cae15da9de2b307fc1c1f3a5 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -146,6 +146,7 @@ class NetworkService; +@@ -147,6 +147,7 @@ class NetworkService; class TrustedURLLoaderHeaderClient; } // namespace mojom struct ResourceRequest; @@ -77,7 +77,7 @@ index d17c01ae4dc40e57eb190329dd05354016786141..2e50dfaeb1e97679ca84d3dd6daed121 } // namespace network namespace sandbox { -@@ -848,6 +849,8 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -841,6 +842,8 @@ class CONTENT_EXPORT ContentBrowserClient { const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -206,10 +206,10 @@ index 4f735ad0d97eaac9a57dad137e479f8a7ec33a36..0a3c5821962c85609b64b3625fa6b8d6 } // namespace blink diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc -index fe54120a9d4166c54311871ff54792ff6e5549b1..1c642c798179c477dab5f5a66a810c5047640162 100644 +index 6da6ad8caf756e8a0f8d6ba4974f6f44a85fe43d..73694633e84c76dcb54cf92c11e018cee1853007 100644 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc -@@ -1985,6 +1985,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, +@@ -2001,6 +2001,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, } WebWindowFeatures window_features = GetWindowFeaturesFromString(features); diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch index 1e017594efd9c..aba813b3325a9 100644 --- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch +++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch @@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from Electrons grit header instead of Chromes diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 5bea95b8f8f37c2d361577fb6ef6c50d40b98eb2..f445c96fef1a75fb90bee9a49d982a4466ac41b3 100644 +index 875c5f8c82019178ee94c1ea01bf932f55e4b445..d27e13d91a8bbc978448bf5e9064e099845cfdae 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -5500,6 +5500,7 @@ static_library("browser") { +@@ -5507,6 +5507,7 @@ static_library("browser") { deps += [ "//components/spellcheck/browser", "//components/spellcheck/common", diff --git a/patches/chromium/dcheck.patch b/patches/chromium/dcheck.patch index b2007195db5ff..66acf92ec3cd5 100644 --- a/patches/chromium/dcheck.patch +++ b/patches/chromium/dcheck.patch @@ -17,7 +17,7 @@ only one or two specific checks fail. Then it's better to simply comment out the failing checks and allow the rest of the target to have them enabled. diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc -index 92ab6517792a02f33803accbe12cdfc9202dabcf..b0c5b3c29e778655e9c6393299ef8e358c257709 100644 +index ca15b62e8a8d2b889355a00ba4ea9644a056974c..2fb8ecfa7e979c05c8377433f920036a3e670fda 100644 --- a/content/browser/frame_host/navigation_controller_impl.cc +++ b/content/browser/frame_host/navigation_controller_impl.cc @@ -1267,8 +1267,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation( @@ -46,10 +46,10 @@ index 92ab6517792a02f33803accbe12cdfc9202dabcf..b0c5b3c29e778655e9c6393299ef8e35 // navigation. Now we know that the renderer has updated its state accordingly // and it is safe to also clear the browser side history. diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc -index 9bfabd34eabcaf893b674e74e540f9258f1730bb..ea6e9f7b7161f9e3afa463fb8114479d3d10eb6b 100644 +index 421f22eaaf6dbb90c8e3a4bb78d9d017bac8db94..959666ba60c97e0c2f082867c8ebd77de45d8788 100644 --- a/ui/base/clipboard/clipboard_win.cc +++ b/ui/base/clipboard/clipboard_win.cc -@@ -773,10 +773,10 @@ SkBitmap ClipboardWin::ReadImageInternal(ClipboardBuffer buffer) const { +@@ -782,10 +782,10 @@ SkBitmap ClipboardWin::ReadImageInternal(ClipboardBuffer buffer) const { void ClipboardWin::WriteToClipboard(ClipboardFormatType format, HANDLE handle) { UINT cf_format = format.ToFormatEtc().cfFormat; diff --git a/patches/chromium/expose_setuseragent_on_networkcontext.patch b/patches/chromium/expose_setuseragent_on_networkcontext.patch index e623cdc499182..db6b8ba04d3a6 100644 --- a/patches/chromium/expose_setuseragent_on_networkcontext.patch +++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch @@ -33,10 +33,10 @@ index 0ccfe130f00ec3b6c75cd8ee04d5a2777e1fd00c..653829457d58bf92057cc36aa8a28970 DISALLOW_COPY_AND_ASSIGN(StaticHttpUserAgentSettings); }; diff --git a/services/network/network_context.cc b/services/network/network_context.cc -index a07176cf0fd3c7160922e7f9919e775cb3b6fe71..5d59a8cc4fec91de95ddbb90dab1df9334081fac 100644 +index 170ba3cf6176e8423b6009a0ac0299bf1e411158..14f8cb99631232cc225026c345e95df2b548bcff 100644 --- a/services/network/network_context.cc +++ b/services/network/network_context.cc -@@ -1036,6 +1036,13 @@ void NetworkContext::SetNetworkConditions( +@@ -1035,6 +1035,13 @@ void NetworkContext::SetNetworkConditions( std::move(network_conditions)); } @@ -51,10 +51,10 @@ index a07176cf0fd3c7160922e7f9919e775cb3b6fe71..5d59a8cc4fec91de95ddbb90dab1df93 // This may only be called on NetworkContexts created with the constructor // that calls MakeURLRequestContext(). diff --git a/services/network/network_context.h b/services/network/network_context.h -index dd65d1560daa8fde7d76e0dec8e1cdcb6c76b318..042f62dafcb027f0a65318d09dfadf751c792329 100644 +index 391a02c108debdd5e5572b4a666d30dc68ece76b..0d9c4cce09db485b5e750921eed703c75ffdf15a 100644 --- a/services/network/network_context.h +++ b/services/network/network_context.h -@@ -243,6 +243,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -242,6 +242,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext void CloseIdleConnections(CloseIdleConnectionsCallback callback) override; void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id, mojom::NetworkConditionsPtr conditions) override; diff --git a/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch b/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch index 8d2f0a48144f6..f3dc9e9da87db 100644 --- a/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch +++ b/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch @@ -13,7 +13,7 @@ uses internally for things like menus and devtools. We can remove this patch once it has in some shape been upstreamed. diff --git a/ui/native_theme/native_theme.cc b/ui/native_theme/native_theme.cc -index 119c6ba8f0318c398a1020cab5f0c55d387d4ed6..74b47875a042f9a5189dc4a7ade36c0cb3d1b5a6 100644 +index 150f4455d497c6e1ac84948eac088c9dc3a4d729..84a4d6dfc33ae7ba7e21efc5f38405e24749edd6 100644 --- a/ui/native_theme/native_theme.cc +++ b/ui/native_theme/native_theme.cc @@ -247,6 +247,8 @@ NativeTheme::NativeTheme(bool should_use_dark_colors) @@ -26,7 +26,7 @@ index 119c6ba8f0318c398a1020cab5f0c55d387d4ed6..74b47875a042f9a5189dc4a7ade36c0c } diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h -index 9ecc4540915100ff61e310d4c60bf91d75d0c588..8dfd9699f569e7fa0426492f881228ae8df9d376 100644 +index f4e9cc14b0b8406d255bbed56d98dcf61f24a405..e1b9298532b2676aa4d9cdacb15e9398be3ccc3f 100644 --- a/ui/native_theme/native_theme.h +++ b/ui/native_theme/native_theme.h @@ -392,6 +392,22 @@ class NATIVE_THEME_EXPORT NativeTheme { @@ -52,7 +52,7 @@ index 9ecc4540915100ff61e310d4c60bf91d75d0c588..8dfd9699f569e7fa0426492f881228ae // Returns a shared instance of the native theme that should be used for web // rendering. Do not use it in a normal application context (i.e. browser). // The returned object should not be deleted by the caller. This function is -@@ -526,6 +542,8 @@ class NATIVE_THEME_EXPORT NativeTheme { +@@ -527,6 +543,8 @@ class NATIVE_THEME_EXPORT NativeTheme { bool is_high_contrast_ = false; PreferredColorScheme preferred_color_scheme_ = PreferredColorScheme::kLight; diff --git a/patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch index cdc174d948060..b803a4b6b12be 100644 --- a/patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch +++ b/patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch @@ -6,7 +6,7 @@ Subject: feat: allow disabling blink scheduler throttling per RenderView This allows us to disable throttling for hidden windows. diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc -index 9a2cc0f076406d68910eeb5351e3869287515fcb..bde2f593f55edc677d44f4ae037042fe10661679 100644 +index f2c4cbf786188b8aa5dad1e7f2b8ae9c785aaed9..2882ef3371960cc914ac27e9b6eedd09ff34cb63 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -512,6 +512,10 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) { @@ -21,7 +21,7 @@ index 9a2cc0f076406d68910eeb5351e3869287515fcb..bde2f593f55edc677d44f4ae037042fe return is_active(); } diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h -index af15805b34d2cc038e73654017d4c0921e3fc321..3489f03bac1283efb6a27f5b959a72a8e5d0cb14 100644 +index c0943cbdd019a37474e1727b8282b7138475e74f..cb58b299976745edb6e3f0d13687301b7fc61a10 100644 --- a/content/browser/renderer_host/render_view_host_impl.h +++ b/content/browser/renderer_host/render_view_host_impl.h @@ -110,6 +110,7 @@ class CONTENT_EXPORT RenderViewHostImpl @@ -111,10 +111,10 @@ index baa1cec07522a23221b146165a638d3f679f9817..50f0c46c8fcbb4ee8ebb316f859f84d0 // Visibility ----------------------------------------------------------- diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc -index 94fb9863a6da4c049e45ec5966ef79d9c8e42b75..31d05575e2688178532b1ee9831236013159965c 100644 +index 27adaed62fe204202b4716cd573165b7456dbd29..56434ba48eb3af50ea965e24338dd70780952f19 100644 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -3366,6 +3366,13 @@ PageScheduler* WebViewImpl::Scheduler() const { +@@ -3368,6 +3368,13 @@ PageScheduler* WebViewImpl::Scheduler() const { return GetPage()->GetPageScheduler(); } @@ -128,7 +128,7 @@ index 94fb9863a6da4c049e45ec5966ef79d9c8e42b75..31d05575e2688178532b1ee983123601 void WebViewImpl::SetVisibilityState( mojom::blink::PageVisibilityState visibility_state, bool is_initial_state) { -@@ -3376,7 +3383,8 @@ void WebViewImpl::SetVisibilityState( +@@ -3378,7 +3385,8 @@ void WebViewImpl::SetVisibilityState( } GetPage()->SetVisibilityState(visibility_state, is_initial_state); GetPage()->GetPageScheduler()->SetPageVisible( diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch index 8d2bd27ae12ca..f0fd5d24ab771 100644 --- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch +++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch @@ -94,7 +94,7 @@ index 1026b739d283f0fc252fa2af83a6d4cf51bc8553..fe562ab60ce98b8bb0c5080a6428deb3 private: const HWND hwnd_; diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn -index 8c4f933b32420d2cfc40d5bc5883fda61636b52a..6f2322736e570b1e994a4f0c39396261cb8a6f58 100644 +index 7b6f69e3dcceab02039aa08afd5f4d10b277864e..34ae6a515894c679f13663ce1ef608ec5429c5b6 100644 --- a/components/viz/service/BUILD.gn +++ b/components/viz/service/BUILD.gn @@ -111,6 +111,8 @@ viz_component("service") { diff --git a/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch b/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch index b98b871c815bf..f50bc63a05586 100644 --- a/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch +++ b/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch @@ -13,7 +13,7 @@ This patch can be removed once app.allowRendererProcessReuse is forced to true as then Chromiums assumptions around processes become correct. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 1f5f7f217a7cb4013f6bfbb380b2b81214cc92b0..9ac8c8ea965a33e64a656f4478b217d3e6288597 100644 +index 4a576f48e677c7d91726e9c59dd4a24a4d64c792..ee336b57fa13ec611b4591cb8147ec8f29f162e2 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -2492,11 +2492,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) { diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index 21b8b8c416c35..f00038782466b 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -106,10 +106,10 @@ index 6941326796bb7e7b056ae0f83345edb2e4cb0479..8e8e1e6d994809159cf0433a4feeec85 READY_TO_COMMIT, diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc -index b6f81430796a820992abc7dd81202853b9f6ed7f..c646423abc241e23252f5857abafcf44397c2c42 100644 +index 4d39ae3c17ee807b744dc4e8406c55fc623a779d..28acc2401ec7fc035c2548e633847fd297fb88a4 100644 --- a/content/browser/frame_host/render_frame_host_manager.cc +++ b/content/browser/frame_host/render_frame_host_manager.cc -@@ -2305,6 +2305,16 @@ bool RenderFrameHostManager::InitRenderView( +@@ -2304,6 +2304,16 @@ bool RenderFrameHostManager::InitRenderView( scoped_refptr RenderFrameHostManager::GetSiteInstanceForNavigationRequest( NavigationRequest* request) { @@ -126,7 +126,7 @@ index b6f81430796a820992abc7dd81202853b9f6ed7f..c646423abc241e23252f5857abafcf44 SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance(); // All children of MHTML documents must be MHTML documents. They all live in -@@ -2324,10 +2334,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( +@@ -2323,10 +2333,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( // // TODO(clamy): We should also consider as a candidate SiteInstance the // speculative SiteInstance that was computed on redirects. @@ -191,7 +191,7 @@ index b6f81430796a820992abc7dd81202853b9f6ed7f..c646423abc241e23252f5857abafcf44 // Account for renderer-initiated reload as well. // Needed as a workaround for https://crbug.com/1045524, remove it when it is -@@ -2357,6 +2417,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( +@@ -2356,6 +2416,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( request->ResetStateForSiteInstanceChange(); } @@ -229,7 +229,7 @@ index 571e6381f2456450a07b64c3a84d1f15f4cbbefa..cb342a6c4915c4b2cc7fe0c1b3c7219f size_t GetRelatedActiveContentsCount() override; bool RequiresDedicatedProcess() override; diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc -index 10ae2cc43cef72cbfa58b650852d0113083ad059..58047cefa66435237bc8b63be240fad5dbe4b78c 100644 +index b2b0acfbfe0ee0d808ec973164b85eedd20eee00..81d624692ee9692c5a1d860eaac655ff2d5ff8d4 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -59,6 +59,21 @@ @@ -255,10 +255,10 @@ index 10ae2cc43cef72cbfa58b650852d0113083ad059..58047cefa66435237bc8b63be240fad5 const MainFunctionParams& parameters) { return nullptr; diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 2e50dfaeb1e97679ca84d3dd6daed121071ec013..fd04397b43eecb3342b79b4cc5a13f54d39ba13c 100644 +index 5fb6724a95d9fde9cae15da9de2b307fc1c1f3a5..004ff58ca6fcfcf4491dd90dc4ea29c5992a48da 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -239,8 +239,45 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -240,8 +240,45 @@ class CONTENT_EXPORT ContentBrowserClient { using IsClipboardPasteAllowedCallback = base::OnceCallback; diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch index d77b92840a9a5..e25d12774dc6b 100644 --- a/patches/chromium/gritsettings_resource_ids.patch +++ b/patches/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.spec b/tools/gritsettings/resource_ids.spec -index 8dbdb572647ce6e07f509778ecea43a05aaaf3c0..6d315c4673d6b7c87f4211a29cafad2b9df81c4c 100644 +index fa2306ead7d2b70e41be750408e386bd452b99cc..9985c129afd87ed546baddae598881418ee502bf 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec -@@ -636,6 +636,11 @@ +@@ -649,6 +649,11 @@ "includes": [3880], }, diff --git a/patches/chromium/mas_disable_custom_window_frame.patch b/patches/chromium/mas_disable_custom_window_frame.patch index c617b637c2f52..036715ab57616 100644 --- a/patches/chromium/mas_disable_custom_window_frame.patch +++ b/patches/chromium/mas_disable_custom_window_frame.patch @@ -7,7 +7,7 @@ Disable private window frame APIs (NSNextStepFrame and NSThemeFrame) for MAS build. diff --git a/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm b/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm -index b52df712266ca390593d304936f0b979503af3ad..62ded794bd83963f681eb6a0b698228bf4e89ce5 100644 +index b02eda676ce4fbab772206df46689803556edceb..4d87ca8f05fed639faeb0c72f666fb26074a3bbb 100644 --- a/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm +++ b/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm @@ -9,6 +9,7 @@ @@ -27,7 +27,7 @@ index b52df712266ca390593d304936f0b979503af3ad..62ded794bd83963f681eb6a0b698228b @implementation BrowserNativeWidgetWindow // Prevent detached tabs from glitching when the window is partially offscreen. -@@ -82,6 +85,7 @@ +@@ -84,6 +87,7 @@ // NSWindow (PrivateAPI) overrides. @@ -35,7 +35,7 @@ index b52df712266ca390593d304936f0b979503af3ad..62ded794bd83963f681eb6a0b698228b + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle { // - NSThemeFrame and its subclasses will be nil if it's missing at runtime. if ([BrowserWindowFrame class]) -@@ -96,6 +100,8 @@ +@@ -98,6 +102,8 @@ return NO; } diff --git a/patches/chromium/mas_disable_remote_accessibility.patch b/patches/chromium/mas_disable_remote_accessibility.patch index b01b403369d85..2b630d873aad8 100644 --- a/patches/chromium/mas_disable_remote_accessibility.patch +++ b/patches/chromium/mas_disable_remote_accessibility.patch @@ -170,7 +170,7 @@ index 026bb184e3ecf21185900d3102fbbdb4bc9e1100..aef2f3625465d5de36d0ce496f713386 /////////////////////////////////////////////////////////////////////////////// diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn -index 3241093ca37134435507b6cfb7d9663317563860..aace5b11a419cdbb0e257dd3ba2329e9ea013c6a 100644 +index 1179753aeffe325bc35ee6a730b0a6fde269e909..097ed19949105ad80edc0750c7241697ba87dfe6 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn @@ -311,6 +311,13 @@ jumbo_component("base") { diff --git a/patches/chromium/mas_disable_remote_layer.patch b/patches/chromium/mas_disable_remote_layer.patch index 0286790ddcb00..35f24f47c2e66 100644 --- a/patches/chromium/mas_disable_remote_layer.patch +++ b/patches/chromium/mas_disable_remote_layer.patch @@ -17,7 +17,7 @@ cases where performance improves when disabling remote CoreAnimation (remote CoreAnimation is really only about battery usage). diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.h b/gpu/ipc/service/image_transport_surface_overlay_mac.h -index 3307998ec566e24a9050434af4e6e3bb09557d43..456603c97bfc2214b0d08fecd592ff1e2c26ceb6 100644 +index d565d2ab23d7a42e6787b58103fd40a8675b8e28..4cb9681c1f810a0cbd7f7ef04c4a7c73ca10c2b0 100644 --- a/gpu/ipc/service/image_transport_surface_overlay_mac.h +++ b/gpu/ipc/service/image_transport_surface_overlay_mac.h @@ -20,7 +20,9 @@ @@ -30,7 +30,7 @@ index 3307998ec566e24a9050434af4e6e3bb09557d43..456603c97bfc2214b0d08fecd592ff1e @class CALayer; namespace ui { -@@ -111,7 +113,9 @@ class ImageTransportSurfaceOverlayMacBase : public BaseClass, +@@ -116,7 +118,9 @@ class ImageTransportSurfaceOverlayMacBase : public BaseClass, base::WeakPtr delegate_; bool use_remote_layer_api_; @@ -41,7 +41,7 @@ index 3307998ec566e24a9050434af4e6e3bb09557d43..456603c97bfc2214b0d08fecd592ff1e gfx::Size pixel_size_; diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.mm b/gpu/ipc/service/image_transport_surface_overlay_mac.mm -index 0823c8a728f62679f076a6237ba4dcc207c5d9bb..5ce94e2e2d696664e75c1aeb30d0177458a27df1 100644 +index f0dd2928aefcfef71e148e4e5c1e88dd7f9b0724..3461a7839a13f5c34c78b9b13997d5d3e42977a4 100644 --- a/gpu/ipc/service/image_transport_surface_overlay_mac.mm +++ b/gpu/ipc/service/image_transport_surface_overlay_mac.mm @@ -51,7 +51,7 @@ ImageTransportSurfaceOverlayMacBase:: @@ -61,7 +61,7 @@ index 0823c8a728f62679f076a6237ba4dcc207c5d9bb..5ce94e2e2d696664e75c1aeb30d01774 } template -@@ -141,7 +142,9 @@ ImageTransportSurfaceOverlayMacBase::SwapBuffersInternal( +@@ -140,7 +141,9 @@ ImageTransportSurfaceOverlayMacBase::SwapBuffersInternal( "GLImpl", static_cast(gl::GetGLImplementation()), "width", pixel_size_.width()); if (use_remote_layer_api_) { diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch index 62314a0ef99d6..7c525ede72f4f 100644 --- a/patches/chromium/mas_no_private_api.patch +++ b/patches/chromium/mas_no_private_api.patch @@ -7,10 +7,10 @@ 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/accessibility_tree_formatter_mac.mm b/content/browser/accessibility/accessibility_tree_formatter_mac.mm -index c2a7ecffc64eba8ab95835afed035d987fb5c36b..586e49904ff3ef9728207d6f7361a014562b6bb6 100644 +index 628e4a28eec03529b65bb4a74e99919e94b74c35..5491a8153707f725a924c5050782a8350694fb1d 100644 --- a/content/browser/accessibility/accessibility_tree_formatter_mac.mm +++ b/content/browser/accessibility/accessibility_tree_formatter_mac.mm -@@ -482,7 +482,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( +@@ -480,7 +480,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( 0 == strcmp([value objCType], @encode(NSRange))) { return PopulateRange([value rangeValue]); } @@ -19,7 +19,7 @@ index c2a7ecffc64eba8ab95835afed035d987fb5c36b..586e49904ff3ef9728207d6f7361a014 // AXTextMarker if (content::IsAXTextMarker(value)) { return PopulateTextPosition(content::AXTextMarkerToPosition(value).get(), -@@ -493,7 +493,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( +@@ -491,7 +491,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( if (content::IsAXTextMarkerRange(value)) { return PopulateTextMarkerRange(value, line_indexes_map); } @@ -28,7 +28,7 @@ index c2a7ecffc64eba8ab95835afed035d987fb5c36b..586e49904ff3ef9728207d6f7361a014 // Accessible object if ([value isKindOfClass:[BrowserAccessibilityCocoa class]]) { return base::Value(NodeToLineIndex(value, line_indexes_map)); -@@ -544,7 +544,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextPosition( +@@ -542,7 +542,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextPosition( kConstValuePrefix + affinity); return set; } @@ -37,7 +37,7 @@ index c2a7ecffc64eba8ab95835afed035d987fb5c36b..586e49904ff3ef9728207d6f7361a014 base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( id object, const LineIndexesMap& line_indexes_map) const { -@@ -559,7 +559,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( +@@ -557,7 +557,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( dict.SetPath("focus", PopulateTextPosition(range.focus(), line_indexes_map)); return dict; } diff --git a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch index be34d2253c582..e4b1f57a3c684 100644 --- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch +++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch @@ -7,7 +7,7 @@ This adds a callback from the network service that's used to implement session.setCertificateVerifyCallback. diff --git a/services/network/network_context.cc b/services/network/network_context.cc -index f29891cb543999a5ed83ceb8130661ddbde5f1a6..a07176cf0fd3c7160922e7f9919e775cb3b6fe71 100644 +index 3bb208bad23cd3247f95305104a856e9d0bbc396..170ba3cf6176e8423b6009a0ac0299bf1e411158 100644 --- a/services/network/network_context.cc +++ b/services/network/network_context.cc @@ -114,6 +114,11 @@ @@ -22,7 +22,7 @@ index f29891cb543999a5ed83ceb8130661ddbde5f1a6..a07176cf0fd3c7160922e7f9919e775c #if BUILDFLAG(IS_CT_SUPPORTED) #include "components/certificate_transparency/chrome_ct_policy_enforcer.h" #include "components/certificate_transparency/chrome_require_ct_delegate.h" -@@ -325,6 +330,79 @@ std::string HashesToBase64String(const net::HashValueVector& hashes) { +@@ -324,6 +329,79 @@ std::string HashesToBase64String(const net::HashValueVector& hashes) { } // namespace @@ -102,7 +102,7 @@ index f29891cb543999a5ed83ceb8130661ddbde5f1a6..a07176cf0fd3c7160922e7f9919e775c constexpr uint32_t NetworkContext::kMaxOutstandingRequestsPerProcess; NetworkContext::PendingCertVerify::PendingCertVerify() = default; -@@ -519,6 +597,13 @@ void NetworkContext::SetClient( +@@ -518,6 +596,13 @@ void NetworkContext::SetClient( client_.Bind(std::move(client)); } @@ -116,7 +116,7 @@ index f29891cb543999a5ed83ceb8130661ddbde5f1a6..a07176cf0fd3c7160922e7f9919e775c void NetworkContext::CreateURLLoaderFactory( mojo::PendingReceiver receiver, mojom::URLLoaderFactoryParamsPtr params) { -@@ -1729,8 +1814,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( +@@ -1723,8 +1808,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( "NetworkContext should pass CertVerifierServiceRemoteParams."; std::unique_ptr cert_verifier; @@ -127,7 +127,7 @@ index f29891cb543999a5ed83ceb8130661ddbde5f1a6..a07176cf0fd3c7160922e7f9919e775c } else { if (params_->cert_verifier_params && params_->cert_verifier_params->is_remote_params()) { -@@ -1763,14 +1849,14 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( +@@ -1752,14 +1838,14 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( cert_net_fetcher_ = base::MakeRefCounted(); @@ -145,7 +145,7 @@ index f29891cb543999a5ed83ceb8130661ddbde5f1a6..a07176cf0fd3c7160922e7f9919e775c #if defined(OS_CHROMEOS) cert_verifier_with_trust_anchors_ = -@@ -1779,13 +1865,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( +@@ -1768,13 +1854,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( UpdateAdditionalCertificates( std::move(params_->initial_additional_certificates)); cert_verifier_with_trust_anchors_->InitializeOnIOThread( @@ -178,7 +178,7 @@ index f29891cb543999a5ed83ceb8130661ddbde5f1a6..a07176cf0fd3c7160922e7f9919e775c std::unique_ptr network_delegate = std::make_unique( diff --git a/services/network/network_context.h b/services/network/network_context.h -index 6989b0367ea1abcd46a110b738adc18227ab6846..dd65d1560daa8fde7d76e0dec8e1cdcb6c76b318 100644 +index eced38ff04f8d7f3a91079b65f5ad29348bf8813..391a02c108debdd5e5572b4a666d30dc68ece76b 100644 --- a/services/network/network_context.h +++ b/services/network/network_context.h @@ -86,6 +86,7 @@ class DomainReliabilityMonitor; @@ -189,7 +189,7 @@ index 6989b0367ea1abcd46a110b738adc18227ab6846..dd65d1560daa8fde7d76e0dec8e1cdcb class CookieManager; class ExpectCTReporter; class HostResolver; -@@ -190,6 +191,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -189,6 +190,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext void CreateURLLoaderFactory( mojo::PendingReceiver receiver, mojom::URLLoaderFactoryParamsPtr params) override; @@ -198,8 +198,8 @@ index 6989b0367ea1abcd46a110b738adc18227ab6846..dd65d1560daa8fde7d76e0dec8e1cdcb void ResetURLLoaderFactories() override; void GetCookieManager( mojo::PendingReceiver receiver) override; -@@ -657,6 +660,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext - std::unique_ptr nss_temp_certs_cache_; +@@ -653,6 +656,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext + CertVerifierWithTrustAnchors* cert_verifier_with_trust_anchors_ = nullptr; #endif + RemoteCertVerifier* remote_cert_verifier_ = nullptr; diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch index 08192b26354ba..4c4ebf64c307c 100644 --- a/patches/chromium/printing.patch +++ b/patches/chromium/printing.patch @@ -31,7 +31,7 @@ index 668a14bff461e83b2c6d9d7f23d9674ff081ef12..674f141e80c0316fd47558c4d428a970 using RenderMode = PdfRenderSettings::Mode; RenderMode mode; diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc -index c8e626a79f6105421a1feecd294231467f63510e..b5ee1d3c919d3ad48b4e17a1515870e113155263 100644 +index 52efa2037a31f84a261502107bfebc69ae5a419e..4834e92ae99f12043e5ce476370f64345ad29001 100644 --- a/chrome/browser/printing/print_job_worker.cc +++ b/chrome/browser/printing/print_job_worker.cc @@ -20,7 +20,6 @@ @@ -50,8 +50,8 @@ index c8e626a79f6105421a1feecd294231467f63510e..b5ee1d3c919d3ad48b4e17a1515870e1 #include "printing/print_job_constants.h" #include "printing/printed_document.h" #include "printing/printing_utils.h" -@@ -223,16 +223,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value new_settings, - print_backend->GetPrinterDriverInfo(printer_name)); +@@ -235,16 +235,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value new_settings, + #endif // defined(OS_LINUX) && defined(USE_CUPS) && !defined(OS_CHROMEOS) } - PrintingContext::Result result; @@ -75,7 +75,7 @@ index c8e626a79f6105421a1feecd294231467f63510e..b5ee1d3c919d3ad48b4e17a1515870e1 } #if defined(OS_CHROMEOS) -@@ -248,6 +253,13 @@ void PrintJobWorker::UpdatePrintSettingsFromPOD( +@@ -260,6 +265,13 @@ void PrintJobWorker::UpdatePrintSettingsFromPOD( void PrintJobWorker::GetSettingsDone(SettingsCallback callback, PrintingContext::Result result) { diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch index 874b05a35d20d..5ca196e86f01a 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -43,7 +43,7 @@ index bf6baff690af930acf19c2a544c8f00ab492bb8e..8d205a1b052c6d670c0c2e38852734c5 void RenderWidgetHostImpl::OnCursorVisibilityStateChanged(bool is_visible) { diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index ca90c21170ff3405efa1da230944faaaf12ce1b4..11560e87eab8d4aec49be358be92c0af7ad402f7 100644 +index b08fdaca5d59deb48d83b50d917c80908a2fa02f..e858b2fca4bb8fce0cf6dcb148c979ed96afdc7a 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -3588,6 +3588,11 @@ bool WebContentsImpl::OnUpdateDragCursor() { @@ -59,10 +59,10 @@ index ca90c21170ff3405efa1da230944faaaf12ce1b4..11560e87eab8d4aec49be358be92c0af RenderWidgetHostImpl* render_widget_host) { return render_widget_host == GetMainFrame()->GetRenderWidgetHost(); diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h -index 5209401c03325f420d14d984a6b3b05391ff41e1..1bde6eae0148bdc60ded08ee2327b3b3799157bb 100644 +index 353addcc1e7646e7ddc14a8d253d622ced94f34d..b62b7aafc2dcfa281cf82b9d8088b053db425417 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h -@@ -921,6 +921,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, +@@ -920,6 +920,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, void SendScreenRects() override; TextInputManager* GetTextInputManager() override; bool OnUpdateDragCursor() override; diff --git a/patches/chromium/ui_gtk_public_header.patch b/patches/chromium/ui_gtk_public_header.patch index 1307ecd09c583..1c9429a2cfe24 100644 --- a/patches/chromium/ui_gtk_public_header.patch +++ b/patches/chromium/ui_gtk_public_header.patch @@ -6,7 +6,7 @@ Subject: ui_gtk_public_header.patch Allow electron to depend on //ui/gtk/gtk_util.h diff --git a/ui/gtk/BUILD.gn b/ui/gtk/BUILD.gn -index d849743769837288848fd1a6e9ed75127e1a6d1d..bcdc4df20d86ac7f2b9a8a0327dd4d71aced9b20 100644 +index 02e12b9db88d24183bf98ef7383da6ce80f600bd..3ac1ede81e44147a918fee2e9d65aa8726c2b94b 100644 --- a/ui/gtk/BUILD.gn +++ b/ui/gtk/BUILD.gn @@ -22,13 +22,15 @@ component("gtk_ui_delegate") { diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch index 7d6d8c654b2c9..63246321f840a 100644 --- a/patches/chromium/web_contents.patch +++ b/patches/chromium/web_contents.patch @@ -9,7 +9,7 @@ is needed for OSR. Originally landed in https://github.com/electron/libchromiumcontent/pull/226. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 9ac8c8ea965a33e64a656f4478b217d3e6288597..ca90c21170ff3405efa1da230944faaaf12ce1b4 100644 +index ee336b57fa13ec611b4591cb8147ec8f29f162e2..b08fdaca5d59deb48d83b50d917c80908a2fa02f 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -2225,6 +2225,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch index f13278fe544c7..811984fd9c6e0 100644 --- a/patches/chromium/worker_context_will_destroy.patch +++ b/patches/chromium/worker_context_will_destroy.patch @@ -26,7 +26,7 @@ index f6d2f50e8d6b4a5df796f2d4478ccd3048101532..d57edc0cea54b9d78700c3b9acdcfcc5 // 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 138a0aafcafa7512ba13026c26b433b3517867f4..e5c439f283a14d58235ce08ac62ce4c82bdbd0f7 100644 +index a4382a6afa328308e9d3a39ddbdc6f3248c6f4c0..d5a84147b0479e18e53fc94b28c41393803c8af3 100644 --- a/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc @@ -860,6 +860,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { @@ -43,7 +43,7 @@ index 138a0aafcafa7512ba13026c26b433b3517867f4..e5c439f283a14d58235ce08ac62ce4c8 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 12044eb34510d190981e5e82b4939adc159f9aa5..54d3dd4245aa880ff7503264edbf47cf46f8796a 100644 +index 59d7d92cf5f76f45c41c8d10465bbb57b19e8676..6c8ef4c7c37e6b951f228500b178a53d91ebdfb9 100644 --- a/content/renderer/renderer_blink_platform_impl.h +++ b/content/renderer/renderer_blink_platform_impl.h @@ -181,6 +181,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { @@ -55,10 +55,10 @@ index 12044eb34510d190981e5e82b4939adc159f9aa5..54d3dd4245aa880ff7503264edbf47cf const blink::WebString& header_name) override; diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h -index 977d2c47345264bb3c4c6662fe97adf8f9faccd0..5d1187cb10f828e4774f871ead1c23833ce63948 100644 +index 7c3a255bd03f4b0eed60aa9d16d0611fe11fda93..26429111491fee98232237a2227cd6237bbab2d4 100644 --- a/third_party/blink/public/platform/platform.h +++ b/third_party/blink/public/platform/platform.h -@@ -623,6 +623,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -625,6 +625,7 @@ class BLINK_PLATFORM_EXPORT Platform { virtual void DidStartWorkerThread() {} virtual void WillStopWorkerThread() {} virtual void WorkerContextCreated(const v8::Local& worker) {} @@ -67,10 +67,10 @@ index 977d2c47345264bb3c4c6662fe97adf8f9faccd0..5d1187cb10f828e4774f871ead1c2383 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 f655c4ecc13e8445e35c6a79625946c9c7fb671b..32bac98ed79471178c36590b7db99fc1a95363b0 100644 +index 05414c7fba07de0b461100614e396b96c0389330..7cfe2ca3b42e0378dd84816195f440b1f85ed5fc 100644 --- a/third_party/blink/renderer/core/workers/worker_thread.cc +++ b/third_party/blink/renderer/core/workers/worker_thread.cc -@@ -686,6 +686,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() { +@@ -682,6 +682,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() { nested_runner_->QuitNow(); } diff --git a/patches/node/64bit_bump_typedarray_max_length_to_2_32-1_elements.patch b/patches/node/64bit_bump_typedarray_max_length_to_2_32-1_elements.patch deleted file mode 100644 index ab95b4f2e0340..0000000000000 --- a/patches/node/64bit_bump_typedarray_max_length_to_2_32-1_elements.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: John Kleinschmidt -Date: Tue, 28 Jan 2020 12:16:11 -0500 -Subject: Bump TypedArray max length to 2**32-1 elements - -TypedArray max length for 64 bit has been changed to 2**32-1 elements -See: https://source.chromium.org/chromium/_/chromium/v8/v8.git/+/3bff8fa5ea29c0623c0a5601b6fa67c64cbcc319 - -diff --git a/test/parallel/test-buffer-alloc.js b/test/parallel/test-buffer-alloc.js -index de3e7fa52390f0631b93fb4adf2e8a4e31bdc572..eae7533250599cfc649a17c19c8b0fa268155b69 100644 ---- a/test/parallel/test-buffer-alloc.js -+++ b/test/parallel/test-buffer-alloc.js -@@ -8,8 +8,8 @@ const SlowBuffer = require('buffer').SlowBuffer; - // Verify the maximum Uint8Array size. There is no concrete limit by spec. The - // internal limits should be updated if this fails. - assert.throws( -- () => new Uint8Array(2 ** 31), -- { message: 'Invalid typed array length: 2147483648' } -+ () => new Uint8Array(2 ** 32), -+ { message: 'Invalid typed array length: 4294967296' } - ); - - const b = Buffer.allocUnsafe(1024); -diff --git a/test/parallel/test-buffer-over-max-length.js b/test/parallel/test-buffer-over-max-length.js -index b1267b19ff439e344417a85649667facb0d2add7..5a738050eda9c0adad862d318f390af112330c14 100644 ---- a/test/parallel/test-buffer-over-max-length.js -+++ b/test/parallel/test-buffer-over-max-length.js -@@ -10,7 +10,7 @@ const bufferMaxSizeMsg = common.expectsError({ - code: 'ERR_INVALID_OPT_VALUE', - type: RangeError, - message: /^The value "[^"]*" is invalid for option "size"$/ --}, 12); -+}, 10); - - assert.throws(() => Buffer((-1 >>> 0) + 1), bufferMaxSizeMsg); - assert.throws(() => SlowBuffer((-1 >>> 0) + 1), bufferMaxSizeMsg); -@@ -23,7 +23,3 @@ assert.throws(() => SlowBuffer(kMaxLength + 1), bufferMaxSizeMsg); - assert.throws(() => Buffer.alloc(kMaxLength + 1), bufferMaxSizeMsg); - assert.throws(() => Buffer.allocUnsafe(kMaxLength + 1), bufferMaxSizeMsg); - assert.throws(() => Buffer.allocUnsafeSlow(kMaxLength + 1), bufferMaxSizeMsg); -- --// issue GH-4331 --assert.throws(() => Buffer.allocUnsafe(0xFFFFFFFF), bufferMaxSizeMsg); --assert.throws(() => Buffer.allocUnsafe(0xFFFFFFFFF), bufferMaxSizeMsg); diff --git a/patches/node/chore_split_createenvironment_into_createenvironment_and.patch b/patches/node/chore_split_createenvironment_into_createenvironment_and.patch deleted file mode 100644 index 3b25d46fe2066..0000000000000 --- a/patches/node/chore_split_createenvironment_into_createenvironment_and.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Samuel Attard -Date: Wed, 17 Jul 2019 14:45:59 -0700 -Subject: chore: split CreateEnvironment into CreateEnvironment and - BootstrapEnvironment - -This allows us to run operations on a created but not yet bootstrapped -environment such as setting up an InspectorAgent - -diff --git a/src/api/environment.cc b/src/api/environment.cc -index 356131156b4a714eebf4e202cd105f0f184e3852..96192f0ea4174315d73e03849ce1bed996afc44c 100644 ---- a/src/api/environment.cc -+++ b/src/api/environment.cc -@@ -263,7 +263,8 @@ Environment* CreateEnvironment(IsolateData* isolate_data, - int argc, - const char* const* argv, - int exec_argc, -- const char* const* exec_argv) { -+ const char* const* exec_argv, -+ bool bootstrap) { - Isolate* isolate = context->GetIsolate(); - HandleScope handle_scope(isolate); - Context::Scope context_scope(context); -@@ -281,9 +282,16 @@ Environment* CreateEnvironment(IsolateData* isolate_data, - Environment::kOwnsProcessState | - Environment::kOwnsInspector)); - env->InitializeLibuv(per_process::v8_is_profiling); -- if (env->RunBootstrapping().IsEmpty()) { -+ if (bootstrap && !BootstrapEnvironment(env)) { - return nullptr; - } -+ return env; -+} -+ -+bool BootstrapEnvironment(Environment* env) { -+ if (env->RunBootstrapping().IsEmpty()) { -+ return false; -+ } - - std::vector> parameters = { - env->require_string(), -@@ -296,9 +304,10 @@ Environment* CreateEnvironment(IsolateData* isolate_data, - if (ExecuteBootstrapper( - env, "internal/bootstrap/environment", ¶meters, &arguments) - .IsEmpty()) { -- return nullptr; -+ return false; - } -- return env; -+ -+ return true; - } - - void FreeEnvironment(Environment* env) { -diff --git a/src/node.h b/src/node.h -index e3258434eba34124c71562225e295cd1807fdf7c..2ac35208ae8b2cfd067b5b712d4447121ef6e47d 100644 ---- a/src/node.h -+++ b/src/node.h -@@ -326,7 +326,9 @@ NODE_EXTERN Environment* CreateEnvironment(IsolateData* isolate_data, - int argc, - const char* const* argv, - int exec_argc, -- const char* const* exec_argv); -+ const char* const* exec_argv, -+ bool bootstrap = true); -+NODE_EXTERN bool BootstrapEnvironment(Environment* env); - - NODE_EXTERN void LoadEnvironment(Environment* env); - NODE_EXTERN void FreeEnvironment(Environment* env); diff --git a/patches/node/feat_enable_passing_cli_flags.patch b/patches/node/feat_enable_passing_cli_flags.patch deleted file mode 100644 index 73e53ae70497c..0000000000000 --- a/patches/node/feat_enable_passing_cli_flags.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Shelley Vohr -Date: Wed, 13 Nov 2019 15:39:48 +0000 -Subject: feat: enable passing cli flags - -This patches enables passing safelisted cli flags to Node.js. -Upstreamed in https://github.com/nodejs/node/pull/30466. - -diff --git a/src/node.cc b/src/node.cc -index 38c467c7d49589ef5d985ad999fe22d9462f07f6..37c6e9c516da3c1f208c065978c2c044c7ff8dba 100644 ---- a/src/node.cc -+++ b/src/node.cc -@@ -113,8 +113,6 @@ - namespace node { - - using native_module::NativeModuleEnv; --using options_parser::kAllowedInEnvironment; --using options_parser::kDisallowedInEnvironment; - - using v8::Boolean; - using v8::EscapableHandleScope; -@@ -645,7 +643,7 @@ void ResetStdio() { - int ProcessGlobalArgs(std::vector* args, - std::vector* exec_args, - std::vector* errors, -- bool is_env) { -+ OptionEnvvarSettings settings) { - // Parse a few arguments which are specific to Node. - std::vector v8_args; - -@@ -655,7 +653,7 @@ int ProcessGlobalArgs(std::vector* args, - exec_args, - &v8_args, - per_process::cli_options.get(), -- is_env ? kAllowedInEnvironment : kDisallowedInEnvironment, -+ settings, - errors); - - if (!errors->empty()) return 9; -@@ -819,7 +817,7 @@ int InitializeNodeWithArgs(std::vector* argv, - return 9; - } - -- const int exit_code = ProcessGlobalArgs(&env_argv, nullptr, errors, true); -+ const int exit_code = ProcessGlobalArgs(&env_argv, nullptr, errors, kAllowedInEnvironment); - if (exit_code != 0) return exit_code; - } - #endif -@@ -827,7 +825,7 @@ int InitializeNodeWithArgs(std::vector* argv, - if (g_upstream_node_mode) { - // NOTE(jeremy): indentation is intentionally wrong here, to ease rebasing. - -- const int exit_code = ProcessGlobalArgs(argv, exec_argv, errors, false); -+ const int exit_code = ProcessGlobalArgs(argv, exec_argv, errors, kDisallowedInEnvironment); - if (exit_code != 0) return exit_code; - - // Set the process.title immediately after processing argv if --title is set. -diff --git a/src/node.h b/src/node.h -index 2ac35208ae8b2cfd067b5b712d4447121ef6e47d..2c085d71d056e89ea57fb738f8acd2c9e1ff539a 100644 ---- a/src/node.h -+++ b/src/node.h -@@ -223,6 +223,16 @@ NODE_EXTERN void Init(int* argc, - int* exec_argc, - const char*** exec_argv); - -+enum OptionEnvvarSettings { -+ kAllowedInEnvironment, -+ kDisallowedInEnvironment -+}; -+ -+NODE_EXTERN int ProcessGlobalArgs(std::vector* args, -+ std::vector* exec_args, -+ std::vector* errors, -+ OptionEnvvarSettings settings); -+ - class NodeArrayBufferAllocator; - - // An ArrayBuffer::Allocator class with some Node.js-specific tweaks. If you do -diff --git a/src/node_options.h b/src/node_options.h -index c0fd198ed3a210640e75d764c795d8f5ab21591b..4a20b732164ab97c9f8175bd517e07622fb73a8f 100644 ---- a/src/node_options.h -+++ b/src/node_options.h -@@ -250,11 +250,6 @@ HostPort SplitHostPort(const std::string& arg, - std::vector* errors); - void GetOptions(const v8::FunctionCallbackInfo& args); - --enum OptionEnvvarSettings { -- kAllowedInEnvironment, -- kDisallowedInEnvironment --}; -- - enum OptionType { - kNoOp, - kV8Option, -diff --git a/src/node_worker.cc b/src/node_worker.cc -index ab442a4a34a8c633834abd46fef52baf7d377705..9751dd8c1ea47b76832112cad43af99c881cf382 100644 ---- a/src/node_worker.cc -+++ b/src/node_worker.cc -@@ -16,7 +16,7 @@ - #include - #include - --using node::options_parser::kDisallowedInEnvironment; -+using node::kDisallowedInEnvironment; - using v8::Array; - using v8::Boolean; - using v8::Context; diff --git a/patches/node/fix_include_libuv_header_in_node_binding.patch b/patches/node/fix_include_libuv_header_in_node_binding.patch deleted file mode 100644 index 6bc4c4dbae7ab..0000000000000 --- a/patches/node/fix_include_libuv_header_in_node_binding.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Shelley Vohr -Date: Wed, 8 Jan 2020 12:54:07 -0800 -Subject: fix: include libuv header in node_binding - -The libuv header uv.h was removed in -https://github.com/nodejs/node/commit/3bb085dbad4d23030c731834e35b2804c8a50b23, -but is necessary for Windows to understand what uv_lib_t is. - -Upstreamed in https://github.com/nodejs/node/pull/31265. - -diff --git a/src/node_binding.h b/src/node_binding.h -index cefb6419ebb7f5c5c79927d179eef0a790e234ad..4233ee968fb4b3b5456997cbf1450ecf07392455 100644 ---- a/src/node_binding.h -+++ b/src/node_binding.h -@@ -10,6 +10,7 @@ - #include "node.h" - #define NAPI_EXPERIMENTAL - #include "node_api.h" -+#include "uv.h" - - enum { - NM_F_BUILTIN = 1 << 0, // Unused. diff --git a/patches/node/inherit_electron_crashpad_pipe_name_in_child_process.patch b/patches/node/inherit_electron_crashpad_pipe_name_in_child_process.patch deleted file mode 100644 index 15a8fec80b233..0000000000000 --- a/patches/node/inherit_electron_crashpad_pipe_name_in_child_process.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Cheng Zhao -Date: Tue, 4 Jun 2019 17:42:11 +0900 -Subject: Inherit ELECTRON_CRASHPAD_PIPE_NAME in child process - -This is required for crashReporter to work correctly in node process. - -diff --git a/lib/child_process.js b/lib/child_process.js -index d5d97c9da90281e0c24fe97a4914db12d685c7bc..a6d058c92dff927cd2fc6bcb2bb304e9ca497a31 100644 ---- a/lib/child_process.js -+++ b/lib/child_process.js -@@ -107,6 +107,10 @@ function fork(modulePath /* , args, options */) { - options.env = Object.create(options.env || process.env) - options.env.ELECTRON_RUN_AS_NODE = 1; - -+ if (process.platform === 'win32') { -+ options.env.ELECTRON_CRASHPAD_PIPE_NAME = process.env.ELECTRON_CRASHPAD_PIPE_NAME; -+ } -+ - if (!options.execPath && process.type && process.platform == 'darwin') { - options.execPath = process.helperExecPath; - } diff --git a/patches/node/test_use_tmpdir_refresh_in_test-esm-windows_js.patch b/patches/node/test_use_tmpdir_refresh_in_test-esm-windows_js.patch deleted file mode 100644 index 43bcd6811ac4f..0000000000000 --- a/patches/node/test_use_tmpdir_refresh_in_test-esm-windows_js.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Richard Lau -Date: Mon, 16 Dec 2019 16:25:31 -0500 -Subject: test: use tmpdir.refresh() in test-esm-windows.js - -Use `tmpdir.refresh()` in `test/es-module/test-esm-windows.js` so -that the temporary directory is cleaned before use and when the test -exits. - -PR-URL: https://github.com/nodejs/node/pull/30997 -Reviewed-By: Denys Otrishko -Reviewed-By: Colin Ihrig -Reviewed-By: Rich Trott -Reviewed-By: Luigi Pinca -Reviewed-By: James M Snell -(cherry picked from commit e23aebc684a45f725811211f9740bcee3bcdbe26) - -diff --git a/test/es-module/test-esm-windows.js b/test/es-module/test-esm-windows.js -index 64ba1249a76c06ee3461b56f7ac69a650e6fbfcc..44af65d6a4e0315b31508cab3183c0142ff0d17c 100644 ---- a/test/es-module/test-esm-windows.js -+++ b/test/es-module/test-esm-windows.js -@@ -15,9 +15,8 @@ const imp = (file) => { - }; - - (async () => { -- const tmp = tmpdir.path; -- await fs.mkdir(tmp).catch(() => {}); -- const rel = (file) => path.join(tmp, file); -+ tmpdir.refresh(); -+ const rel = (file) => path.join(tmpdir.path, file); - - { // Load a single script - const file = rel('con.mjs'); diff --git a/patches/v8/add_realloc.patch b/patches/v8/add_realloc.patch index b889d8c04a55a..6cfb917d341e8 100644 --- a/patches/v8/add_realloc.patch +++ b/patches/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 11581b4cd58d5bb9f0bcdfd2e5e2f884ebef0027..acee214c89e0ab5a126510f94d4c83da5989fe5e 100644 +index 00a4ae280322334c20d10f0921a5b1a7594e03fa..fa8116d882bdf8270c56fbdf3b62721099869b08 100644 --- a/include/v8.h +++ b/include/v8.h -@@ -5051,6 +5051,13 @@ class V8_EXPORT ArrayBuffer : public Object { +@@ -5068,6 +5068,13 @@ class V8_EXPORT ArrayBuffer : public Object { */ virtual void* AllocateUninitialized(size_t length) = 0; @@ -30,7 +30,7 @@ index 11581b4cd58d5bb9f0bcdfd2e5e2f884ebef0027..acee214c89e0ab5a126510f94d4c83da * 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/api.cc b/src/api/api.cc -index b26acef20874b4ea303c302a254616fab43e3a82..b7fe46660e1502db23e1eb31c45be1b6923ba7f2 100644 +index 49b1a1d15734dc284264c3b9af6a99559c0367dd..8776d3369e2c5f36b43309e38def79d25fc231d9 100644 --- a/src/api/api.cc +++ b/src/api/api.cc @@ -533,6 +533,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) { diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch index b519b2d9e02be..d7707ba7ee506 100644 --- a/patches/v8/build_gn.patch +++ b/patches/v8/build_gn.patch @@ -9,7 +9,7 @@ necessary for native modules to load. Also, some fixes relating to mksnapshot on ARM. diff --git a/BUILD.gn b/BUILD.gn -index 2299eb4a30f41ba25d7d5dc5c4d02e1ee05ca4d9..b8f09685302f98dd30681bc387c7d0e5d9222354 100644 +index 6ac9e37d0426bc8312c347cbc0ec61c2a636608f..79b78807f0aac98190fb9fe1de58aa8e30dd332f 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -355,7 +355,7 @@ config("internal_config") { @@ -21,7 +21,7 @@ index 2299eb4a30f41ba25d7d5dc5c4d02e1ee05ca4d9..b8f09685302f98dd30681bc387c7d0e5 defines += [ "BUILDING_V8_SHARED" ] } } -@@ -4313,7 +4313,7 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -4323,7 +4323,7 @@ if (current_toolchain == v8_generator_toolchain) { "src/interpreter/bytecodes.h", ] @@ -30,7 +30,7 @@ index 2299eb4a30f41ba25d7d5dc5c4d02e1ee05ca4d9..b8f09685302f98dd30681bc387c7d0e5 deps = [ ":v8_libbase", -@@ -4346,6 +4346,8 @@ if (current_toolchain == v8_snapshot_toolchain) { +@@ -4356,6 +4356,8 @@ if (current_toolchain == v8_snapshot_toolchain) { configs = [ ":internal_config" ] diff --git a/patches/v8/dcheck.patch b/patches/v8/dcheck.patch index 5aa338554356e..b38618a55aaab 100644 --- a/patches/v8/dcheck.patch +++ b/patches/v8/dcheck.patch @@ -6,10 +6,10 @@ Subject: dcheck.patch https://github.com/auchenberg/volkswagen diff --git a/src/api/api.cc b/src/api/api.cc -index b7fe46660e1502db23e1eb31c45be1b6923ba7f2..811c6815c6bd770e2bb014994b859dfdc1eb5630 100644 +index 8776d3369e2c5f36b43309e38def79d25fc231d9..827dd51fc68b180e1e2f3a0b93ef950959982e06 100644 --- a/src/api/api.cc +++ b/src/api/api.cc -@@ -8634,7 +8634,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) { +@@ -8656,7 +8656,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) { } void Isolate::PerformMicrotaskCheckpoint() { @@ -19,10 +19,10 @@ index b7fe46660e1502db23e1eb31c45be1b6923ba7f2..811c6815c6bd770e2bb014994b859dfd isolate->default_microtask_queue()->PerformCheckpoint(this); } diff --git a/src/heap/heap.cc b/src/heap/heap.cc -index 6ad03c63287dbe9977cd84fe3f718cee26d621d3..b9feddcfcbd9b67d1312fcd83ac3599431d74510 100644 +index 4d23e084b95c8f8b9f8fcd5e1059390a9d32883d..6326286418ce44869c484a46811b7079cb06f229 100644 --- a/src/heap/heap.cc +++ b/src/heap/heap.cc -@@ -5642,9 +5642,9 @@ void Heap::TearDown() { +@@ -5645,9 +5645,9 @@ void Heap::TearDown() { void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback, GCType gc_type, void* data) { DCHECK_NOT_NULL(callback); diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch index 43ee02731fb82..eb8af747de986 100644 --- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch +++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch @@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not contain any standard C++ library exports (e.g. `std::ostringstream`). diff --git a/BUILD.gn b/BUILD.gn -index 2b43c200ef812908745ac383891cf15a1a911f8e..3cdc008af5a682fcef561de217f89f5839803c9e 100644 +index bf06d50979db2e3b989cb996a3b29e42bae05c76..a388baea736340d24c8d6b787e512d7cd85bad12 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -355,6 +355,10 @@ config("internal_config") { diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch index 8f58a719f64c9..97cac321fea09 100644 --- a/patches/v8/expose_mksnapshot.patch +++ b/patches/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 b8f09685302f98dd30681bc387c7d0e5d9222354..2b43c200ef812908745ac383891cf15a1a911f8e 100644 +index 79b78807f0aac98190fb9fe1de58aa8e30dd332f..bf06d50979db2e3b989cb996a3b29e42bae05c76 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -4324,7 +4324,6 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -4334,7 +4334,6 @@ if (current_toolchain == v8_generator_toolchain) { if (current_toolchain == v8_snapshot_toolchain) { v8_executable("mksnapshot") { From 014b4872584a0f6da4ab982255def175522cbe75 Mon Sep 17 00:00:00 2001 From: Andy Locascio Date: Thu, 25 Jun 2020 16:57:06 -0700 Subject: [PATCH 09/79] rename GetHighContrastColorScheme -> GetPlatformHighContrastColorScheme Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2250224 --- shell/browser/api/electron_api_native_theme.cc | 4 ++-- shell/browser/api/electron_api_system_preferences.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shell/browser/api/electron_api_native_theme.cc b/shell/browser/api/electron_api_native_theme.cc index 7324d233e82c3..1792b040cf27b 100644 --- a/shell/browser/api/electron_api_native_theme.cc +++ b/shell/browser/api/electron_api_native_theme.cc @@ -89,8 +89,8 @@ bool NativeTheme::ShouldUseInvertedColorScheme() { return false; return is_inverted; #else - return ui_theme_->GetHighContrastColorScheme() == - ui::NativeTheme::HighContrastColorScheme::kDark; + return ui_theme_->GetPlatformHighContrastColorScheme() == + ui::NativeTheme::PlatformHighContrastColorScheme::kDark; #endif } diff --git a/shell/browser/api/electron_api_system_preferences.cc b/shell/browser/api/electron_api_system_preferences.cc index db5260366b4f2..7fb6fd409c232 100644 --- a/shell/browser/api/electron_api_system_preferences.cc +++ b/shell/browser/api/electron_api_system_preferences.cc @@ -38,8 +38,8 @@ bool SystemPreferences::IsDarkMode() { bool SystemPreferences::IsInvertedColorScheme() { return ui::NativeTheme::GetInstanceForNativeUi() - ->GetHighContrastColorScheme() == - ui::NativeTheme::HighContrastColorScheme::kDark; + ->GetPlatformHighContrastColorScheme() == + ui::NativeTheme::PlatformHighContrastColorScheme::kDark; } bool SystemPreferences::IsHighContrastColorScheme() { From ca49ae5a9c5b77a362339db4870d8c4161d36512 Mon Sep 17 00:00:00 2001 From: Andy Locascio Date: Thu, 25 Jun 2020 16:58:43 -0700 Subject: [PATCH 10/79] remove vulkan info collection Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2252818 --- shell/browser/api/gpu_info_enumerator.cc | 12 ------------ shell/browser/api/gpu_info_enumerator.h | 3 --- 2 files changed, 15 deletions(-) diff --git a/shell/browser/api/gpu_info_enumerator.cc b/shell/browser/api/gpu_info_enumerator.cc index 7dd0f8cf18005..8237b81033bae 100644 --- a/shell/browser/api/gpu_info_enumerator.cc +++ b/shell/browser/api/gpu_info_enumerator.cc @@ -113,18 +113,6 @@ void GPUInfoEnumerator::EndAuxAttributes() { value_stack.pop(); } -void GPUInfoEnumerator::BeginDx12VulkanVersionInfo() { - value_stack.push(std::move(current)); - current = std::make_unique(); -} - -void GPUInfoEnumerator::EndDx12VulkanVersionInfo() { - auto& top_value = value_stack.top(); - top_value->SetDictionary(kDx12VulkanVersionInfoKey, std::move(current)); - current = std::move(top_value); - value_stack.pop(); -} - void GPUInfoEnumerator::BeginOverlayInfo() { value_stack.push(std::move(current)); current = std::make_unique(); diff --git a/shell/browser/api/gpu_info_enumerator.h b/shell/browser/api/gpu_info_enumerator.h index 04584527cea3a..b457e856e5ff6 100644 --- a/shell/browser/api/gpu_info_enumerator.h +++ b/shell/browser/api/gpu_info_enumerator.h @@ -25,7 +25,6 @@ class GPUInfoEnumerator final : public gpu::GPUInfo::Enumerator { const char* kImageDecodeAcceleratorSupportedProfileKey = "imageDecodeAcceleratorSupportedProfile"; const char* kAuxAttributesKey = "auxAttributes"; - const char* kDx12VulkanVersionInfoKey = "dx12VulkanVersionInfo"; const char* kOverlayInfo = "overlayInfo"; public: @@ -49,8 +48,6 @@ class GPUInfoEnumerator final : public gpu::GPUInfo::Enumerator { void EndImageDecodeAcceleratorSupportedProfile() override; void BeginAuxAttributes() override; void EndAuxAttributes() override; - void BeginDx12VulkanVersionInfo() override; - void EndDx12VulkanVersionInfo() override; void BeginOverlayInfo() override; void EndOverlayInfo() override; std::unique_ptr GetDictionary(); From 2c3b94f4973697b8017c601e1008393cc9442f87 Mon Sep 17 00:00:00 2001 From: Andy Locascio Date: Thu, 25 Jun 2020 17:04:55 -0700 Subject: [PATCH 11/79] add max_xcode_version build var Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2264867 --- DEPS | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 1a8f1bef616a4..53bbae86ac1a1 100644 --- a/DEPS +++ b/DEPS @@ -8,7 +8,8 @@ gclient_gn_args = [ 'checkout_pgo_profiles', 'checkout_oculus_sdk', 'checkout_openxr', - 'checkout_google_benchmark' + 'checkout_google_benchmark', + 'mac_xcode_version', ] vars = { @@ -51,6 +52,8 @@ vars = { # Python "requests" module is used for releases only. 'checkout_requests': False, + 'mac_xcode_version': 'default', + # To allow running hooks without parsing the DEPS tree 'process_deps': True, From 4b0d84412dab5bbc38d999651991726cf6733a91 Mon Sep 17 00:00:00 2001 From: Andy Locascio Date: Thu, 25 Jun 2020 17:05:23 -0700 Subject: [PATCH 12/79] add missing headers --- shell/browser/extensions/electron_extension_loader.h | 1 + shell/browser/notifications/mac/cocoa_notification.mm | 1 + shell/browser/notifications/mac/notification_center_delegate.mm | 1 + shell/browser/notifications/mac/notification_presenter_mac.mm | 2 ++ shell/browser/session_preferences.cc | 1 + shell/browser/ui/accelerator_util.cc | 1 + 6 files changed, 7 insertions(+) diff --git a/shell/browser/extensions/electron_extension_loader.h b/shell/browser/extensions/electron_extension_loader.h index f7050fa84a210..713eb0ae4c064 100644 --- a/shell/browser/extensions/electron_extension_loader.h +++ b/shell/browser/extensions/electron_extension_loader.h @@ -9,6 +9,7 @@ #include #include +#include "base/callback.h" #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" diff --git a/shell/browser/notifications/mac/cocoa_notification.mm b/shell/browser/notifications/mac/cocoa_notification.mm index b4be60027323f..016227cf0b5b2 100644 --- a/shell/browser/notifications/mac/cocoa_notification.mm +++ b/shell/browser/notifications/mac/cocoa_notification.mm @@ -7,6 +7,7 @@ #include #include +#include "base/logging.h" #include "base/mac/mac_util.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" diff --git a/shell/browser/notifications/mac/notification_center_delegate.mm b/shell/browser/notifications/mac/notification_center_delegate.mm index d632d15774e29..3d8c0073eab05 100644 --- a/shell/browser/notifications/mac/notification_center_delegate.mm +++ b/shell/browser/notifications/mac/notification_center_delegate.mm @@ -6,6 +6,7 @@ #include +#include "base/logging.h" #include "shell/browser/notifications/mac/cocoa_notification.h" #include "shell/browser/notifications/mac/notification_presenter_mac.h" diff --git a/shell/browser/notifications/mac/notification_presenter_mac.mm b/shell/browser/notifications/mac/notification_presenter_mac.mm index e83fc1f67421c..3d735916708db 100644 --- a/shell/browser/notifications/mac/notification_presenter_mac.mm +++ b/shell/browser/notifications/mac/notification_presenter_mac.mm @@ -2,6 +2,8 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. +#include "base/logging.h" + #include "shell/browser/notifications/mac/notification_presenter_mac.h" #include "shell/browser/notifications/mac/cocoa_notification.h" diff --git a/shell/browser/session_preferences.cc b/shell/browser/session_preferences.cc index c02924ec9035f..0d05526909b81 100644 --- a/shell/browser/session_preferences.cc +++ b/shell/browser/session_preferences.cc @@ -4,6 +4,7 @@ #include "shell/browser/session_preferences.h" +#include "base/logging.h" #include "base/memory/ptr_util.h" namespace electron { diff --git a/shell/browser/ui/accelerator_util.cc b/shell/browser/ui/accelerator_util.cc index f1d83d6892ed2..05ec3dafe1cab 100644 --- a/shell/browser/ui/accelerator_util.cc +++ b/shell/browser/ui/accelerator_util.cc @@ -9,6 +9,7 @@ #include #include +#include "base/logging.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" From 29184b0067672d0e1ef5e8bd6b06b475ea5b3aa1 Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Fri, 26 Jun 2020 06:01:19 -0700 Subject: [PATCH 13/79] chore: bump chromium in DEPS to cded18ca1138f7e8efc904f077ddcca34f0135cf --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 53bbae86ac1a1..428527f48f641 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - 'b2eaf9ff4e6b03267bf279583ea20ceb2b25e9d0', + 'cded18ca1138f7e8efc904f077ddcca34f0135cf', 'node_version': 'v12.18.1', 'nan_version': From c8c47979d31e38c3a0d5bef91c4820b4393309fb Mon Sep 17 00:00:00 2001 From: Andy Locascio Date: Fri, 26 Jun 2020 15:25:55 -0700 Subject: [PATCH 14/79] update patches --- patches/chromium/.patches | 1 - ...client_precreatemessageloop_callback.patch | 6 +- .../add_didinstallconditionalfeatures.patch | 4 +- ...leges_in_unsandboxed_child_processes.patch | 8 +-- patches/chromium/blink_local_frame.patch | 2 +- patches/chromium/blink_world_context.patch | 8 +-- patches/chromium/can_create_window.patch | 20 +++--- ...esources_not_chrome_for_spellchecker.patch | 4 +- .../chromium/content_browser_main_loop.patch | 2 +- patches/chromium/dcheck.patch | 2 +- ...ay_lock_the_protocol_scheme_registry.patch | 12 ++-- patches/chromium/disable-redraw-lock.patch | 2 +- .../disable_color_correct_rendering.patch | 20 +++--- ...that_fails_with_software_compositing.patch | 28 --------- patches/chromium/disable_hidden.patch | 4 +- ..._scheduler_throttling_per_renderview.patch | 10 +-- ...screen_rendering_with_viz_compositor.patch | 2 +- patches/chromium/frame_host_manager.patch | 12 ++-- patches/chromium/mas_no_private_api.patch | 61 +++++++++---------- .../chromium/notification_provenance.patch | 2 +- patches/chromium/resource_file_conflict.patch | 2 +- ...ove_contentrendererclient_shouldfork.patch | 8 +-- patches/chromium/scroll_bounce_flag.patch | 4 +- .../support_mixed_sandbox_with_zygote.patch | 4 +- ...andboxed_ppapi_processes_skip_zygote.patch | 4 +- .../use_electron_resources_in_pdf_util.patch | 2 +- .../worker_context_will_destroy.patch | 4 +- 27 files changed, 104 insertions(+), 134 deletions(-) delete mode 100644 patches/chromium/disable_dcheck_that_fails_with_software_compositing.patch diff --git a/patches/chromium/.patches b/patches/chromium/.patches index c9ffe300436c4..7659a0089c107 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -94,6 +94,5 @@ breakpad_allow_getting_string_values_for_crash_keys.patch crash_allow_disabling_compression_on_linux.patch allow_setting_secondary_label_via_simplemenumodel.patch disable_unnecessary_ischromefirstrun_check.patch -disable_dcheck_that_fails_with_software_compositing.patch fix_swap_global_proxies_before_initializing_the_windows_proxies.patch feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch diff --git a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch index fca1f1de0f4d2..21be31c66ee1d 100644 --- a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch +++ b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch @@ -10,10 +10,10 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set. This should be upstreamed. diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc -index 826755d4d1ded89ab2b2f873f2ac0d4a38183089..9151dbcf31b6c8adedcae27e0628b51d6d6e7681 100644 +index 82f55455fe365f54bdc3eefac8bd538af13f642d..5da552f02472299e09bc33c5ab0aa184b62953a4 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc -@@ -256,6 +256,10 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -255,6 +255,10 @@ int GpuMain(const MainFunctionParams& parameters) { // to the GpuProcessHost once the GpuServiceImpl has started. viz::GpuServiceImpl::InstallPreInitializeLogHandler(); @@ -24,7 +24,7 @@ index 826755d4d1ded89ab2b2f873f2ac0d4a38183089..9151dbcf31b6c8adedcae27e0628b51d // We are experiencing what appear to be memory-stomp issues in the GPU // process. These issues seem to be impacting the task executor and listeners // registered to it. Create the task executor on the heap to guard against -@@ -390,7 +394,6 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -389,7 +393,6 @@ int GpuMain(const MainFunctionParams& parameters) { } #endif diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index 063ed7367748f..d5a62f0027302 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -23,10 +23,10 @@ index 4e195f960d7b9bf50f6784ce380a84a10867914f..dbf85ffe8504bdbab1c4c29f085e5307 int32_t world_id) {} virtual void DidClearWindowObject() {} diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 8bac6a6b55faf46637470e99701f489157a1f2f6..d24fc2a6d5f9406407392ae4fcf7890c7dc98310 100644 +index 74e98485b4646b5e91ff2c15e85d85205df2851c..55af1205b90a1fce035a6b7abf1797fe20ea1f7b 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4737,6 +4737,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, +@@ -4741,6 +4741,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, observer.DidCreateScriptContext(context, world_id); } diff --git a/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch b/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch index 958be87f4a38d..8e78e2bcfa9d0 100644 --- a/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch +++ b/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch @@ -6,13 +6,13 @@ Subject: allow new privileges in unsandboxed child processes This allows unsandboxed renderers to launch setuid processes on Linux. diff --git a/content/browser/child_process_launcher_helper_linux.cc b/content/browser/child_process_launcher_helper_linux.cc -index e53e60ef146f8024e503f9ffad663a4d2dbc4f80..cee204cf6447c4b2a8cfd9c4ca257fe46af3e2e9 100644 +index e63dfcf43147c7174942277b2c129675014c9e59..0f1c04b23d40977332182cb54219ba21afd4bc28 100644 --- a/content/browser/child_process_launcher_helper_linux.cc +++ b/content/browser/child_process_launcher_helper_linux.cc -@@ -54,6 +54,18 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread( +@@ -53,6 +53,18 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread( + if (GetProcessType() == switches::kRendererProcess) { const int sandbox_fd = SandboxHostLinux::GetInstance()->GetChildSocket(); - options->fds_to_remap.push_back( - std::make_pair(sandbox_fd, service_manager::GetSandboxFD())); + options->fds_to_remap.push_back(std::make_pair(sandbox_fd, GetSandboxFD())); + + // (For Electron), if we're launching without zygote, that means we're + // launching an unsandboxed process (since all sandboxed processes are diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch index ec242d988e5f7..3ff3262175bd2 100644 --- a/patches/chromium/blink_local_frame.patch +++ b/patches/chromium/blink_local_frame.patch @@ -14,7 +14,7 @@ when there is code doing that. This patch reverts the change to fix the crash in Electron. diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc -index 8f7a3a1e943b59044792cb19b02febcda8475b8f..88090ae29eb4cc5f8780a5bb7e16a71593b05a5e 100644 +index 81585d785de936e300af913a0f37d90d3e1b62fb..d80e2b34ee8397f8880135dbc1a25622fb5e9dc2 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc @@ -538,10 +538,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { diff --git a/patches/chromium/blink_world_context.patch b/patches/chromium/blink_world_context.patch index 8e0fec36b5fa0..4d78fda168e91 100644 --- a/patches/chromium/blink_world_context.patch +++ b/patches/chromium/blink_world_context.patch @@ -7,10 +7,10 @@ This exposes a method for obtaining a reference to an isolated world, which is otherwise not available in the Blink API. diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h -index be5efdc896fd9318b50c9e5ad02ec404ba7be23d..79234d0def2d4e97e05a03ecb1dbd7b077bc44b2 100644 +index 198a934c8d9613eb612e6a8cb94d04e27a4dd021..abae04fec8e99d89a548020d50f3d8ab5feffa32 100644 --- a/third_party/blink/public/web/web_local_frame.h +++ b/third_party/blink/public/web/web_local_frame.h -@@ -354,6 +354,8 @@ class WebLocalFrame : public WebFrame { +@@ -355,6 +355,8 @@ class WebLocalFrame : public WebFrame { // Returns the world ID associated with |script_context|. virtual int32_t GetScriptContextWorldId( v8::Local script_context) const = 0; @@ -20,7 +20,7 @@ index be5efdc896fd9318b50c9e5ad02ec404ba7be23d..79234d0def2d4e97e05a03ecb1dbd7b0 // Executes script in the context of the current page and returns the value // that the script evaluated to with callback. Script execution can be 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 b94a424b644e5ccb2214499e708187427e80c701..9460471d34336f7b33c2e368f0da393d2a180edf 100644 +index 6a19e9258f2c99251a561ff7162b90bf510db74c..04847ec56911463707e152ffc01ae091519297fa 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 @@ -967,6 +967,13 @@ v8::Local WebLocalFrameImpl::GlobalProxy() const { @@ -38,7 +38,7 @@ index b94a424b644e5ccb2214499e708187427e80c701..9460471d34336f7b33c2e368f0da393d 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 d3dbe21b34cafa395706320bde5b7b11c1b84b4e..bc00e411e3ea6e08909d004de1a01cc548ec700d 100644 +index ae31e3855c7ba507ac5a97b6fb50519701ca27b1..64181ab40cab2e4eea5e31d7f8ed263ed9b8ceac 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 @@ -166,6 +166,8 @@ class CORE_EXPORT WebLocalFrameImpl final diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index dd74889aff564..cc240eecab1d4 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -9,7 +9,7 @@ potentially prevent a window from being created. TODO(loc): this patch is currently broken. diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc -index 012615782c6aba669cb973945e2603b70e548173..b456378b2d1414720b285a6f18fe71adb8e1e6d6 100644 +index 2379e91cf3e2a04a25717a684a2c381d7328bf25..d9cf1c5996d3ed4c86200552dacaabf7e9da4ff0 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc @@ -4787,6 +4787,7 @@ void RenderFrameHostImpl::CreateNewWindow( @@ -38,7 +38,7 @@ index 1afd8ac2c2cf78efa1386b89227e4a5d2ca0ce60..4a576f48e677c7d91726e9c59dd4a24a for (auto& observer : observers_) { diff --git a/content/common/frame.mojom b/content/common/frame.mojom -index 322e2f0f4f023cd2e34163f623c5b52eaad51c1d..46ae29207c804ae3474ae3a3dd8f76de93a1deb0 100644 +index 118a262e5e18c22df6a01312b9f99b235d60ae50..329a92f9c0089cf8f94c7cd2fe990204c670419c 100644 --- a/content/common/frame.mojom +++ b/content/common/frame.mojom @@ -277,6 +277,10 @@ struct CreateNewWindowParams { @@ -53,10 +53,10 @@ index 322e2f0f4f023cd2e34163f623c5b52eaad51c1d..46ae29207c804ae3474ae3a3dd8f76de // 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 c5e90f4e5e706b84f5a5eec537f5c6886986a28b..b2b0acfbfe0ee0d808ec973164b85eedd20eee00 100644 +index 87375b2ef10c24b5d8d0f604f6a9ee601a706a0c..84ca4325a72a5c4267d43e5be9bfd7b73efa0b86 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc -@@ -524,6 +524,8 @@ bool ContentBrowserClient::CanCreateWindow( +@@ -529,6 +529,8 @@ bool ContentBrowserClient::CanCreateWindow( const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -66,7 +66,7 @@ index c5e90f4e5e706b84f5a5eec537f5c6886986a28b..b2b0acfbfe0ee0d808ec973164b85eed 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 45900c9a9ef7d482af769fb2b95a5a6614ab400e..5fb6724a95d9fde9cae15da9de2b307fc1c1f3a5 100644 +index edf60410ba571866b03968804543188f7f00c088..00f3f557ccf69760c4e0ac7c9fcc7d048e21e8d8 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -147,6 +147,7 @@ class NetworkService; @@ -77,7 +77,7 @@ index 45900c9a9ef7d482af769fb2b95a5a6614ab400e..5fb6724a95d9fde9cae15da9de2b307f } // namespace network namespace sandbox { -@@ -841,6 +842,8 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -849,6 +850,8 @@ class CONTENT_EXPORT ContentBrowserClient { const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -135,7 +135,7 @@ index e545ff70c612e98cdd79230303273a3ec7bfcaac..405152e0e90bc76b7de9c3e6946944f3 // typically happens when popups are created. virtual void WebContentsCreated(WebContents* source_contents, diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc -index 29220e08371ad0f7a400c81bd024c55130430767..57447f4529917692155d1861c7658156978fa0be 100644 +index c6a990f873066fec1ac7ce5e088ecd02d2142e71..272b613f658ef4bfa3869cbd17d342ceef665142 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -67,6 +67,7 @@ @@ -146,7 +146,7 @@ index 29220e08371ad0f7a400c81bd024c55130430767..57447f4529917692155d1861c7658156 #include "content/renderer/media/audio/audio_device_factory.h" #include "content/renderer/render_frame_impl.h" #include "content/renderer/render_frame_proxy.h" -@@ -1238,6 +1239,10 @@ WebView* RenderViewImpl::CreateView( +@@ -1235,6 +1236,10 @@ WebView* RenderViewImpl::CreateView( } params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features); @@ -206,10 +206,10 @@ index 4f735ad0d97eaac9a57dad137e479f8a7ec33a36..0a3c5821962c85609b64b3625fa6b8d6 } // namespace blink diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc -index 6da6ad8caf756e8a0f8d6ba4974f6f44a85fe43d..73694633e84c76dcb54cf92c11e018cee1853007 100644 +index 314bc6c11a62bf0cc10c2323183caf97c1e2de16..df08ad7696358c70b2644ad07caefa913ceeeb30 100644 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc -@@ -2001,6 +2001,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, +@@ -2011,6 +2011,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, } WebWindowFeatures window_features = GetWindowFeaturesFromString(features); diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch index aba813b3325a9..1013671c59b73 100644 --- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch +++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch @@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from Electrons grit header instead of Chromes diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 875c5f8c82019178ee94c1ea01bf932f55e4b445..d27e13d91a8bbc978448bf5e9064e099845cfdae 100644 +index ab48d5805899998f4905875f6663bad7fe69d3dc..a6bdc9f6316105a18b0f4befbfe7e26ee66dfcc3 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -5507,6 +5507,7 @@ static_library("browser") { +@@ -5516,6 +5516,7 @@ static_library("browser") { deps += [ "//components/spellcheck/browser", "//components/spellcheck/common", diff --git a/patches/chromium/content_browser_main_loop.patch b/patches/chromium/content_browser_main_loop.patch index 0850900ceaa9e..a453b869373c8 100644 --- a/patches/chromium/content_browser_main_loop.patch +++ b/patches/chromium/content_browser_main_loop.patch @@ -8,7 +8,7 @@ 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 064d60f239b962fc27c08e892b410ad8f2642dc0..dc98dc7e1d803b512e195ddcc376044b3fffdc4e 100644 +index 4ada8596176e8581f8e5db15f91c1cd70f41d7e9..4d600e5d34a0a7514c17c7d02bdabdc796660c9a 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -1436,7 +1436,7 @@ void BrowserMainLoop::MainMessageLoopRun() { diff --git a/patches/chromium/dcheck.patch b/patches/chromium/dcheck.patch index 66acf92ec3cd5..6e15a57843273 100644 --- a/patches/chromium/dcheck.patch +++ b/patches/chromium/dcheck.patch @@ -17,7 +17,7 @@ only one or two specific checks fail. Then it's better to simply comment out the failing checks and allow the rest of the target to have them enabled. diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc -index ca15b62e8a8d2b889355a00ba4ea9644a056974c..2fb8ecfa7e979c05c8377433f920036a3e670fda 100644 +index d6c77f00ee6fb5f0a21d2d3df2bc00aea3f7e5dc..f8aade234eab49e3600e5d78d9ce71af66646ba3 100644 --- a/content/browser/frame_host/navigation_controller_impl.cc +++ b/content/browser/frame_host/navigation_controller_impl.cc @@ -1267,8 +1267,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation( diff --git a/patches/chromium/delay_lock_the_protocol_scheme_registry.patch b/patches/chromium/delay_lock_the_protocol_scheme_registry.patch index 8bf38028b4e20..18a1af60af4a6 100644 --- a/patches/chromium/delay_lock_the_protocol_scheme_registry.patch +++ b/patches/chromium/delay_lock_the_protocol_scheme_registry.patch @@ -19,10 +19,10 @@ https://chromium-review.googlesource.com/c/chromium/src/+/1901591, we should try re-submitting the patch. diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc -index 12055944205a9d8de54e6d3ff66e99b723fa5752..b46a9f4ad5f07c2a8e649edbfb52b52f9f6e9946 100644 +index f5e5576fd7455336481111c24b436457e235e43c..4af47c892ce5485ff18de67e1af8962cd7315406 100644 --- a/content/app/content_main_runner_impl.cc +++ b/content/app/content_main_runner_impl.cc -@@ -663,7 +663,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) { +@@ -662,7 +662,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) { } #endif @@ -68,10 +68,10 @@ index 3038f9d25798f36811b6398f8cc0e7d83ecc41b0..68189c36c47ef85b345b0ccc40c456f8 // Re-initializes schemes for tests. CONTENT_EXPORT void ReRegisterContentSchemesForTests(); diff --git a/content/public/app/content_main_delegate.cc b/content/public/app/content_main_delegate.cc -index ed5b0e2c0b4d453560ee9e2e4a55780b409eeea9..46e29dca5d13691bcf9494c0f90b68d6219a75ef 100644 +index 02985a525c98999f469906c8ff3647b740d9f962..e52e8d69c2d05b31d1f28b19752be362941e52be 100644 --- a/content/public/app/content_main_delegate.cc +++ b/content/public/app/content_main_delegate.cc -@@ -37,6 +37,10 @@ int ContentMainDelegate::TerminateForFatalInitializationError() { +@@ -36,6 +36,10 @@ int ContentMainDelegate::TerminateForFatalInitializationError() { return 0; } @@ -83,10 +83,10 @@ index ed5b0e2c0b4d453560ee9e2e4a55780b409eeea9..46e29dca5d13691bcf9494c0f90b68d6 return service_manager::ProcessType::kDefault; } diff --git a/content/public/app/content_main_delegate.h b/content/public/app/content_main_delegate.h -index 2d9ee9fa20a9aba1de168cc86bfeea5eab71e6d3..4b163c3fa2ddd258b5527e0ccaf9fc9d2621ef75 100644 +index 0ca924769b98009264b53121dfe6a892b81e8530..606a5cb8d89216a95e9187fba2ea9b6d4121a394 100644 --- a/content/public/app/content_main_delegate.h +++ b/content/public/app/content_main_delegate.h -@@ -77,6 +77,20 @@ class CONTENT_EXPORT ContentMainDelegate { +@@ -76,6 +76,20 @@ class CONTENT_EXPORT ContentMainDelegate { // returning initialization error code. Default behavior is CHECK(false). virtual int TerminateForFatalInitializationError(); diff --git a/patches/chromium/disable-redraw-lock.patch b/patches/chromium/disable-redraw-lock.patch index 5f7d59e7358d0..0a65183203cfb 100644 --- a/patches/chromium/disable-redraw-lock.patch +++ b/patches/chromium/disable-redraw-lock.patch @@ -15,7 +15,7 @@ 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 c3062870d9655b06374a4708b41d618d1942e948..73462190057aa5d12162cf011ba50d8a737db95e 100644 +index db4fe784c7e119111917757b2d1de4d7cc1e5f2b..f6e9f97e47b44fa47e8e6c237be371754a5204bd 100644 --- a/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc @@ -306,6 +306,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500; diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch index f7e571faf2de5..35a38b3dfaf82 100644 --- a/patches/chromium/disable_color_correct_rendering.patch +++ b/patches/chromium/disable_color_correct_rendering.patch @@ -81,7 +81,7 @@ index f28c3218baa08e7ae885567e0ede1d8108f8a373..a5f4a4a10a776fc92a5e9fbc9593563d !command_line->HasSwitch(switches::kUIDisablePartialSwap); #if defined(OS_MACOSX) diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc -index 5fd60eb6b1540bd51b3b19df6201ebf91de0bb09..678702151310ad7837df9b2cdf554755464f3431 100644 +index 591e5c4e6f7291412a5f05c244d6256a4b4fd57d..2af556050b7fe4ce7404d0c5ce6f2328a1e863fd 100644 --- a/components/viz/service/display/gl_renderer.cc +++ b/components/viz/service/display/gl_renderer.cc @@ -89,6 +89,9 @@ @@ -177,7 +177,7 @@ index 5fd60eb6b1540bd51b3b19df6201ebf91de0bb09..678702151310ad7837df9b2cdf554755 if (current_program_->rounded_corner_rect_location() != -1) { SetShaderRoundedCorner( -@@ -3356,7 +3366,9 @@ void GLRenderer::PrepareGeometry(BoundGeometry binding) { +@@ -3357,7 +3367,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) { @@ -188,7 +188,7 @@ index 5fd60eb6b1540bd51b3b19df6201ebf91de0bb09..678702151310ad7837df9b2cdf554755 // If the input color space is PQ, and it did not specify a white level, // override it with the frame's white level. -@@ -3738,9 +3750,9 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource( +@@ -3739,9 +3751,9 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource( cc::MathUtil::CheckedRoundUp(iosurface_height, iosurface_multiple); } @@ -201,7 +201,7 @@ index 5fd60eb6b1540bd51b3b19df6201ebf91de0bb09..678702151310ad7837df9b2cdf554755 *new_bounds = gfx::RectF(updated_dst_rect.origin(), gfx::SizeF((*overlay_texture)->texture.size())); -@@ -3959,8 +3971,8 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) { +@@ -3960,8 +3972,8 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) { PrepareGeometry(SHARED_BINDING); @@ -212,17 +212,17 @@ index 5fd60eb6b1540bd51b3b19df6201ebf91de0bb09..678702151310ad7837df9b2cdf554755 gfx::Transform render_matrix; render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(), -@@ -4077,3 +4089,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize( +@@ -4079,3 +4091,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 55e4567abb1218ae99eda15d3cabbf408843a18b..59e8e4b4a9d490b0383fc5013e495d607f4cd84a 100644 +index 9f9d3422ad128fe3bfc305baa57971bd03e1b676..02747c0d4d7f0bb7ba034f35bcce86a91774bb36 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc -@@ -210,6 +210,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus( +@@ -215,6 +215,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus( // Command-line switches to propagate to the GPU process. static const char* const kSwitchNames[] = { @@ -231,7 +231,7 @@ index 55e4567abb1218ae99eda15d3cabbf408843a18b..59e8e4b4a9d490b0383fc5013e495d60 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 03c5e4cc58ae9321dc2a89cef43d615ac2023916..1800a97025d03d7fbf8cf5ab7a632277dd32202e 100644 +index e5a82f46cd58b0da9959930ee85303e4a1530425..753b926fbe0c6a3ef2b2e244d7f80f4f4574bc5c 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -227,6 +227,7 @@ @@ -242,7 +242,7 @@ index 03c5e4cc58ae9321dc2a89cef43d615ac2023916..1800a97025d03d7fbf8cf5ab7a632277 #include "ui/gl/gl_switches.h" #include "ui/native_theme/native_theme_features.h" #include "url/origin.h" -@@ -3282,6 +3283,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( +@@ -3283,6 +3284,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[] = { @@ -251,7 +251,7 @@ index 03c5e4cc58ae9321dc2a89cef43d615ac2023916..1800a97025d03d7fbf8cf5ab7a632277 service_manager::switches::kDisableInProcessStackTraces, service_manager::switches::kDisableSeccompFilterSandbox, diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc -index d56b2a18c3e1edc5c02ceb99d695dde3023f94dc..9e44fd8e77d5fcf651ab1bd9399317bd58881423 100644 +index 30e6638b9c5bf4b04e73156ee4b0f70a91134010..6a05f399a8a70f5d7f4f04ec9b02968bf2c0ef6d 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -2216,6 +2216,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings( diff --git a/patches/chromium/disable_dcheck_that_fails_with_software_compositing.patch b/patches/chromium/disable_dcheck_that_fails_with_software_compositing.patch deleted file mode 100644 index ea9fb863000e4..0000000000000 --- a/patches/chromium/disable_dcheck_that_fails_with_software_compositing.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Deepak Mohan -Date: Fri, 22 May 2020 17:58:16 -0700 -Subject: Disable DCHECK that fails with software compositing - -Should be removed once https://bugs.chromium.org/p/chromium/issues/detail?id=1084625 -is addressed. - -diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc -index 73462190057aa5d12162cf011ba50d8a737db95e..1799392ca89f174bfbe56c272d809570386b7614 100644 ---- a/ui/views/win/hwnd_message_handler.cc -+++ b/ui/views/win/hwnd_message_handler.cc -@@ -2436,13 +2436,13 @@ void HWNDMessageHandler::OnPaint(HDC dc) { - RECT cr; - if (GetClientRect(hwnd(), &cr)) { - if (exposed_pixels_.height() > 0) { -- DCHECK_GE(cr.bottom, exposed_pixels_.height()); -+ //DCHECK_GE(cr.bottom, exposed_pixels_.height()); - RECT rect = {cr.left, cr.bottom - exposed_pixels_.height(), cr.right, - cr.bottom}; - FillRect(ps.hdc, &rect, brush); - } - if (exposed_pixels_.width() > 0) { -- DCHECK_GE(cr.right, exposed_pixels_.width()); -+ //DCHECK_GE(cr.right, exposed_pixels_.width()); - RECT rect = {cr.right - exposed_pixels_.width(), cr.top, cr.right, - cr.bottom - exposed_pixels_.height()}; - FillRect(ps.hdc, &rect, brush); diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch index 059ba9d8f7fd1..bbd991168eed2 100644 --- a/patches/chromium/disable_hidden.patch +++ b/patches/chromium/disable_hidden.patch @@ -34,10 +34,10 @@ index 5f3f2feec8c787ff1e086bf256ef9353732037af..a127ec54042ef869f0e19ba6b86b86d4 const base::TimeDelta& delay) { new_content_rendering_delay_ = delay; diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc -index 0edc16351ec6856bb1b3010905ebff4cf7f1b2a3..a73d370bf2475a112790ba7c02d8d8d3ba9febff 100644 +index 5f793a992ee8265d17030311c41cb4ef0a6f760a..106165971c3047b85f173c0c2fb33923998f3886 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -623,7 +623,7 @@ void RenderWidgetHostViewAura::HideImpl() { +@@ -621,7 +621,7 @@ void RenderWidgetHostViewAura::HideImpl() { DCHECK(visibility_ == Visibility::HIDDEN || visibility_ == Visibility::OCCLUDED); diff --git a/patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch index b803a4b6b12be..f5289994fd258 100644 --- a/patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch +++ b/patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch @@ -6,7 +6,7 @@ Subject: feat: allow disabling blink scheduler throttling per RenderView This allows us to disable throttling for hidden windows. diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc -index f2c4cbf786188b8aa5dad1e7f2b8ae9c785aaed9..2882ef3371960cc914ac27e9b6eedd09ff34cb63 100644 +index e82b5722776f8053eb56db7b4b88dfd81c234d6c..b8c169c51d1cfb4099496de0ac0cd8945f415526 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -512,6 +512,10 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) { @@ -21,7 +21,7 @@ index f2c4cbf786188b8aa5dad1e7f2b8ae9c785aaed9..2882ef3371960cc914ac27e9b6eedd09 return is_active(); } diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h -index c0943cbdd019a37474e1727b8282b7138475e74f..cb58b299976745edb6e3f0d13687301b7fc61a10 100644 +index e00204b089349c6356acaac6a8918c8b74936486..b77b8028772f9e1afdc62606094defbe40074fbe 100644 --- a/content/browser/renderer_host/render_view_host_impl.h +++ b/content/browser/renderer_host/render_view_host_impl.h @@ -110,6 +110,7 @@ class CONTENT_EXPORT RenderViewHostImpl @@ -61,10 +61,10 @@ index dfd856eb481114fea9da3e26b4080c9a8473acf6..604a95a0427705eca523e91b08a136f8 // // Returns the current WebKit preferences. Note: WebPreferences is cached, so diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc -index 57447f4529917692155d1861c7658156978fa0be..2eaf980889ef9053e728dc09e76f1fcd889153b8 100644 +index 272b613f658ef4bfa3869cbd17d342ceef665142..461310b69c823546f99d99b087b9ea005167a883 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc -@@ -1173,6 +1173,8 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) { +@@ -1170,6 +1170,8 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(RenderViewImpl, message) @@ -73,7 +73,7 @@ index 57447f4529917692155d1861c7658156978fa0be..2eaf980889ef9053e728dc09e76f1fcd IPC_MESSAGE_HANDLER(ViewMsg_UpdateTargetURL_ACK, OnUpdateTargetURLAck) IPC_MESSAGE_HANDLER(ViewMsg_UpdateWebPreferences, OnUpdateWebPreferences) IPC_MESSAGE_HANDLER(ViewMsg_MoveOrResizeStarted, OnMoveOrResizeStarted) -@@ -1669,6 +1671,12 @@ bool RenderViewImpl::GetContentStateImmediately() { +@@ -1666,6 +1668,12 @@ bool RenderViewImpl::GetContentStateImmediately() { return send_content_state_immediately_; } diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch index f0fd5d24ab771..486caa1b90255 100644 --- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch +++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch @@ -527,7 +527,7 @@ index 6b7fbb6cf13dc8ee6ade0878a9a2c1efc5d4d3f1..e2af75168cb914a7b3b4a6c9b6a28549 + Draw(gfx.mojom.Rect damage_rect) => (); }; diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h -index 0f99c9d78626ccc211236832e5df2008ce0df5f2..f1dfa72d21e93f5223cde8e2b34d5ed2a6c04209 100644 +index 438dd212d881abf70362f12391b6a85f697785d0..34bd0cbf18714ac24355e603806cc36986f24e30 100644 --- a/ui/compositor/compositor.h +++ b/ui/compositor/compositor.h @@ -74,6 +74,7 @@ class DisplayPrivate; diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index f00038782466b..e20536f7441a1 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -42,10 +42,10 @@ index 6b03c07316eaab83a50afc123fc9f17b1c1dfa3b..e821571731e4e1a93f873477c7410de7 // another SiteInstance for the same site. void RegisterSiteInstance(SiteInstanceImpl* site_instance); diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc -index 6c3252af5e5f6dac3045f6315704ba9d494add4c..12ff9285320ca3c49bfdffb8a358024e80d18bd2 100644 +index 1938d37051feb75e812c481ff6937581a95f5e3c..f1d9401376347311585b9e017fc4e78b9f722f22 100644 --- a/content/browser/frame_host/navigation_request.cc +++ b/content/browser/frame_host/navigation_request.cc -@@ -1406,6 +1406,21 @@ void NavigationRequest::BeginNavigation() { +@@ -1408,6 +1408,21 @@ void NavigationRequest::BeginNavigation() { // it immediately. EnterChildTraceEvent("ResponseStarted", this); @@ -67,7 +67,7 @@ index 6c3252af5e5f6dac3045f6315704ba9d494add4c..12ff9285320ca3c49bfdffb8a358024e // Select an appropriate RenderFrameHost. render_frame_host_ = frame_tree_node_->render_manager()->GetFrameHostForNavigation(this); -@@ -4783,6 +4798,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { +@@ -4793,6 +4808,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { {WILL_START_REQUEST, { WILL_REDIRECT_REQUEST, WILL_PROCESS_RESPONSE, @@ -75,7 +75,7 @@ index 6c3252af5e5f6dac3045f6315704ba9d494add4c..12ff9285320ca3c49bfdffb8a358024e READY_TO_COMMIT, DID_COMMIT, CANCELING, -@@ -4796,10 +4812,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { +@@ -4806,10 +4822,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { WILL_FAIL_REQUEST, }}, {WILL_PROCESS_RESPONSE, { @@ -229,7 +229,7 @@ index 571e6381f2456450a07b64c3a84d1f15f4cbbefa..cb342a6c4915c4b2cc7fe0c1b3c7219f size_t GetRelatedActiveContentsCount() override; bool RequiresDedicatedProcess() override; diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc -index b2b0acfbfe0ee0d808ec973164b85eedd20eee00..81d624692ee9692c5a1d860eaac655ff2d5ff8d4 100644 +index 84ca4325a72a5c4267d43e5be9bfd7b73efa0b86..4af654e2a2dbb5450b3f8ca1d85b0e6c94825c42 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -59,6 +59,21 @@ @@ -255,7 +255,7 @@ index b2b0acfbfe0ee0d808ec973164b85eedd20eee00..81d624692ee9692c5a1d860eaac655ff const MainFunctionParams& parameters) { return nullptr; diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 5fb6724a95d9fde9cae15da9de2b307fc1c1f3a5..004ff58ca6fcfcf4491dd90dc4ea29c5992a48da 100644 +index 00f3f557ccf69760c4e0ac7c9fcc7d048e21e8d8..d968ab756f8628a3e52b57c9cacb50dea7819157 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -240,8 +240,45 @@ class CONTENT_EXPORT ContentBrowserClient { diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch index 7c525ede72f4f..b232acb6b63d1 100644 --- a/patches/chromium/mas_no_private_api.patch +++ b/patches/chromium/mas_no_private_api.patch @@ -7,10 +7,10 @@ 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/accessibility_tree_formatter_mac.mm b/content/browser/accessibility/accessibility_tree_formatter_mac.mm -index 628e4a28eec03529b65bb4a74e99919e94b74c35..5491a8153707f725a924c5050782a8350694fb1d 100644 +index bc23c9cea294a363c650f234f3b697cd7139b082..608a2c79c22cd41ab3bc044c9af1c940ecec653e 100644 --- a/content/browser/accessibility/accessibility_tree_formatter_mac.mm +++ b/content/browser/accessibility/accessibility_tree_formatter_mac.mm -@@ -480,7 +480,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( +@@ -527,7 +527,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( 0 == strcmp([value objCType], @encode(NSRange))) { return PopulateRange([value rangeValue]); } @@ -19,7 +19,7 @@ index 628e4a28eec03529b65bb4a74e99919e94b74c35..5491a8153707f725a924c5050782a835 // AXTextMarker if (content::IsAXTextMarker(value)) { return PopulateTextPosition(content::AXTextMarkerToPosition(value).get(), -@@ -491,7 +491,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( +@@ -538,7 +538,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( if (content::IsAXTextMarkerRange(value)) { return PopulateTextMarkerRange(value, line_indexes_map); } @@ -28,7 +28,7 @@ index 628e4a28eec03529b65bb4a74e99919e94b74c35..5491a8153707f725a924c5050782a835 // Accessible object if ([value isKindOfClass:[BrowserAccessibilityCocoa class]]) { return base::Value(NodeToLineIndex(value, line_indexes_map)); -@@ -542,7 +542,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextPosition( +@@ -589,7 +589,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextPosition( kConstValuePrefix + affinity); return set; } @@ -37,7 +37,7 @@ index 628e4a28eec03529b65bb4a74e99919e94b74c35..5491a8153707f725a924c5050782a835 base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( id object, const LineIndexesMap& line_indexes_map) const { -@@ -557,7 +557,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( +@@ -604,7 +604,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( dict.SetPath("focus", PopulateTextPosition(range.focus(), line_indexes_map)); return dict; } @@ -47,10 +47,10 @@ index 628e4a28eec03529b65bb4a74e99919e94b74c35..5491a8153707f725a924c5050782a835 NSArray* node_array, const LineIndexesMap& line_indexes_map) const { diff --git a/content/browser/accessibility/browser_accessibility_cocoa.h b/content/browser/accessibility/browser_accessibility_cocoa.h -index 8e7b652d2eb51ca20672d25465c2f2a42092086d..1bb0d2b7c9ab7a073da8454e328636b0a00277e3 100644 +index 947a548278067323aabe099986057ed68a8f50ae..d169708cbeef7e840301cf5d4167769bf6df3ef7 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.h +++ b/content/browser/accessibility/browser_accessibility_cocoa.h -@@ -124,7 +124,9 @@ BrowserAccessibilityPosition::AXRangeType AXTextMarkerRangeToRange(id); +@@ -129,7 +129,9 @@ id AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, @property(nonatomic, readonly) NSNumber* enabled; // Returns a text marker that points to the last character in the document that // can be selected with Voiceover. @@ -60,7 +60,7 @@ index 8e7b652d2eb51ca20672d25465c2f2a42092086d..1bb0d2b7c9ab7a073da8454e328636b0 @property(nonatomic, readonly) NSNumber* expanded; @property(nonatomic, readonly) NSNumber* focused; @property(nonatomic, readonly) NSNumber* grabbed; -@@ -135,7 +137,9 @@ BrowserAccessibilityPosition::AXRangeType AXTextMarkerRangeToRange(id); +@@ -140,7 +142,9 @@ id AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, @property(nonatomic, readonly, getter=isIgnored) BOOL ignored; // Index of a row, column, or tree item. @property(nonatomic, readonly) NSNumber* index; @@ -70,7 +70,7 @@ index 8e7b652d2eb51ca20672d25465c2f2a42092086d..1bb0d2b7c9ab7a073da8454e328636b0 @property(nonatomic, readonly) NSString* invalid; @property(nonatomic, readonly) NSNumber* isMultiSelectable; @property(nonatomic, readonly) NSString* placeholderValue; -@@ -158,14 +162,18 @@ BrowserAccessibilityPosition::AXRangeType AXTextMarkerRangeToRange(id); +@@ -163,14 +167,18 @@ id AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, // The object is selected as a whole. @property(nonatomic, readonly) NSNumber* selected; @property(nonatomic, readonly) NSArray* selectedChildren; @@ -90,7 +90,7 @@ index 8e7b652d2eb51ca20672d25465c2f2a42092086d..1bb0d2b7c9ab7a073da8454e328636b0 // 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 ce1d034e40fbf907c18684711c36d8f428d174ff..5fd67af11106ef1e0bb093078d78d6451651d418 100644 +index 47174fe1dd4743c6bffc6f462baa58db187501f6..84cb0fe898631353ade5b205cc061c7e8622301d 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm @@ -208,6 +208,7 @@ NSString* const @@ -133,16 +133,15 @@ index ce1d034e40fbf907c18684711c36d8f428d174ff..5fd67af11106ef1e0bb093078d78d645 bool content::IsAXTextMarker(id object) { if (object == nil) return false; -@@ -755,7 +760,7 @@ BrowserAccessibilityPosition::AXRangeType - content::AXTextMarkerRangeToRange(id text_marker_range) { - return CreateRangeFromTextMarkerRange(text_marker_range); +@@ -765,6 +770,7 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, + return CreateTextMarker(std::move(position)); } -- + +#endif @implementation BrowserAccessibilityCocoa + (void)initialize { -@@ -792,7 +797,9 @@ content::AXTextMarkerRangeToRange(id text_marker_range) { +@@ -801,7 +807,9 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, {NSAccessibilityEditableAncestorAttribute, @"editableAncestor"}, {NSAccessibilityElementBusyAttribute, @"elementBusy"}, {NSAccessibilityEnabledAttribute, @"enabled"}, @@ -152,7 +151,7 @@ index ce1d034e40fbf907c18684711c36d8f428d174ff..5fd67af11106ef1e0bb093078d78d645 {NSAccessibilityExpandedAttribute, @"expanded"}, {NSAccessibilityFocusableAncestorAttribute, @"focusableAncestor"}, {NSAccessibilityFocusedAttribute, @"focused"}, -@@ -804,8 +811,10 @@ content::AXTextMarkerRangeToRange(id text_marker_range) { +@@ -813,8 +821,10 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, {NSAccessibilityHighestEditableAncestorAttribute, @"highestEditableAncestor"}, {NSAccessibilityIndexAttribute, @"index"}, @@ -163,7 +162,7 @@ index ce1d034e40fbf907c18684711c36d8f428d174ff..5fd67af11106ef1e0bb093078d78d645 {NSAccessibilityInvalidAttribute, @"invalid"}, {NSAccessibilityIsMultiSelectableAttribute, @"isMultiSelectable"}, {NSAccessibilityLanguageAttribute, @"language"}, -@@ -827,13 +836,17 @@ content::AXTextMarkerRangeToRange(id text_marker_range) { +@@ -836,13 +846,17 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, {NSAccessibilityRowsAttribute, @"rows"}, // TODO(aboxhall): expose // NSAccessibilityServesAsTitleForUIElementsAttribute @@ -181,7 +180,7 @@ index ce1d034e40fbf907c18684711c36d8f428d174ff..5fd67af11106ef1e0bb093078d78d645 {NSAccessibilitySizeAttribute, @"size"}, {NSAccessibilitySortDirectionAttribute, @"sortDirection"}, {NSAccessibilitySubroleAttribute, @"subrole"}, -@@ -1321,6 +1334,7 @@ content::AXTextMarkerRangeToRange(id text_marker_range) { +@@ -1330,6 +1344,7 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, ax::mojom::Restriction::kDisabled]; } @@ -189,7 +188,7 @@ index ce1d034e40fbf907c18684711c36d8f428d174ff..5fd67af11106ef1e0bb093078d78d645 // Returns a text marker that points to the last character in the document that // can be selected with VoiceOver. - (id)endTextMarker { -@@ -1331,6 +1345,7 @@ content::AXTextMarkerRangeToRange(id text_marker_range) { +@@ -1340,6 +1355,7 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); return CreateTextMarker(position->CreatePositionAtEndOfAnchor()); } @@ -197,7 +196,7 @@ index ce1d034e40fbf907c18684711c36d8f428d174ff..5fd67af11106ef1e0bb093078d78d645 - (NSNumber*)expanded { if (![self instanceActive]) -@@ -1480,6 +1495,8 @@ content::AXTextMarkerRangeToRange(id text_marker_range) { +@@ -1489,6 +1505,8 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, return nil; } @@ -206,7 +205,7 @@ index ce1d034e40fbf907c18684711c36d8f428d174ff..5fd67af11106ef1e0bb093078d78d645 - (NSNumber*)insertionPointLineNumber { if (![self instanceActive]) return nil; -@@ -1502,6 +1519,7 @@ content::AXTextMarkerRangeToRange(id text_marker_range) { +@@ -1511,6 +1529,7 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, caretPosition->AsTextPosition()->text_offset()); return @(std::distance(lineBreaks.begin(), iterator)); } @@ -214,7 +213,7 @@ index ce1d034e40fbf907c18684711c36d8f428d174ff..5fd67af11106ef1e0bb093078d78d645 // Returns whether or not this node should be ignored in the // accessibility tree. -@@ -2178,6 +2196,7 @@ content::AXTextMarkerRangeToRange(id text_marker_range) { +@@ -2187,6 +2206,7 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, return ret; } @@ -222,7 +221,7 @@ index ce1d034e40fbf907c18684711c36d8f428d174ff..5fd67af11106ef1e0bb093078d78d645 - (NSString*)selectedText { if (![self instanceActive]) return nil; -@@ -2189,11 +2208,13 @@ content::AXTextMarkerRangeToRange(id text_marker_range) { +@@ -2198,11 +2218,13 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, return nil; return base::SysUTF16ToNSString(range.GetText()); } @@ -236,7 +235,7 @@ index ce1d034e40fbf907c18684711c36d8f428d174ff..5fd67af11106ef1e0bb093078d78d645 - (NSValue*)selectedTextRange { if (![self instanceActive]) return nil; -@@ -2214,12 +2235,15 @@ content::AXTextMarkerRangeToRange(id text_marker_range) { +@@ -2223,12 +2245,15 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, int selLength = range.GetText().length(); return [NSValue valueWithRange:NSMakeRange(selStart, selLength)]; } @@ -252,7 +251,7 @@ index ce1d034e40fbf907c18684711c36d8f428d174ff..5fd67af11106ef1e0bb093078d78d645 - (NSValue*)size { if (![self instanceActive]) -@@ -2252,6 +2276,7 @@ content::AXTextMarkerRangeToRange(id text_marker_range) { +@@ -2261,6 +2286,7 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, return nil; } @@ -260,7 +259,7 @@ index ce1d034e40fbf907c18684711c36d8f428d174ff..5fd67af11106ef1e0bb093078d78d645 // Returns a text marker that points to the first character in the document that // can be selected with VoiceOver. - (id)startTextMarker { -@@ -2262,6 +2287,7 @@ content::AXTextMarkerRangeToRange(id text_marker_range) { +@@ -2271,6 +2297,7 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); return CreateTextMarker(position->CreatePositionAtStartOfAnchor()); } @@ -268,7 +267,7 @@ index ce1d034e40fbf907c18684711c36d8f428d174ff..5fd67af11106ef1e0bb093078d78d645 // Returns a subrole based upon the role. - (NSString*)subrole { -@@ -2584,11 +2610,13 @@ content::AXTextMarkerRangeToRange(id text_marker_range) { +@@ -2593,11 +2620,13 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, NSMutableAttributedString* attributedInnerText = [[[NSMutableAttributedString alloc] initWithString:base::SysUTF16ToNSString(innerText)] autorelease]; @@ -282,7 +281,7 @@ index ce1d034e40fbf907c18684711c36d8f428d174ff..5fd67af11106ef1e0bb093078d78d645 return [attributedInnerText attributedSubstringFromRange:range]; } -@@ -2692,9 +2720,8 @@ content::AXTextMarkerRangeToRange(id text_marker_range) { +@@ -2701,9 +2730,8 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, return ToBrowserAccessibilityCocoa(cell); } @@ -294,7 +293,7 @@ index ce1d034e40fbf907c18684711c36d8f428d174ff..5fd67af11106ef1e0bb093078d78d645 BrowserAccessibilityPositionInstance position = CreatePositionFromTextMarker(parameter); if (!position->IsNullPosition()) -@@ -3007,6 +3034,7 @@ content::AXTextMarkerRangeToRange(id text_marker_range) { +@@ -3016,6 +3044,7 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, return CreateTextMarker(root->CreatePositionAt(index)); } @@ -302,7 +301,7 @@ index ce1d034e40fbf907c18684711c36d8f428d174ff..5fd67af11106ef1e0bb093078d78d645 if ([attribute isEqualToString: NSAccessibilityBoundsForRangeParameterizedAttribute]) { -@@ -3042,6 +3070,7 @@ content::AXTextMarkerRangeToRange(id text_marker_range) { +@@ -3051,6 +3080,7 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, return nil; } @@ -310,7 +309,7 @@ index ce1d034e40fbf907c18684711c36d8f428d174ff..5fd67af11106ef1e0bb093078d78d645 if ([attribute isEqualToString: NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) { -@@ -3156,6 +3185,7 @@ content::AXTextMarkerRangeToRange(id text_marker_range) { +@@ -3165,6 +3195,7 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, return @(child->GetIndexInParent()); } diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch index 0a943aeae5bed..a2291a5e7569d 100644 --- a/patches/chromium/notification_provenance.patch +++ b/patches/chromium/notification_provenance.patch @@ -108,7 +108,7 @@ index 4bf25bf1fa69f7d3869369172d375e2e489e62a1..f80ef2cecc8b111dc54e109646573a59 mojo::PendingReceiver receiver); diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc -index 792e359038592c6cb5bc9da319cbd5b383d5ca12..5f73faa60d4e8d8688af6513134a7696fd464026 100644 +index b3cee953abdb4f8d6991dedaa43b4f8267f44f9d..a2fc5326f7ecc3d0bd57587f78d0e3231c5a49ac 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -2148,7 +2148,7 @@ void RenderProcessHostImpl::CreateNotificationService( diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch index 2f365030ab0a8..e36f521536d0c 100644 --- a/patches/chromium/resource_file_conflict.patch +++ b/patches/chromium/resource_file_conflict.patch @@ -52,7 +52,7 @@ 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 e890623fe19255bb8628fbf64cc521062f8bd41b..8ced3d436ab4db28414de5312fb125144c0e26b6 100644 +index f06eeeee05c8f645e4a5c640da69c524156e9ff0..7fe32cc32fba2b2760e23b9b83930c2726f44bf6 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -1388,7 +1388,7 @@ if (is_chrome_branded && !is_android) { diff --git a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch index 99c76725f3d2b..2c94933467344 100644 --- a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch +++ b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch @@ -9,10 +9,10 @@ for every navigation to keep Node.js working properly. Once Native Modules in th are required to be NAPI or context aware (Electron v11), this patch can be removed. diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc -index 0f17eadbb2d3913f44fb19643e143f62eaf7b4a3..e7706e8761eb401db589f45dea2c443f3b0aa4f1 100644 +index 03d1e6a078433e15accf847439182f7c8dea3f00..bf5dc00667ff0e47e9a0833ad302d06c39b5f822 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -1296,6 +1296,25 @@ bool ChromeContentRendererClient::AllowPopup() { +@@ -1306,6 +1306,25 @@ bool ChromeContentRendererClient::AllowPopup() { #endif } @@ -92,10 +92,10 @@ index d57edc0cea54b9d78700c3b9acdcfcc5f17341dd..e56aae188d7d8f46a4438b8e99f7e9b7 // |url|. If the function returns a valid |new_url|, the request must be // updated to use it. The |force_ignore_site_for_cookies| output parameter diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index d24fc2a6d5f9406407392ae4fcf7890c7dc98310..2dbf6643537e217b2f41e55e1c3444b46414eb18 100644 +index 55af1205b90a1fce035a6b7abf1797fe20ea1f7b..31c5bf1f0081f61313179a79529497f773b76ff0 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -5480,6 +5480,23 @@ void RenderFrameImpl::BeginNavigation( +@@ -5484,6 +5484,23 @@ void RenderFrameImpl::BeginNavigation( // we can do a per-frame check here rather than a process-wide check. bool should_fork = HasWebUIScheme(url) || HasWebUIScheme(old_url) || (enabled_bindings_ & kWebUIBindingsPolicyMask); diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch index d6cbdaaaa131f..813d25c99b63c 100644 --- a/patches/chromium/scroll_bounce_flag.patch +++ b/patches/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 8cbd82f65e4cec63aba72e6559909cd19a8265b7..adb8206e3a8af152b392227c862244672c8ad203 100644 +index baee6cbd6369e60471741770f1ab56e72f6c4c7c..bbbe819d4442e55d5dbdb54f82241ddec0ef5f0b 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -1357,7 +1357,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() { +@@ -1360,7 +1360,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() { } bool RenderThreadImpl::IsElasticOverscrollEnabled() { diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch index aa4991d6fc240..b7ddfb7d03b16 100644 --- a/patches/chromium/support_mixed_sandbox_with_zygote.patch +++ b/patches/chromium/support_mixed_sandbox_with_zygote.patch @@ -22,7 +22,7 @@ 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 5f73faa60d4e8d8688af6513134a7696fd464026..03c5e4cc58ae9321dc2a89cef43d615ac2023916 100644 +index a2fc5326f7ecc3d0bd57587f78d0e3231c5a49ac..e5a82f46cd58b0da9959930ee85303e4a1530425 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -414,6 +414,11 @@ class RendererSandboxedProcessLauncherDelegate @@ -40,7 +40,7 @@ index 5f73faa60d4e8d8688af6513134a7696fd464026..03c5e4cc58ae9321dc2a89cef43d615a @@ -435,6 +440,9 @@ class RendererSandboxedProcessLauncherDelegate #if BUILDFLAG(USE_ZYGOTE_HANDLE) - service_manager::ZygoteHandle GetZygote() override { + ZygoteHandle GetZygote() override { + if (!use_zygote_) { + return nullptr; + } diff --git a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch index 6028d3b104527..7a5d0aa35ea00 100644 --- a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch +++ b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch @@ -6,11 +6,11 @@ Subject: unsandboxed_ppapi_processes_skip_zygote.patch Unsandboxed ppapi processes should skip zygote. diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc -index 18ca6cf2de5b58f65a4786f9b7bfcd8ad0c2e9ae..0792c6f681f2cec8993de8c51fabdc5bc102ed25 100644 +index 09f2cabf4c3a97785eb24368762f9a221896f188..3956d540fb9122d2ec1217682a4cea5f9e014d27 100644 --- a/content/browser/ppapi_plugin_process_host.cc +++ b/content/browser/ppapi_plugin_process_host.cc @@ -123,6 +123,9 @@ class PpapiPluginSandboxedProcessLauncherDelegate - service_manager::ZygoteHandle GetZygote() override { + ZygoteHandle GetZygote() override { const base::CommandLine& browser_command_line = *base::CommandLine::ForCurrentProcess(); + if (browser_command_line.HasSwitch(service_manager::switches::kNoSandbox)) { diff --git a/patches/chromium/use_electron_resources_in_pdf_util.patch b/patches/chromium/use_electron_resources_in_pdf_util.patch index 3c652e54e65c3..7d028ee0fcf26 100644 --- a/patches/chromium/use_electron_resources_in_pdf_util.patch +++ b/patches/chromium/use_electron_resources_in_pdf_util.patch @@ -8,7 +8,7 @@ and cause a DCHECK(), since the resource will be loaded as an empty string. diff --git a/chrome/browser/pdf/pdf_extension_util.cc b/chrome/browser/pdf/pdf_extension_util.cc -index 77c529ba92ecadbad3fbbb1431fe90abef9ea8bb..ae10e620fdefcaa1f0127864418d8edca8468533 100644 +index 9fd9791fd923d6c5e741cb7dc064ababf9a7995a..0a5534f2f09224196971076794daa3c805c91606 100644 --- a/chrome/browser/pdf/pdf_extension_util.cc +++ b/chrome/browser/pdf/pdf_extension_util.cc @@ -8,7 +8,7 @@ diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch index 811984fd9c6e0..3f7a822cfa8a3 100644 --- a/patches/chromium/worker_context_will_destroy.patch +++ b/patches/chromium/worker_context_will_destroy.patch @@ -55,10 +55,10 @@ index 59d7d92cf5f76f45c41c8d10465bbb57b19e8676..6c8ef4c7c37e6b951f228500b178a53d const blink::WebString& header_name) override; diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h -index 7c3a255bd03f4b0eed60aa9d16d0611fe11fda93..26429111491fee98232237a2227cd6237bbab2d4 100644 +index 3278250b6d3d161a07f7cda5e18a281457ae519a..01930661416c1987790bb9b3fdd88a04e3662c7a 100644 --- a/third_party/blink/public/platform/platform.h +++ b/third_party/blink/public/platform/platform.h -@@ -625,6 +625,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -619,6 +619,7 @@ class BLINK_PLATFORM_EXPORT Platform { virtual void DidStartWorkerThread() {} virtual void WillStopWorkerThread() {} virtual void WorkerContextCreated(const v8::Local& worker) {} From 3cdaae146df155cc00a95e71922a6fdc5a449bf1 Mon Sep 17 00:00:00 2001 From: Andy Locascio Date: Fri, 26 Jun 2020 15:27:39 -0700 Subject: [PATCH 15/79] add empty floc blocklist to BrowserProcessImpl Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2240873 --- shell/browser/browser_process_impl.cc | 6 ++++++ shell/browser/browser_process_impl.h | 1 + 2 files changed, 7 insertions(+) diff --git a/shell/browser/browser_process_impl.cc b/shell/browser/browser_process_impl.cc index 32b6e6837024a..1bf3ee6496b82 100644 --- a/shell/browser/browser_process_impl.cc +++ b/shell/browser/browser_process_impl.cc @@ -9,6 +9,7 @@ #include #include "chrome/common/chrome_switches.h" +#include "components/federated_learning/floc_blocklist_service.h" #include "components/prefs/in_memory_pref_store.h" #include "components/prefs/overlay_user_pref_store.h" #include "components/prefs/pref_registry.h" @@ -237,6 +238,11 @@ BrowserProcessImpl::subresource_filter_ruleset_service() { return nullptr; } +federated_learning::FlocBlocklistService* +BrowserProcessImpl::floc_blocklist_service() { + return nullptr; +} + optimization_guide::OptimizationGuideService* BrowserProcessImpl::optimization_guide_service() { return nullptr; diff --git a/shell/browser/browser_process_impl.h b/shell/browser/browser_process_impl.h index dad4bad250254..9aa259626320a 100644 --- a/shell/browser/browser_process_impl.h +++ b/shell/browser/browser_process_impl.h @@ -79,6 +79,7 @@ class BrowserProcessImpl : public BrowserProcess { safe_browsing::SafeBrowsingService* safe_browsing_service() override; subresource_filter::RulesetService* subresource_filter_ruleset_service() override; + federated_learning::FlocBlocklistService* floc_blocklist_service() override; optimization_guide::OptimizationGuideService* optimization_guide_service() override; component_updater::ComponentUpdateService* component_updater() override; From e1a1d0319195957f6d9d4d036af9187d8221a211 Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Sat, 27 Jun 2020 06:01:21 -0700 Subject: [PATCH 16/79] chore: bump chromium in DEPS to f06602226cd80bf677b2ce013a94a2fb7f6ac58d --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 428527f48f641..1a2d542e07fe4 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - 'cded18ca1138f7e8efc904f077ddcca34f0135cf', + 'f06602226cd80bf677b2ce013a94a2fb7f6ac58d', 'node_version': 'v12.18.1', 'nan_version': From 8a29f707f85ab08999615c34d5f5793c6565d2ce Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Sun, 28 Jun 2020 06:01:07 -0700 Subject: [PATCH 17/79] chore: bump chromium in DEPS to 747aa4bfc74fc6cf7f08ee72624cd69ae41ae28d --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 1a2d542e07fe4..13c2e4b5b8bb8 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - 'f06602226cd80bf677b2ce013a94a2fb7f6ac58d', + '747aa4bfc74fc6cf7f08ee72624cd69ae41ae28d', 'node_version': 'v12.18.1', 'nan_version': From 5513932fef8b2e4ea15251aacbd1d19589c73814 Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Mon, 29 Jun 2020 06:01:23 -0700 Subject: [PATCH 18/79] chore: bump chromium in DEPS to 31c0105e50fcc4e94de33e5c8602c755ace4a32b --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 13c2e4b5b8bb8..5133a5b1aa45d 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - '747aa4bfc74fc6cf7f08ee72624cd69ae41ae28d', + '31c0105e50fcc4e94de33e5c8602c755ace4a32b', 'node_version': 'v12.18.1', 'nan_version': From 8553f5b23d29e5aff726172505c2b164f0e1b1ab Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Mon, 29 Jun 2020 12:48:19 -0700 Subject: [PATCH 19/79] chore: update patches --- .../add_didinstallconditionalfeatures.patch | 24 +++---- patches/chromium/add_realloc.patch | 2 +- patches/chromium/blink_local_frame.patch | 6 +- patches/chromium/blink_world_context.patch | 6 +- patches/chromium/can_create_window.patch | 18 +++--- ...esources_not_chrome_for_spellchecker.patch | 4 +- patches/chromium/dcheck.patch | 2 +- .../disable_color_correct_rendering.patch | 4 +- .../disable_compositor_recycling.patch | 2 +- ...dd_set_theme_source_to_allow_apps_to.patch | 4 +- ...g_the_base_spellchecker_download_url.patch | 2 +- ...review_disabled_when_printing_to_pdf.patch | 4 +- ...age_of_abort_report_np_in_mas_builds.patch | 8 +-- patches/chromium/frame_host_manager.patch | 20 +++--- .../mas-cgdisplayusesforcetogray.patch | 2 +- .../mas_disable_remote_accessibility.patch | 16 ++--- patches/chromium/mas_no_private_api.patch | 62 +++++++++---------- patches/chromium/printing.patch | 30 ++++----- ...put_back_deleted_colors_for_autofill.patch | 10 +-- .../render_widget_host_view_mac.patch | 8 +-- patches/chromium/resource_file_conflict.patch | 6 +- ...ove_contentrendererclient_shouldfork.patch | 4 +- patches/chromium/scroll_bounce_flag.patch | 4 +- .../worker_context_will_destroy.patch | 12 ++-- 24 files changed, 130 insertions(+), 130 deletions(-) diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index d5a62f0027302..0213dc4aa1897 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -23,10 +23,10 @@ index 4e195f960d7b9bf50f6784ce380a84a10867914f..dbf85ffe8504bdbab1c4c29f085e5307 int32_t world_id) {} virtual void DidClearWindowObject() {} diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 74e98485b4646b5e91ff2c15e85d85205df2851c..55af1205b90a1fce035a6b7abf1797fe20ea1f7b 100644 +index c2379d87a94113332bf6537340d62fb613d1dba6..37670e0284ae1df27ae665365c0119e279e7133c 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4741,6 +4741,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, +@@ -4711,6 +4711,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, observer.DidCreateScriptContext(context, world_id); } @@ -40,10 +40,10 @@ index 74e98485b4646b5e91ff2c15e85d85205df2851c..55af1205b90a1fce035a6b7abf1797fe int world_id) { for (auto& observer : observers_) diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h -index c6d8de45561cbcb6beeb6a28ce0517587b72a030..aef52b00d00392490d43cf7b7ef96ebad7b227e4 100644 +index ad6d3cc15e2f5aed7bfa412b8486e4476b9d2bd8..642edda7d9ca1841824dcac5baa1ea73a5dc1ebf 100644 --- a/content/renderer/render_frame_impl.h +++ b/content/renderer/render_frame_impl.h -@@ -719,6 +719,8 @@ class CONTENT_EXPORT RenderFrameImpl +@@ -714,6 +714,8 @@ class CONTENT_EXPORT RenderFrameImpl bool ShouldTrackUseCounter(const blink::WebURL& url) override; void DidCreateScriptContext(v8::Local context, int world_id) override; @@ -53,10 +53,10 @@ index c6d8de45561cbcb6beeb6a28ce0517587b72a030..aef52b00d00392490d43cf7b7ef96eba int world_id) override; void DidChangeScrollOffset() override; diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h -index f0a05ead42b7a5eb70fc4e5cae13710391f14b5c..b1bbdcf6f69128b9943001a2b64e8a92e5148ab1 100644 +index fc03157647020be347aad4aa472a053c05b120d9..96684e567c16f12774eae67f08b2f4c3d8c23da3 100644 --- a/third_party/blink/public/web/web_local_frame_client.h +++ b/third_party/blink/public/web/web_local_frame_client.h -@@ -550,6 +550,9 @@ class BLINK_EXPORT WebLocalFrameClient { +@@ -546,6 +546,9 @@ class BLINK_EXPORT WebLocalFrameClient { virtual void DidCreateScriptContext(v8::Local, int32_t world_id) {} @@ -79,10 +79,10 @@ index 5ac9a7ed3d0f91764452579992471c83104de64f..15ac214bc9177f2fc228cf93c459a7b3 if (World().IsMainWorld()) { GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld(); diff --git a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc -index adc00866f436b59bd50881949379014222d71a50..71631b77c13ea1e6e8a4f558ef5ac5a09886218d 100644 +index 7529cea5e8ccb5d9dbf3d9bacd7f637716f84909..9ec24e7e9985ab481612c7679d2a24bccbfbb4d8 100644 --- a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc +++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc -@@ -363,6 +363,13 @@ void LocalFrameClientImpl::DidCreateScriptContext( +@@ -362,6 +362,13 @@ void LocalFrameClientImpl::DidCreateScriptContext( web_frame_->Client()->DidCreateScriptContext(context, world_id); } @@ -97,7 +97,7 @@ index adc00866f436b59bd50881949379014222d71a50..71631b77c13ea1e6e8a4f558ef5ac5a0 v8::Local context, int32_t world_id) { diff --git a/third_party/blink/renderer/core/exported/local_frame_client_impl.h b/third_party/blink/renderer/core/exported/local_frame_client_impl.h -index 23a196c72164b41bfff97d105957889cce3a7fbe..c702d1dc09b5026ab77a0ba8ec03c4d0cc7c2d67 100644 +index 7e95076bad8579a6b3d5d02807e3668cedb2f4ee..888d5f7fa1037ca9f71a05bfc09825cc85f7c78d 100644 --- a/third_party/blink/renderer/core/exported/local_frame_client_impl.h +++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.h @@ -78,6 +78,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient { @@ -110,10 +110,10 @@ index 23a196c72164b41bfff97d105957889cce3a7fbe..c702d1dc09b5026ab77a0ba8ec03c4d0 int32_t world_id) override; diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h -index 27ab3b3056c81ca367f45e0a1f7bd74a153353c4..790f7fac77677aad8c1d69c287273a9bf9436ac2 100644 +index 4c6f1b9decbc5292d8349816fbac88dfd22b4774..ab28222f6be19cfc78c410633d20dc8646f98a2c 100644 --- a/third_party/blink/renderer/core/frame/local_frame_client.h +++ b/third_party/blink/renderer/core/frame/local_frame_client.h -@@ -297,6 +297,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient { +@@ -296,6 +296,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient { virtual void DidCreateScriptContext(v8::Local, int32_t world_id) = 0; @@ -123,7 +123,7 @@ index 27ab3b3056c81ca367f45e0a1f7bd74a153353c4..790f7fac77677aad8c1d69c287273a9b int32_t world_id) = 0; virtual bool AllowScriptExtensions() = 0; diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h -index a3797ca04ff968d67ce4c5da6b9f17abc1d7651d..e3f26a61cdc4042131ea58d744a9b487dd6f52ca 100644 +index 006c575be0f9a33b0a5833b2d5d7bca6ca7fe2b0..d21901198b3b118b153ae2f77d071775c08574d4 100644 --- a/third_party/blink/renderer/core/loader/empty_clients.h +++ b/third_party/blink/renderer/core/loader/empty_clients.h @@ -336,6 +336,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient { diff --git a/patches/chromium/add_realloc.patch b/patches/chromium/add_realloc.patch index de7765470c086..0ad4a73cf8894 100644 --- a/patches/chromium/add_realloc.patch +++ b/patches/chromium/add_realloc.patch @@ -39,7 +39,7 @@ index 2aef366ac8194aa261cbca6abc051f7da8a988d3..3c7d66c81032636abcca4f1538ce9b7f GIN_EXPORT static ArrayBufferAllocator* SharedInstance(); diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc -index fa88b2bd0233a4c5ff35a26d10e20fa1b91e33b2..21504ce01403d20067c8439c0c61ee0d71de84a5 100644 +index 04f635ffba0393e80e793a526d9bb221df2ac648..2299a662b20abb4917a7128053bc060210d9d558 100644 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc @@ -672,6 +672,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator { diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch index 3ff3262175bd2..2e5b1be620060 100644 --- a/patches/chromium/blink_local_frame.patch +++ b/patches/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 81585d785de936e300af913a0f37d90d3e1b62fb..d80e2b34ee8397f8880135dbc1a25622fb5e9dc2 100644 +index 3e9a5cb8f4a38092e3e25063febc37d9dbb2c5c2..f7c08c0bdecb17aa08b183a5f77592561547da04 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -538,10 +538,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { +@@ -539,10 +539,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { } CHECK(!view_ || !view_->IsAttached()); @@ -28,7 +28,7 @@ index 81585d785de936e300af913a0f37d90d3e1b62fb..d80e2b34ee8397f8880135dbc1a25622 if (!Client()) return; -@@ -559,6 +555,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) { +@@ -560,6 +556,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/chromium/blink_world_context.patch b/patches/chromium/blink_world_context.patch index 4d78fda168e91..9decfb8556aa1 100644 --- a/patches/chromium/blink_world_context.patch +++ b/patches/chromium/blink_world_context.patch @@ -20,10 +20,10 @@ index 198a934c8d9613eb612e6a8cb94d04e27a4dd021..abae04fec8e99d89a548020d50f3d8ab // Executes script in the context of the current page and returns the value // that the script evaluated to with callback. Script execution can be 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 6a19e9258f2c99251a561ff7162b90bf510db74c..04847ec56911463707e152ffc01ae091519297fa 100644 +index 4d6067a5cb566bde471ffcda9f01fff7509e892d..3e0b4029b0d2b97b754a8536fe38c4ffd42d50a2 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 -@@ -967,6 +967,13 @@ v8::Local WebLocalFrameImpl::GlobalProxy() const { +@@ -972,6 +972,13 @@ v8::Local WebLocalFrameImpl::GlobalProxy() const { return MainWorldScriptContext()->Global(); } @@ -38,7 +38,7 @@ index 6a19e9258f2c99251a561ff7162b90bf510db74c..04847ec56911463707e152ffc01ae091 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 ae31e3855c7ba507ac5a97b6fb50519701ca27b1..64181ab40cab2e4eea5e31d7f8ed263ed9b8ceac 100644 +index 9b2592b4859734fbd5deaea245209eee4c3c9ed3..ecc3555e14128c66288c7561d941609ff93fce13 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 @@ -166,6 +166,8 @@ class CORE_EXPORT WebLocalFrameImpl final diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index cc240eecab1d4..6ca3e66f0be0d 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -9,10 +9,10 @@ potentially prevent a window from being created. TODO(loc): this patch is currently broken. diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc -index 2379e91cf3e2a04a25717a684a2c381d7328bf25..d9cf1c5996d3ed4c86200552dacaabf7e9da4ff0 100644 +index fc19f12103a2beca5a3cdd26112877cca6ce761c..12945d7f28cb016d73a1b04b4291b461dffbb969 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc -@@ -4787,6 +4787,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -4769,6 +4769,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, @@ -53,10 +53,10 @@ index 118a262e5e18c22df6a01312b9f99b235d60ae50..329a92f9c0089cf8f94c7cd2fe990204 // 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 87375b2ef10c24b5d8d0f604f6a9ee601a706a0c..84ca4325a72a5c4267d43e5be9bfd7b73efa0b86 100644 +index 30a55af2e36aae217c5a67d52f7ce72546c63e47..8195149b963de0dcf7af993a3c43e53fb20d1df1 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc -@@ -529,6 +529,8 @@ bool ContentBrowserClient::CanCreateWindow( +@@ -533,6 +533,8 @@ bool ContentBrowserClient::CanCreateWindow( const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -66,7 +66,7 @@ index 87375b2ef10c24b5d8d0f604f6a9ee601a706a0c..84ca4325a72a5c4267d43e5be9bfd7b7 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 edf60410ba571866b03968804543188f7f00c088..00f3f557ccf69760c4e0ac7c9fcc7d048e21e8d8 100644 +index 58367f4e696b29df1cab2336229bc408d3ba63e6..9184695ea198b0e1b41c9bb456317ca2f5bc8886 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -147,6 +147,7 @@ class NetworkService; @@ -77,7 +77,7 @@ index edf60410ba571866b03968804543188f7f00c088..00f3f557ccf69760c4e0ac7c9fcc7d04 } // namespace network namespace sandbox { -@@ -849,6 +850,8 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -853,6 +854,8 @@ class CONTENT_EXPORT ContentBrowserClient { const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -206,14 +206,14 @@ index 4f735ad0d97eaac9a57dad137e479f8a7ec33a36..0a3c5821962c85609b64b3625fa6b8d6 } // namespace blink diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc -index 314bc6c11a62bf0cc10c2323183caf97c1e2de16..df08ad7696358c70b2644ad07caefa913ceeeb30 100644 +index 33423ebac5746f13203e9d4aa433bd6b1f6a54f2..c5cd539fbe4239565e7d0506c48999a30e916df3 100644 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc -@@ -2011,6 +2011,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, +@@ -2002,6 +2002,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, } WebWindowFeatures window_features = GetWindowFeaturesFromString(features); + window_features.raw_features = features; - FrameLoadRequest frame_request(incumbent_window->document(), + FrameLoadRequest frame_request(incumbent_window, ResourceRequest(completed_url)); diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch index 1013671c59b73..4b1a866648fdf 100644 --- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch +++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch @@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from Electrons grit header instead of Chromes diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index ab48d5805899998f4905875f6663bad7fe69d3dc..a6bdc9f6316105a18b0f4befbfe7e26ee66dfcc3 100644 +index 8c11b4a86b1517232d99fdbd7ae2c84d68f12dac..982bd9c0f5970140489c2879e53ab2f017edc8e2 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -5516,6 +5516,7 @@ static_library("browser") { +@@ -5524,6 +5524,7 @@ static_library("browser") { deps += [ "//components/spellcheck/browser", "//components/spellcheck/common", diff --git a/patches/chromium/dcheck.patch b/patches/chromium/dcheck.patch index 6e15a57843273..54c93b8acc37b 100644 --- a/patches/chromium/dcheck.patch +++ b/patches/chromium/dcheck.patch @@ -17,7 +17,7 @@ only one or two specific checks fail. Then it's better to simply comment out the failing checks and allow the rest of the target to have them enabled. diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc -index d6c77f00ee6fb5f0a21d2d3df2bc00aea3f7e5dc..f8aade234eab49e3600e5d78d9ce71af66646ba3 100644 +index ab8a6971a5214880ba2132b341dc19f2f61403e8..7e99dadf4853ac1baabde3f208be49895c2879ad 100644 --- a/content/browser/frame_host/navigation_controller_impl.cc +++ b/content/browser/frame_host/navigation_controller_impl.cc @@ -1267,8 +1267,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation( diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch index 35a38b3dfaf82..cb3d3741f2551 100644 --- a/patches/chromium/disable_color_correct_rendering.patch +++ b/patches/chromium/disable_color_correct_rendering.patch @@ -251,10 +251,10 @@ index e5a82f46cd58b0da9959930ee85303e4a1530425..753b926fbe0c6a3ef2b2e244d7f80f4f service_manager::switches::kDisableInProcessStackTraces, service_manager::switches::kDisableSeccompFilterSandbox, diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc -index 30e6638b9c5bf4b04e73156ee4b0f70a91134010..6a05f399a8a70f5d7f4f04ec9b02968bf2c0ef6d 100644 +index 32d3c35466fc8210615cac02e12576903ce0abcc..34facef5e15d482e552f01612ad974471f9dc30c 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc -@@ -2216,6 +2216,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings( +@@ -1902,6 +1902,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings( settings.main_frame_before_activation_enabled = cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation); diff --git a/patches/chromium/disable_compositor_recycling.patch b/patches/chromium/disable_compositor_recycling.patch index ddf0956839165..8da0db349933b 100644 --- a/patches/chromium/disable_compositor_recycling.patch +++ b/patches/chromium/disable_compositor_recycling.patch @@ -6,7 +6,7 @@ Subject: fix: disabling compositor recycling Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron. 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 aef2f3625465d5de36d0ce496f7133865a7ba18a..3c8735755deb2b2ff4b00cff16292ae003a8670d 100644 +index d240fa425224d2917f523b866921d4ae5950a4d3..eb8e76d86cb8293fe2ec75f42f20df41d8795f2c 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -478,7 +478,11 @@ void RenderWidgetHostViewMac::WasOccluded() { diff --git a/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch b/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch index f3dc9e9da87db..e339308240276 100644 --- a/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch +++ b/patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch @@ -13,10 +13,10 @@ uses internally for things like menus and devtools. We can remove this patch once it has in some shape been upstreamed. diff --git a/ui/native_theme/native_theme.cc b/ui/native_theme/native_theme.cc -index 150f4455d497c6e1ac84948eac088c9dc3a4d729..84a4d6dfc33ae7ba7e21efc5f38405e24749edd6 100644 +index eee37be164598cda0601f3580d0cbf51a22f4c61..6b724ff4006182ed2a3d381637a923a28754caa0 100644 --- a/ui/native_theme/native_theme.cc +++ b/ui/native_theme/native_theme.cc -@@ -247,6 +247,8 @@ NativeTheme::NativeTheme(bool should_use_dark_colors) +@@ -249,6 +249,8 @@ NativeTheme::NativeTheme(bool should_use_dark_colors) NativeTheme::~NativeTheme() = default; bool NativeTheme::ShouldUseDarkColors() const { diff --git a/patches/chromium/feat_add_support_for_overriding_the_base_spellchecker_download_url.patch b/patches/chromium/feat_add_support_for_overriding_the_base_spellchecker_download_url.patch index 052a0deefdd36..b5b5ba9b3d050 100644 --- a/patches/chromium/feat_add_support_for_overriding_the_base_spellchecker_download_url.patch +++ b/patches/chromium/feat_add_support_for_overriding_the_base_spellchecker_download_url.patch @@ -9,7 +9,7 @@ production use cases. This is unlikely to be upstreamed as the change is entirely in //chrome. diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc -index 5272b99db1d066c1c40e607de2a8570baedcf15f..ab017736f946c687e3b300d3f2c5b47697263963 100644 +index ffdb0522bf96ac97234c543df34a175137daf347..428e90c820fe6b6731ee433284a758d6c3c25e21 100644 --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc @@ -50,6 +50,9 @@ namespace { diff --git a/patches/chromium/fix_account_for_print_preview_disabled_when_printing_to_pdf.patch b/patches/chromium/fix_account_for_print_preview_disabled_when_printing_to_pdf.patch index 8b43e10e77420..afdf81af7fe95 100644 --- a/patches/chromium/fix_account_for_print_preview_disabled_when_printing_to_pdf.patch +++ b/patches/chromium/fix_account_for_print_preview_disabled_when_printing_to_pdf.patch @@ -10,10 +10,10 @@ understanding, it seems like we slightly misuse the print preview API and this is fallout from using it in a way the code doesn't expect. diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc -index 7406760e1c0247899232fc96614cfb2359ade432..2bf4ea5817c80bef2f057c10195ca846e3d44d0b 100644 +index ad9f504e47f83156fb388de9bee2b8efa8aad12c..663bd7186baf52e79fa549f5d1adde1a24e88d1b 100644 --- a/components/printing/renderer/print_render_frame_helper.cc +++ b/components/printing/renderer/print_render_frame_helper.cc -@@ -1499,6 +1499,7 @@ PrintRenderFrameHelper::CreatePreviewDocument() { +@@ -1491,6 +1491,7 @@ PrintRenderFrameHelper::CreatePreviewDocument() { const std::vector& pages = print_pages_params_->pages; bool require_document_metafile = diff --git a/patches/chromium/fix_disable_usage_of_abort_report_np_in_mas_builds.patch b/patches/chromium/fix_disable_usage_of_abort_report_np_in_mas_builds.patch index e19c87eaebc94..24064632e8ab8 100644 --- a/patches/chromium/fix_disable_usage_of_abort_report_np_in_mas_builds.patch +++ b/patches/chromium/fix_disable_usage_of_abort_report_np_in_mas_builds.patch @@ -6,12 +6,12 @@ Subject: fix_disable_usage_of_abort_report_np_in_mas_builds.patch Disable usage of abort_report_np in MAS builds. diff --git a/sandbox/mac/sandbox_logging.cc b/sandbox/mac/sandbox_logging.cc -index 4eebcea13d17093a685cc79b8a8f61fb3894c71b..d704dced154f1d5db097e566a9c681438f94475d 100644 +index 7f30c2c3e5b75a5e3c1cec6d5eda8acded9a3f25..d291c1f0799ea03183a7003c4d63203def9233ac 100644 --- a/sandbox/mac/sandbox_logging.cc +++ b/sandbox/mac/sandbox_logging.cc -@@ -22,9 +22,11 @@ - __builtin_unreachable(); \ +@@ -32,9 +32,11 @@ } + #endif +#if !defined(MAS_BUILD) extern "C" { @@ -21,7 +21,7 @@ index 4eebcea13d17093a685cc79b8a8f61fb3894c71b..d704dced154f1d5db097e566a9c68143 namespace sandbox { -@@ -94,11 +96,13 @@ void SendAslLog(Level level, const char* message) { +@@ -104,11 +106,13 @@ void SendAslLog(Level level, const char* message) { asl_set(asl_message.get(), ASL_KEY_MSG, message); asl_send(asl_client.get(), asl_message.get()); diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index e20536f7441a1..d37a4b0718eeb 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -42,10 +42,10 @@ index 6b03c07316eaab83a50afc123fc9f17b1c1dfa3b..e821571731e4e1a93f873477c7410de7 // another SiteInstance for the same site. void RegisterSiteInstance(SiteInstanceImpl* site_instance); diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc -index 1938d37051feb75e812c481ff6937581a95f5e3c..f1d9401376347311585b9e017fc4e78b9f722f22 100644 +index 6f13dd3aded702faa63bd8c092b3541349c538c0..09defb2502fce17775fe1e767291f3106adedb0a 100644 --- a/content/browser/frame_host/navigation_request.cc +++ b/content/browser/frame_host/navigation_request.cc -@@ -1408,6 +1408,21 @@ void NavigationRequest::BeginNavigation() { +@@ -1410,6 +1410,21 @@ void NavigationRequest::BeginNavigation() { // it immediately. EnterChildTraceEvent("ResponseStarted", this); @@ -67,7 +67,7 @@ index 1938d37051feb75e812c481ff6937581a95f5e3c..f1d9401376347311585b9e017fc4e78b // Select an appropriate RenderFrameHost. render_frame_host_ = frame_tree_node_->render_manager()->GetFrameHostForNavigation(this); -@@ -4793,6 +4808,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { +@@ -4795,6 +4810,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { {WILL_START_REQUEST, { WILL_REDIRECT_REQUEST, WILL_PROCESS_RESPONSE, @@ -75,7 +75,7 @@ index 1938d37051feb75e812c481ff6937581a95f5e3c..f1d9401376347311585b9e017fc4e78b READY_TO_COMMIT, DID_COMMIT, CANCELING, -@@ -4806,10 +4822,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { +@@ -4808,10 +4824,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { WILL_FAIL_REQUEST, }}, {WILL_PROCESS_RESPONSE, { @@ -229,10 +229,10 @@ index 571e6381f2456450a07b64c3a84d1f15f4cbbefa..cb342a6c4915c4b2cc7fe0c1b3c7219f size_t GetRelatedActiveContentsCount() override; bool RequiresDedicatedProcess() override; diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc -index 84ca4325a72a5c4267d43e5be9bfd7b73efa0b86..4af654e2a2dbb5450b3f8ca1d85b0e6c94825c42 100644 +index 8195149b963de0dcf7af993a3c43e53fb20d1df1..1cfea0d996fa90b2b1e6d28224a5841453fc1174 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc -@@ -59,6 +59,21 @@ +@@ -63,6 +63,21 @@ namespace content { @@ -255,10 +255,10 @@ index 84ca4325a72a5c4267d43e5be9bfd7b73efa0b86..4af654e2a2dbb5450b3f8ca1d85b0e6c const MainFunctionParams& parameters) { return nullptr; diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 00f3f557ccf69760c4e0ac7c9fcc7d048e21e8d8..d968ab756f8628a3e52b57c9cacb50dea7819157 100644 +index 9184695ea198b0e1b41c9bb456317ca2f5bc8886..265b2eee1aaef82850656aed8a6a7be92cc562f6 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -240,8 +240,45 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -244,8 +244,45 @@ class CONTENT_EXPORT ContentBrowserClient { using IsClipboardPasteAllowedCallback = base::OnceCallback; @@ -305,10 +305,10 @@ index 00f3f557ccf69760c4e0ac7c9fcc7d048e21e8d8..d968ab756f8628a3e52b57c9cacb50de // implementations for the browser startup code. See comments in // browser_main_parts.h. diff --git a/content/public/browser/site_instance.h b/content/public/browser/site_instance.h -index 82b5d4c25adc7071dfcfe56047520fa2fa7b72f2..8535ed4ab3ca5a90f3de7ab9e80159b2082e7dfa 100644 +index 0e6c3d076a02cd1b356745e514b9de9d32e4b00c..76647f1c5e9ee401fbf3def6ccfe73372f622548 100644 --- a/content/public/browser/site_instance.h +++ b/content/public/browser/site_instance.h -@@ -121,6 +121,11 @@ class CONTENT_EXPORT SiteInstance : public base::RefCounted { +@@ -134,6 +134,11 @@ class CONTENT_EXPORT SiteInstance : public base::RefCounted { // corresponds to a site URL with the host "example.com". virtual const GURL& GetSiteURL() = 0; diff --git a/patches/chromium/mas-cgdisplayusesforcetogray.patch b/patches/chromium/mas-cgdisplayusesforcetogray.patch index 3811f756d9ad6..471c5125d818b 100644 --- a/patches/chromium/mas-cgdisplayusesforcetogray.patch +++ b/patches/chromium/mas-cgdisplayusesforcetogray.patch @@ -6,7 +6,7 @@ Subject: mas-cgdisplayusesforcetogray.patch Removes usage of the CGDisplayUsesForceToGray private API. diff --git a/ui/display/mac/screen_mac.mm b/ui/display/mac/screen_mac.mm -index a4e374dd3552288ebead42c6c1e30e593496bafd..844f4c74d246b0008c270dc9721d15e9e0ebf0a5 100644 +index def99d430032be2791e689cb77603cfeb02a034f..066a6ef5d24705387e9f88feede2d32a73dcf6aa 100644 --- a/ui/display/mac/screen_mac.mm +++ b/ui/display/mac/screen_mac.mm @@ -131,7 +131,17 @@ Display BuildDisplayForScreen(NSScreen* screen) { diff --git a/patches/chromium/mas_disable_remote_accessibility.patch b/patches/chromium/mas_disable_remote_accessibility.patch index 2b630d873aad8..b1c4fd7403d48 100644 --- a/patches/chromium/mas_disable_remote_accessibility.patch +++ b/patches/chromium/mas_disable_remote_accessibility.patch @@ -90,7 +90,7 @@ index c3a9fbf0f9d2b80c1de42a22ad094a286f0b559b..02493d4b62c98a3aebd3e460c459218a DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostNSViewBridgeOwner); }; diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h -index 51f91581aff32cd42b74c7086f51282cbc3629e8..8fa02de5ed90538923cd858a92f339daac686994 100644 +index d5610b3ff1a834b16115647c3530618887f2155b..2643eda13762d5605f42ce7c98133bf627e38318 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.h +++ b/content/browser/renderer_host/render_widget_host_view_mac.h @@ -47,7 +47,9 @@ class ScopedPasswordInputEnabler; @@ -103,7 +103,7 @@ index 51f91581aff32cd42b74c7086f51282cbc3629e8..8fa02de5ed90538923cd858a92f339da @class RenderWidgetHostViewCocoa; namespace content { -@@ -628,10 +630,12 @@ class CONTENT_EXPORT RenderWidgetHostViewMac +@@ -640,10 +642,12 @@ class CONTENT_EXPORT RenderWidgetHostViewMac // EnsureSurfaceSynchronizedForWebTest(). uint32_t latest_capture_sequence_number_ = 0u; @@ -117,7 +117,7 @@ index 51f91581aff32cd42b74c7086f51282cbc3629e8..8fa02de5ed90538923cd858a92f339da // Used to force the NSApplication's focused accessibility element to be the // content::BrowserAccessibilityCocoa accessibility tree when the NSView for 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 026bb184e3ecf21185900d3102fbbdb4bc9e1100..aef2f3625465d5de36d0ce496f7133865a7ba18a 100644 +index eb75e4d47204118c963110c549835941776f5110..d240fa425224d2917f523b866921d4ae5950a4d3 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -233,8 +233,10 @@ RenderWidgetHostViewMac::~RenderWidgetHostViewMac() { @@ -131,7 +131,7 @@ index 026bb184e3ecf21185900d3102fbbdb4bc9e1100..aef2f3625465d5de36d0ce496f713386 // Disconnect from the previous bridge (this will have the effect of // destroying the associated bridge), and close the receiver (to allow it -@@ -1357,8 +1359,10 @@ RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessible() { +@@ -1377,8 +1379,10 @@ RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessible() { gfx::NativeViewAccessible RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessibleForWindow() { @@ -142,7 +142,7 @@ index 026bb184e3ecf21185900d3102fbbdb4bc9e1100..aef2f3625465d5de36d0ce496f713386 return [GetInProcessNSView() window]; } -@@ -1390,9 +1394,11 @@ id RenderWidgetHostViewMac::GetFocusedBrowserAccessibilityElement() { +@@ -1410,9 +1414,11 @@ id RenderWidgetHostViewMac::GetFocusedBrowserAccessibilityElement() { } void RenderWidgetHostViewMac::SetAccessibilityWindow(NSWindow* window) { @@ -154,7 +154,7 @@ index 026bb184e3ecf21185900d3102fbbdb4bc9e1100..aef2f3625465d5de36d0ce496f713386 } bool RenderWidgetHostViewMac::SyncIsWidgetForMainFrame( -@@ -1879,12 +1885,14 @@ void RenderWidgetHostViewMac::StopSpeaking() { +@@ -1899,12 +1905,14 @@ void RenderWidgetHostViewMac::StopSpeaking() { void RenderWidgetHostViewMac::SetRemoteAccessibilityWindowToken( const std::vector& window_token) { @@ -170,10 +170,10 @@ index 026bb184e3ecf21185900d3102fbbdb4bc9e1100..aef2f3625465d5de36d0ce496f713386 /////////////////////////////////////////////////////////////////////////////// diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn -index 1179753aeffe325bc35ee6a730b0a6fde269e909..097ed19949105ad80edc0750c7241697ba87dfe6 100644 +index b24839ba70e23b8f04a3ed226af1536516f440c7..d97329dbdc3ab2771b1504c094619b260fd8e54e 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn -@@ -311,6 +311,13 @@ jumbo_component("base") { +@@ -309,6 +309,13 @@ jumbo_component("base") { ] } diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch index b232acb6b63d1..8b11bf4c89e0e 100644 --- a/patches/chromium/mas_no_private_api.patch +++ b/patches/chromium/mas_no_private_api.patch @@ -7,10 +7,10 @@ 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/accessibility_tree_formatter_mac.mm b/content/browser/accessibility/accessibility_tree_formatter_mac.mm -index bc23c9cea294a363c650f234f3b697cd7139b082..608a2c79c22cd41ab3bc044c9af1c940ecec653e 100644 +index 6074fd6fb7da7c0e927fa81e8095729349520417..df7e644d20b75c0ace31d34d7a605efff805fa21 100644 --- a/content/browser/accessibility/accessibility_tree_formatter_mac.mm +++ b/content/browser/accessibility/accessibility_tree_formatter_mac.mm -@@ -527,7 +527,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( +@@ -573,7 +573,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( 0 == strcmp([value objCType], @encode(NSRange))) { return PopulateRange([value rangeValue]); } @@ -19,7 +19,7 @@ index bc23c9cea294a363c650f234f3b697cd7139b082..608a2c79c22cd41ab3bc044c9af1c940 // AXTextMarker if (content::IsAXTextMarker(value)) { return PopulateTextPosition(content::AXTextMarkerToPosition(value).get(), -@@ -538,7 +538,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( +@@ -584,7 +584,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( if (content::IsAXTextMarkerRange(value)) { return PopulateTextMarkerRange(value, line_indexes_map); } @@ -28,7 +28,7 @@ index bc23c9cea294a363c650f234f3b697cd7139b082..608a2c79c22cd41ab3bc044c9af1c940 // Accessible object if ([value isKindOfClass:[BrowserAccessibilityCocoa class]]) { return base::Value(NodeToLineIndex(value, line_indexes_map)); -@@ -589,7 +589,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextPosition( +@@ -635,7 +635,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextPosition( kConstValuePrefix + affinity); return set; } @@ -37,7 +37,7 @@ index bc23c9cea294a363c650f234f3b697cd7139b082..608a2c79c22cd41ab3bc044c9af1c940 base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( id object, const LineIndexesMap& line_indexes_map) const { -@@ -604,7 +604,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( +@@ -650,7 +650,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( dict.SetPath("focus", PopulateTextPosition(range.focus(), line_indexes_map)); return dict; } @@ -47,10 +47,10 @@ index bc23c9cea294a363c650f234f3b697cd7139b082..608a2c79c22cd41ab3bc044c9af1c940 NSArray* node_array, const LineIndexesMap& line_indexes_map) const { diff --git a/content/browser/accessibility/browser_accessibility_cocoa.h b/content/browser/accessibility/browser_accessibility_cocoa.h -index 947a548278067323aabe099986057ed68a8f50ae..d169708cbeef7e840301cf5d4167769bf6df3ef7 100644 +index d1d406e383d80cf7bc233c87d383084f130f73d5..f56a191cb01fbcf91f60abc312ee5277bf857929 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.h +++ b/content/browser/accessibility/browser_accessibility_cocoa.h -@@ -129,7 +129,9 @@ id AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, +@@ -132,7 +132,9 @@ id AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker); @property(nonatomic, readonly) NSNumber* enabled; // Returns a text marker that points to the last character in the document that // can be selected with Voiceover. @@ -60,7 +60,7 @@ index 947a548278067323aabe099986057ed68a8f50ae..d169708cbeef7e840301cf5d4167769b @property(nonatomic, readonly) NSNumber* expanded; @property(nonatomic, readonly) NSNumber* focused; @property(nonatomic, readonly) NSNumber* grabbed; -@@ -140,7 +142,9 @@ id AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, +@@ -143,7 +145,9 @@ id AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker); @property(nonatomic, readonly, getter=isIgnored) BOOL ignored; // Index of a row, column, or tree item. @property(nonatomic, readonly) NSNumber* index; @@ -70,7 +70,7 @@ index 947a548278067323aabe099986057ed68a8f50ae..d169708cbeef7e840301cf5d4167769b @property(nonatomic, readonly) NSString* invalid; @property(nonatomic, readonly) NSNumber* isMultiSelectable; @property(nonatomic, readonly) NSString* placeholderValue; -@@ -163,14 +167,18 @@ id AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, +@@ -166,14 +170,18 @@ id AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker); // The object is selected as a whole. @property(nonatomic, readonly) NSNumber* selected; @property(nonatomic, readonly) NSArray* selectedChildren; @@ -90,7 +90,7 @@ index 947a548278067323aabe099986057ed68a8f50ae..d169708cbeef7e840301cf5d4167769b // 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 47174fe1dd4743c6bffc6f462baa58db187501f6..84cb0fe898631353ade5b205cc061c7e8622301d 100644 +index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe91289c3e 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm @@ -208,6 +208,7 @@ NSString* const @@ -133,15 +133,15 @@ index 47174fe1dd4743c6bffc6f462baa58db187501f6..84cb0fe898631353ade5b205cc061c7e bool content::IsAXTextMarker(id object) { if (object == nil) return false; -@@ -765,6 +770,7 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, - return CreateTextMarker(std::move(position)); +@@ -770,6 +775,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { + kCFAllocatorDefault, anchor_textmarker, focus_textmarker); + return [static_cast(cf_marker_range) autorelease]; } - +#endif + @implementation BrowserAccessibilityCocoa - + (void)initialize { -@@ -801,7 +807,9 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, +@@ -807,7 +813,9 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { {NSAccessibilityEditableAncestorAttribute, @"editableAncestor"}, {NSAccessibilityElementBusyAttribute, @"elementBusy"}, {NSAccessibilityEnabledAttribute, @"enabled"}, @@ -151,7 +151,7 @@ index 47174fe1dd4743c6bffc6f462baa58db187501f6..84cb0fe898631353ade5b205cc061c7e {NSAccessibilityExpandedAttribute, @"expanded"}, {NSAccessibilityFocusableAncestorAttribute, @"focusableAncestor"}, {NSAccessibilityFocusedAttribute, @"focused"}, -@@ -813,8 +821,10 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, +@@ -819,8 +827,10 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { {NSAccessibilityHighestEditableAncestorAttribute, @"highestEditableAncestor"}, {NSAccessibilityIndexAttribute, @"index"}, @@ -162,7 +162,7 @@ index 47174fe1dd4743c6bffc6f462baa58db187501f6..84cb0fe898631353ade5b205cc061c7e {NSAccessibilityInvalidAttribute, @"invalid"}, {NSAccessibilityIsMultiSelectableAttribute, @"isMultiSelectable"}, {NSAccessibilityLanguageAttribute, @"language"}, -@@ -836,13 +846,17 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, +@@ -842,13 +852,17 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { {NSAccessibilityRowsAttribute, @"rows"}, // TODO(aboxhall): expose // NSAccessibilityServesAsTitleForUIElementsAttribute @@ -180,7 +180,7 @@ index 47174fe1dd4743c6bffc6f462baa58db187501f6..84cb0fe898631353ade5b205cc061c7e {NSAccessibilitySizeAttribute, @"size"}, {NSAccessibilitySortDirectionAttribute, @"sortDirection"}, {NSAccessibilitySubroleAttribute, @"subrole"}, -@@ -1330,6 +1344,7 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, +@@ -1336,6 +1350,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { ax::mojom::Restriction::kDisabled]; } @@ -188,7 +188,7 @@ index 47174fe1dd4743c6bffc6f462baa58db187501f6..84cb0fe898631353ade5b205cc061c7e // Returns a text marker that points to the last character in the document that // can be selected with VoiceOver. - (id)endTextMarker { -@@ -1340,6 +1355,7 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, +@@ -1346,6 +1361,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); return CreateTextMarker(position->CreatePositionAtEndOfAnchor()); } @@ -196,7 +196,7 @@ index 47174fe1dd4743c6bffc6f462baa58db187501f6..84cb0fe898631353ade5b205cc061c7e - (NSNumber*)expanded { if (![self instanceActive]) -@@ -1489,6 +1505,8 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, +@@ -1495,6 +1511,8 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return nil; } @@ -205,7 +205,7 @@ index 47174fe1dd4743c6bffc6f462baa58db187501f6..84cb0fe898631353ade5b205cc061c7e - (NSNumber*)insertionPointLineNumber { if (![self instanceActive]) return nil; -@@ -1511,6 +1529,7 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, +@@ -1517,6 +1535,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { caretPosition->AsTextPosition()->text_offset()); return @(std::distance(lineBreaks.begin(), iterator)); } @@ -213,7 +213,7 @@ index 47174fe1dd4743c6bffc6f462baa58db187501f6..84cb0fe898631353ade5b205cc061c7e // Returns whether or not this node should be ignored in the // accessibility tree. -@@ -2187,6 +2206,7 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, +@@ -2193,6 +2212,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return ret; } @@ -221,7 +221,7 @@ index 47174fe1dd4743c6bffc6f462baa58db187501f6..84cb0fe898631353ade5b205cc061c7e - (NSString*)selectedText { if (![self instanceActive]) return nil; -@@ -2198,11 +2218,13 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, +@@ -2204,11 +2224,13 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return nil; return base::SysUTF16ToNSString(range.GetText()); } @@ -235,7 +235,7 @@ index 47174fe1dd4743c6bffc6f462baa58db187501f6..84cb0fe898631353ade5b205cc061c7e - (NSValue*)selectedTextRange { if (![self instanceActive]) return nil; -@@ -2223,12 +2245,15 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, +@@ -2229,12 +2251,15 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { int selLength = range.GetText().length(); return [NSValue valueWithRange:NSMakeRange(selStart, selLength)]; } @@ -251,7 +251,7 @@ index 47174fe1dd4743c6bffc6f462baa58db187501f6..84cb0fe898631353ade5b205cc061c7e - (NSValue*)size { if (![self instanceActive]) -@@ -2261,6 +2286,7 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, +@@ -2267,6 +2292,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return nil; } @@ -259,7 +259,7 @@ index 47174fe1dd4743c6bffc6f462baa58db187501f6..84cb0fe898631353ade5b205cc061c7e // Returns a text marker that points to the first character in the document that // can be selected with VoiceOver. - (id)startTextMarker { -@@ -2271,6 +2297,7 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, +@@ -2277,6 +2303,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); return CreateTextMarker(position->CreatePositionAtStartOfAnchor()); } @@ -267,7 +267,7 @@ index 47174fe1dd4743c6bffc6f462baa58db187501f6..84cb0fe898631353ade5b205cc061c7e // Returns a subrole based upon the role. - (NSString*)subrole { -@@ -2593,11 +2620,13 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, +@@ -2599,11 +2626,13 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { NSMutableAttributedString* attributedInnerText = [[[NSMutableAttributedString alloc] initWithString:base::SysUTF16ToNSString(innerText)] autorelease]; @@ -281,7 +281,7 @@ index 47174fe1dd4743c6bffc6f462baa58db187501f6..84cb0fe898631353ade5b205cc061c7e return [attributedInnerText attributedSubstringFromRange:range]; } -@@ -2701,9 +2730,8 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, +@@ -2707,9 +2736,8 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return ToBrowserAccessibilityCocoa(cell); } @@ -293,7 +293,7 @@ index 47174fe1dd4743c6bffc6f462baa58db187501f6..84cb0fe898631353ade5b205cc061c7e BrowserAccessibilityPositionInstance position = CreatePositionFromTextMarker(parameter); if (!position->IsNullPosition()) -@@ -3016,6 +3044,7 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, +@@ -3022,6 +3050,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return CreateTextMarker(root->CreatePositionAt(index)); } @@ -301,7 +301,7 @@ index 47174fe1dd4743c6bffc6f462baa58db187501f6..84cb0fe898631353ade5b205cc061c7e if ([attribute isEqualToString: NSAccessibilityBoundsForRangeParameterizedAttribute]) { -@@ -3051,6 +3080,7 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, +@@ -3057,6 +3086,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return nil; } @@ -309,7 +309,7 @@ index 47174fe1dd4743c6bffc6f462baa58db187501f6..84cb0fe898631353ade5b205cc061c7e if ([attribute isEqualToString: NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) { -@@ -3165,6 +3195,7 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor, +@@ -3171,6 +3201,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return @(child->GetIndexInParent()); } diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch index 4c4ebf64c307c..02cecbff7d2d9 100644 --- a/patches/chromium/printing.patch +++ b/patches/chromium/printing.patch @@ -433,18 +433,18 @@ index faccd2a6881b74f1fa6538fc1011071ac54b03e0..342fba6eb86ee803aae6f11826ee5ccc // Tells the RenderFrame to switch the CSS to print media type, render every // requested page using the print preview document's frame/node, and then diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc -index bb02f228d604976a668eb8ffa39f49e659975272..7406760e1c0247899232fc96614cfb2359ade432 100644 +index 6ec0fc46b27554cdf49a7ba41ee070f7f4c41270..ad9f504e47f83156fb388de9bee2b8efa8aad12c 100644 --- a/components/printing/renderer/print_render_frame_helper.cc +++ b/components/printing/renderer/print_render_frame_helper.cc -@@ -44,6 +44,7 @@ +@@ -41,6 +41,7 @@ + #include "printing/buildflags/buildflags.h" #include "printing/metafile_skia.h" #include "printing/mojom/print.mojom.h" - #include "printing/printing_features.h" +#include "printing/print_settings.h" #include "printing/units.h" #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h" #include "third_party/blink/public/common/css/page_orientation.h" -@@ -1173,7 +1174,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) { +@@ -1160,7 +1161,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) { web_frame->DispatchBeforePrintEvent(); if (!weak_this) return; @@ -454,7 +454,7 @@ index bb02f228d604976a668eb8ffa39f49e659975272..7406760e1c0247899232fc96614cfb23 if (weak_this) web_frame->DispatchAfterPrintEvent(); } -@@ -1194,7 +1196,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver( +@@ -1181,7 +1183,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver( receivers_.Add(this, std::move(receiver)); } @@ -463,7 +463,7 @@ index bb02f228d604976a668eb8ffa39f49e659975272..7406760e1c0247899232fc96614cfb23 ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr()); if (ipc_nesting_level_ > 1) return; -@@ -1208,7 +1210,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() { +@@ -1195,7 +1197,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() { // If we are printing a PDF extension frame, find the plugin node and print // that instead. auto plugin = delegate_->GetPdfElement(frame); @@ -472,7 +472,7 @@ index bb02f228d604976a668eb8ffa39f49e659975272..7406760e1c0247899232fc96614cfb23 if (!render_frame_gone_) frame->DispatchAfterPrintEvent(); // WARNING: |this| may be gone at this point. Do not do any more work here and -@@ -1225,7 +1227,7 @@ void PrintRenderFrameHelper::PrintForSystemDialog() { +@@ -1212,7 +1214,7 @@ void PrintRenderFrameHelper::PrintForSystemDialog() { return; } Print(frame, print_preview_context_.source_node(), @@ -481,7 +481,7 @@ index bb02f228d604976a668eb8ffa39f49e659975272..7406760e1c0247899232fc96614cfb23 if (!render_frame_gone_) frame->DispatchAfterPrintEvent(); // WARNING: |this| may be gone at this point. Do not do any more work here and -@@ -1273,6 +1275,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) { +@@ -1260,6 +1262,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) { if (ipc_nesting_level_ > 1) return; @@ -490,7 +490,7 @@ index bb02f228d604976a668eb8ffa39f49e659975272..7406760e1c0247899232fc96614cfb23 print_preview_context_.OnPrintPreview(); if (print_preview_context_.IsForArc()) { -@@ -1790,7 +1794,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { +@@ -1784,7 +1788,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { auto self = weak_ptr_factory_.GetWeakPtr(); Print(duplicate_node.GetDocument().GetFrame(), duplicate_node, @@ -501,7 +501,7 @@ index bb02f228d604976a668eb8ffa39f49e659975272..7406760e1c0247899232fc96614cfb23 // Check if |this| is still valid. if (!self) return; -@@ -1801,7 +1807,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { +@@ -1795,7 +1801,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, const blink::WebNode& node, @@ -512,7 +512,7 @@ index bb02f228d604976a668eb8ffa39f49e659975272..7406760e1c0247899232fc96614cfb23 // If still not finished with earlier print request simply ignore. if (prep_frame_view_) return; -@@ -1809,7 +1817,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, +@@ -1803,7 +1811,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, FrameReference frame_ref(frame); int expected_page_count = 0; @@ -521,7 +521,7 @@ index bb02f228d604976a668eb8ffa39f49e659975272..7406760e1c0247899232fc96614cfb23 DidFinishPrinting(FAIL_PRINT_INIT); return; // Failed to init print page settings. } -@@ -1829,8 +1837,11 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, +@@ -1823,8 +1831,11 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, PrintMsg_PrintPages_Params print_settings; auto self = weak_ptr_factory_.GetWeakPtr(); @@ -535,7 +535,7 @@ index bb02f228d604976a668eb8ffa39f49e659975272..7406760e1c0247899232fc96614cfb23 // Check if |this| is still valid. if (!self) return; -@@ -2065,10 +2076,23 @@ void PrintRenderFrameHelper::IPCProcessed() { +@@ -2063,10 +2074,23 @@ void PrintRenderFrameHelper::IPCProcessed() { base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this); } @@ -562,7 +562,7 @@ index bb02f228d604976a668eb8ffa39f49e659975272..7406760e1c0247899232fc96614cfb23 // Check if the printer returned any settings, if the settings is empty, we // can safely assume there are no printer drivers configured. So we safely // terminate. -@@ -2088,12 +2112,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) { +@@ -2086,12 +2110,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) { return result; } @@ -582,7 +582,7 @@ index bb02f228d604976a668eb8ffa39f49e659975272..7406760e1c0247899232fc96614cfb23 Send(new PrintHostMsg_ShowInvalidPrinterSettingsError(routing_id())); return false; diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h -index 674e43487837d858c4f90a111ab1e3f17fa71536..3dbe53f290779ed116744853857a3eae59b8751e 100644 +index ed6c6019fa189a0757a37516f82871c637a455a1..d0ad3502bc6d14f231d94b9dd4c9d4f372d17d25 100644 --- a/components/printing/renderer/print_render_frame_helper.h +++ b/components/printing/renderer/print_render_frame_helper.h @@ -225,7 +225,7 @@ class PrintRenderFrameHelper diff --git a/patches/chromium/put_back_deleted_colors_for_autofill.patch b/patches/chromium/put_back_deleted_colors_for_autofill.patch index 9880cb98c634e..7d1dd2d5beb8b 100644 --- a/patches/chromium/put_back_deleted_colors_for_autofill.patch +++ b/patches/chromium/put_back_deleted_colors_for_autofill.patch @@ -42,7 +42,7 @@ index e4b9c5e52d6f8408f8ab5ab7c4f8b28466e04626..9c32aaaa0d88a692632a2e888250c6fd // TODO(thomasanderson): Render GtkSpinner directly. case ui::NativeTheme::kColorId_ThrobberSpinningColor: diff --git a/ui/native_theme/common_theme.cc b/ui/native_theme/common_theme.cc -index e0f4ef443d322439e61018b7993c836f52a5ea00..327ce9b4ca85525fe5f534016011fe278e8ee595 100644 +index 5f04f0e527929ef1d6a169a549ff166bd5a343ae..e0cf95aace856bef5b6c4ff410439bec145fbadf 100644 --- a/ui/native_theme/common_theme.cc +++ b/ui/native_theme/common_theme.cc @@ -63,7 +63,8 @@ base::Optional GetHighContrastColor( @@ -70,7 +70,7 @@ index e0f4ef443d322439e61018b7993c836f52a5ea00..327ce9b4ca85525fe5f534016011fe27 // FocusableBorder case NativeTheme::kColorId_FocusedBorderColor: return SkColorSetA(gfx::kGoogleBlue300, 0x4D); -@@ -553,6 +562,18 @@ SkColor GetDefaultColor(NativeTheme::ColorId color_id, +@@ -556,6 +565,18 @@ SkColor GetDefaultColor(NativeTheme::ColorId color_id, case NativeTheme::kColorId_UnfocusedBorderColor: return gfx::kGoogleGrey300; @@ -89,7 +89,7 @@ index e0f4ef443d322439e61018b7993c836f52a5ea00..327ce9b4ca85525fe5f534016011fe27 // Material spinner/throbber case NativeTheme::kColorId_ThrobberSpinningColor: return gfx::kGoogleBlue600; -@@ -656,7 +677,7 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id, +@@ -659,7 +680,7 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id, } if (color_scheme == NativeTheme::ColorScheme::kDark) { @@ -99,10 +99,10 @@ index e0f4ef443d322439e61018b7993c836f52a5ea00..327ce9b4ca85525fe5f534016011fe27 return color.value(); } diff --git a/ui/native_theme/native_theme_color_id.h b/ui/native_theme/native_theme_color_id.h -index 60fb0ea101024b1fa1c0696688281d2b59083d4d..872b7c56708f98b170633f19489137755be77764 100644 +index ff5ae999d50d4631cef43bdbd3e5d982692f9c65..e3d69f5e3595b2f7b126cfa9e0ee57ff523f9042 100644 --- a/ui/native_theme/native_theme_color_id.h +++ b/ui/native_theme/native_theme_color_id.h -@@ -142,6 +142,11 @@ +@@ -144,6 +144,11 @@ OP(kColorId_TableHeaderText), \ OP(kColorId_TableHeaderBackground), \ OP(kColorId_TableHeaderSeparator), \ diff --git a/patches/chromium/render_widget_host_view_mac.patch b/patches/chromium/render_widget_host_view_mac.patch index 66a50dcb1f23f..6dea6a0c90a95 100644 --- a/patches/chromium/render_widget_host_view_mac.patch +++ b/patches/chromium/render_widget_host_view_mac.patch @@ -10,7 +10,7 @@ kinds of utility windows. Similarly for `disableAutoHideCursor`. Additionally, disables usage of some private APIs in MAS builds. 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 368cc231bf07bba071500373805a481074aac711..e2d433bd4bf58a6d04d2b525ccedf77fcee02b09 100644 +index bd3c6c1724bee8f06544a2aece0ae5e45c145e4d..d84160a3ce7d08e64053b4634f490669507cf7a9 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 @@ -226,6 +226,11 @@ void ExtractUnderlines(NSAttributedString* string, @@ -35,7 +35,7 @@ index 368cc231bf07bba071500373805a481074aac711..e2d433bd4bf58a6d04d2b525ccedf77f return [self acceptsMouseEventsWhenInactive]; } -@@ -1072,6 +1080,10 @@ void ExtractUnderlines(NSAttributedString* string, +@@ -1078,6 +1086,10 @@ void ExtractUnderlines(NSAttributedString* string, eventType == NSKeyDown && !(modifierFlags & NSCommandKeyMask); @@ -46,7 +46,7 @@ index 368cc231bf07bba071500373805a481074aac711..e2d433bd4bf58a6d04d2b525ccedf77f // We only handle key down events and just simply forward other events. if (eventType != NSKeyDown) { _hostHelper->ForwardKeyboardEvent(event, latency_info); -@@ -1848,9 +1860,11 @@ void ExtractUnderlines(NSAttributedString* string, +@@ -1854,9 +1866,11 @@ void ExtractUnderlines(NSAttributedString* string, // Since this implementation doesn't have to wait any IPC calls, this doesn't // make any key-typing jank. --hbono 7/23/09 // @@ -58,7 +58,7 @@ index 368cc231bf07bba071500373805a481074aac711..e2d433bd4bf58a6d04d2b525ccedf77f - (NSArray*)validAttributesForMarkedText { // This code is just copied from WebKit except renaming variables. -@@ -1859,7 +1873,10 @@ extern NSString* NSTextInputReplacementRangeAttributeName; +@@ -1865,7 +1879,10 @@ extern NSString* NSTextInputReplacementRangeAttributeName; initWithObjects:NSUnderlineStyleAttributeName, NSUnderlineColorAttributeName, NSMarkedClauseSegmentAttributeName, diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch index e36f521536d0c..fa4acdf357a7f 100644 --- a/patches/chromium/resource_file_conflict.patch +++ b/patches/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 f06eeeee05c8f645e4a5c640da69c524156e9ff0..7fe32cc32fba2b2760e23b9b83930c2726f44bf6 100644 +index e46e760affe12a9c2d479fcd0c987a74433c23a4..44b1a8b8debc327eae170410daa82a62c83ac078 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -1388,7 +1388,7 @@ if (is_chrome_branded && !is_android) { +@@ -1389,7 +1389,7 @@ if (is_chrome_branded && !is_android) { } } @@ -64,7 +64,7 @@ index f06eeeee05c8f645e4a5c640da69c524156e9ff0..7fe32cc32fba2b2760e23b9b83930c27 chrome_paks("packed_resources") { if (is_mac) { output_dir = "$root_gen_dir/repack" -@@ -1408,6 +1408,12 @@ if (!is_android) { +@@ -1409,6 +1409,12 @@ if (!is_android) { } } diff --git a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch index 2c94933467344..32e73fc737bc9 100644 --- a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch +++ b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch @@ -92,10 +92,10 @@ index d57edc0cea54b9d78700c3b9acdcfcc5f17341dd..e56aae188d7d8f46a4438b8e99f7e9b7 // |url|. If the function returns a valid |new_url|, the request must be // updated to use it. The |force_ignore_site_for_cookies| output parameter diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 55af1205b90a1fce035a6b7abf1797fe20ea1f7b..31c5bf1f0081f61313179a79529497f773b76ff0 100644 +index 37670e0284ae1df27ae665365c0119e279e7133c..4002316737bdce3f143906bd457b5b4fd0e458f6 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -5484,6 +5484,23 @@ void RenderFrameImpl::BeginNavigation( +@@ -5454,6 +5454,23 @@ void RenderFrameImpl::BeginNavigation( // we can do a per-frame check here rather than a process-wide check. bool should_fork = HasWebUIScheme(url) || HasWebUIScheme(old_url) || (enabled_bindings_ & kWebUIBindingsPolicyMask); diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch index 813d25c99b63c..018bf2fa8838a 100644 --- a/patches/chromium/scroll_bounce_flag.patch +++ b/patches/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 baee6cbd6369e60471741770f1ab56e72f6c4c7c..bbbe819d4442e55d5dbdb54f82241ddec0ef5f0b 100644 +index b15d29f05c80a6e6883cf2b5cad75ea8ca1c316a..0e3cfdca756351956b35554b8429dba0ca78516d 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -1360,7 +1360,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() { +@@ -1359,7 +1359,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() { } bool RenderThreadImpl::IsElasticOverscrollEnabled() { diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch index 3f7a822cfa8a3..7bc9f696495f3 100644 --- a/patches/chromium/worker_context_will_destroy.patch +++ b/patches/chromium/worker_context_will_destroy.patch @@ -26,10 +26,10 @@ index f6d2f50e8d6b4a5df796f2d4478ccd3048101532..d57edc0cea54b9d78700c3b9acdcfcc5 // 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 a4382a6afa328308e9d3a39ddbdc6f3248c6f4c0..d5a84147b0479e18e53fc94b28c41393803c8af3 100644 +index 8611e03b633c26f197f71bdfbe0b340bd0f20c16..5216b1692783a7347c93cc9907a6f6bc139ff95e 100644 --- a/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc -@@ -860,6 +860,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { +@@ -866,6 +866,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread(); } @@ -43,10 +43,10 @@ index a4382a6afa328308e9d3a39ddbdc6f3248c6f4c0..d5a84147b0479e18e53fc94b28c41393 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 59d7d92cf5f76f45c41c8d10465bbb57b19e8676..6c8ef4c7c37e6b951f228500b178a53d91ebdfb9 100644 +index d70f60d361b4df9c8aeb417c18f8634bd1f9482b..f719cdc32135e01694a5c430b9bb5609c4d8a89b 100644 --- a/content/renderer/renderer_blink_platform_impl.h +++ b/content/renderer/renderer_blink_platform_impl.h -@@ -181,6 +181,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { +@@ -184,6 +184,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { void DidStartWorkerThread() override; void WillStopWorkerThread() override; void WorkerContextCreated(const v8::Local& worker) override; @@ -55,10 +55,10 @@ index 59d7d92cf5f76f45c41c8d10465bbb57b19e8676..6c8ef4c7c37e6b951f228500b178a53d const blink::WebString& header_name) override; diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h -index 3278250b6d3d161a07f7cda5e18a281457ae519a..01930661416c1987790bb9b3fdd88a04e3662c7a 100644 +index 1e9931b2da6283c4fd93a7abfba33a82d1aeb933..829524c4a22d1454c227bed30632bd819373f8c0 100644 --- a/third_party/blink/public/platform/platform.h +++ b/third_party/blink/public/platform/platform.h -@@ -619,6 +619,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -626,6 +626,7 @@ class BLINK_PLATFORM_EXPORT Platform { virtual void DidStartWorkerThread() {} virtual void WillStopWorkerThread() {} virtual void WorkerContextCreated(const v8::Local& worker) {} From 1407040133c1279c4eb3cf59192070e44b64db4f Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Mon, 29 Jun 2020 12:49:03 -0700 Subject: [PATCH 20/79] Reland "[base] Stop including check.h, notreached.h, etc. in logging.h" https://chromium-review.googlesource.com/c/chromium/src/+/2264297 --- shell/browser/lib/power_observer_linux.cc | 1 + shell/common/node_includes.h | 2 +- shell/common/v8_value_converter.cc | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/shell/browser/lib/power_observer_linux.cc b/shell/browser/lib/power_observer_linux.cc index ac0a05721a496..c3d58fe93949f 100644 --- a/shell/browser/lib/power_observer_linux.cc +++ b/shell/browser/lib/power_observer_linux.cc @@ -11,6 +11,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/logging.h" #include "device/bluetooth/dbus/bluez_dbus_thread_manager.h" namespace { diff --git a/shell/common/node_includes.h b/shell/common/node_includes.h index 4789a4f93d08c..78d8eb14b53a2 100644 --- a/shell/common/node_includes.h +++ b/shell/common/node_includes.h @@ -5,7 +5,7 @@ #ifndef SHELL_COMMON_NODE_INCLUDES_H_ #define SHELL_COMMON_NODE_INCLUDES_H_ -#include "base/logging.h" +#include "base/check.h" // Include common headers for using node APIs. diff --git a/shell/common/v8_value_converter.cc b/shell/common/v8_value_converter.cc index 9f0c559bee005..46674718f7996 100644 --- a/shell/common/v8_value_converter.cc +++ b/shell/common/v8_value_converter.cc @@ -10,6 +10,7 @@ #include #include +#include "base/logging.h" #include "base/values.h" #include "shell/common/gin_helper/dictionary.h" #include "shell/common/node_bindings.h" From ede678742b5ac52ac4db8313b383c51cd1d6dd8a Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Mon, 29 Jun 2020 12:50:38 -0700 Subject: [PATCH 21/79] X11 and Ozone: make sure gfx::AcceleratedWidget to be uint32_t https://chromium-review.googlesource.com/c/chromium/src/+/2260554 --- shell/browser/native_window_views.cc | 26 +++++++++++-------- shell/browser/ui/views/global_menu_bar_x11.cc | 3 ++- shell/browser/ui/views/global_menu_bar_x11.h | 1 + 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc index ff5e045290948..a06d0758b0ba5 100644 --- a/shell/browser/native_window_views.cc +++ b/shell/browser/native_window_views.cc @@ -242,12 +242,13 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options, } if (!state_atom_list.empty()) - ui::SetAtomArrayProperty(GetAcceleratedWidget(), "_NET_WM_STATE", "ATOM", - state_atom_list); + ui::SetAtomArrayProperty(static_cast(GetAcceleratedWidget()), + "_NET_WM_STATE", "ATOM", state_atom_list); // Set the _NET_WM_WINDOW_TYPE. if (!window_type.empty()) - SetWindowType(GetAcceleratedWidget(), window_type); + SetWindowType(static_cast(GetAcceleratedWidget()), + window_type); #endif #if defined(OS_WIN) @@ -662,7 +663,7 @@ bool NativeWindowViews::MoveAbove(const std::string& sourceId) { if (!IsWindowValid(static_cast(id.id))) return false; - electron::MoveWindowAbove(GetAcceleratedWidget(), + electron::MoveWindowAbove(static_cast(GetAcceleratedWidget()), static_cast(id.id)); #endif @@ -679,7 +680,8 @@ void NativeWindowViews::MoveTop() { size.width(), size.height(), SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); #elif defined(USE_X11) - electron::MoveWindowToForeground(GetAcceleratedWidget()); + electron::MoveWindowToForeground( + static_cast(GetAcceleratedWidget())); #endif } @@ -864,7 +866,7 @@ void NativeWindowViews::SetSkipTaskbar(bool skip) { taskbar_host_.RestoreThumbarButtons(GetAcceleratedWidget()); } #elif defined(USE_X11) - SetWMSpecState(GetAcceleratedWidget(), skip, + SetWMSpecState(static_cast(GetAcceleratedWidget()), skip, gfx::GetAtom("_NET_WM_STATE_SKIP_TASKBAR")); #endif } @@ -1074,8 +1076,9 @@ void NativeWindowViews::SetParentWindow(NativeWindow* parent) { XDisplay* xdisplay = gfx::GetXDisplay(); XSetTransientForHint( xdisplay, static_cast(GetAcceleratedWidget()), - static_cast(parent ? parent->GetAcceleratedWidget() - : ui::GetX11RootWindow())); + static_cast( + parent ? static_cast(parent->GetAcceleratedWidget()) + : ui::GetX11RootWindow())); #elif defined(OS_WIN) // To set parentship between windows into Windows is better to play with the // owner instead of the parent, as Windows natively seems to do if a parent @@ -1153,7 +1156,8 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() { // determine whether the current window is visible on all workspaces. x11::Atom sticky_atom = gfx::GetAtom("_NET_WM_STATE_STICKY"); std::vector wm_states; - ui::GetAtomArrayProperty(GetAcceleratedWidget(), "_NET_WM_STATE", &wm_states); + ui::GetAtomArrayProperty(static_cast(GetAcceleratedWidget()), + "_NET_WM_STATE", &wm_states); return std::find(wm_states.begin(), wm_states.end(), sticky_atom) != wm_states.end(); #endif @@ -1281,11 +1285,11 @@ void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) { #if defined(USE_X11) void NativeWindowViews::SetGTKDarkThemeEnabled(bool use_dark_theme) { if (use_dark_theme) { - ui::SetStringProperty(GetAcceleratedWidget(), + ui::SetStringProperty(static_cast(GetAcceleratedWidget()), gfx::GetAtom("_GTK_THEME_VARIANT"), gfx::GetAtom("UTF8_STRING"), "dark"); } else { - ui::SetStringProperty(GetAcceleratedWidget(), + ui::SetStringProperty(static_cast(GetAcceleratedWidget()), gfx::GetAtom("_GTK_THEME_VARIANT"), gfx::GetAtom("UTF8_STRING"), "light"); } diff --git a/shell/browser/ui/views/global_menu_bar_x11.cc b/shell/browser/ui/views/global_menu_bar_x11.cc index 5114fed7ef996..18881212c2ceb 100644 --- a/shell/browser/ui/views/global_menu_bar_x11.cc +++ b/shell/browser/ui/views/global_menu_bar_x11.cc @@ -172,7 +172,8 @@ std::string GetMenuModelStatus(ElectronMenuModel* model) { GlobalMenuBarX11::GlobalMenuBarX11(NativeWindowViews* window) : window_(window), - xwindow_(window_->GetNativeWindow()->GetHost()->GetAcceleratedWidget()) { + xwindow_(static_cast( + window_->GetNativeWindow()->GetHost()->GetAcceleratedWidget())) { EnsureMethodsLoaded(); if (server_new) InitServer(xwindow_); diff --git a/shell/browser/ui/views/global_menu_bar_x11.h b/shell/browser/ui/views/global_menu_bar_x11.h index 6947dddbf0b52..29fa4cb1d05a5 100644 --- a/shell/browser/ui/views/global_menu_bar_x11.h +++ b/shell/browser/ui/views/global_menu_bar_x11.h @@ -12,6 +12,7 @@ #include "shell/browser/ui/electron_menu_model.h" #include "ui/base/glib/glib_signal.h" #include "ui/gfx/native_widget_types.h" +#include "ui/gfx/x/xproto.h" typedef struct _DbusmenuMenuitem DbusmenuMenuitem; typedef struct _DbusmenuServer DbusmenuServer; From e0d6dbcf1e2f87ca5a3a02b89b8fdbf4d64a29e1 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Mon, 29 Jun 2020 12:57:58 -0700 Subject: [PATCH 22/79] Move zygote from //services/service_manager back to //content https://chromium-review.googlesource.com/c/chromium/src/+/2252466 --- .../allow_new_privileges_in_unsandboxed_child_processes.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch b/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch index 8e78e2bcfa9d0..229727547977f 100644 --- a/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch +++ b/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch @@ -6,7 +6,7 @@ Subject: allow new privileges in unsandboxed child processes This allows unsandboxed renderers to launch setuid processes on Linux. diff --git a/content/browser/child_process_launcher_helper_linux.cc b/content/browser/child_process_launcher_helper_linux.cc -index e63dfcf43147c7174942277b2c129675014c9e59..0f1c04b23d40977332182cb54219ba21afd4bc28 100644 +index e63dfcf43147c7174942277b2c129675014c9e59..7121ec638809c5964d22af496559cb7f46c794ef 100644 --- a/content/browser/child_process_launcher_helper_linux.cc +++ b/content/browser/child_process_launcher_helper_linux.cc @@ -53,6 +53,18 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread( @@ -18,7 +18,7 @@ index e63dfcf43147c7174942277b2c129675014c9e59..0f1c04b23d40977332182cb54219ba21 + // launching an unsandboxed process (since all sandboxed processes are + // forked from the zygote). Relax the allow_new_privs option to permit + // launching suid processes from unsandboxed renderers. -+ service_manager::ZygoteHandle zygote_handle = ++ ZygoteHandle zygote_handle = + base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) + ? nullptr + : delegate_->GetZygote(); From e2c6832c5cc9a5f7c85ce4153c4ce9448c46ea69 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Mon, 29 Jun 2020 12:59:03 -0700 Subject: [PATCH 23/79] chore: update v8 patches --- patches/v8/build_gn.patch | 6 +++--- .../v8/do_not_export_private_v8_symbols_on_windows.patch | 2 +- patches/v8/expose_mksnapshot.patch | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch index d7707ba7ee506..5bdc11a41d1f5 100644 --- a/patches/v8/build_gn.patch +++ b/patches/v8/build_gn.patch @@ -9,7 +9,7 @@ necessary for native modules to load. Also, some fixes relating to mksnapshot on ARM. diff --git a/BUILD.gn b/BUILD.gn -index 6ac9e37d0426bc8312c347cbc0ec61c2a636608f..79b78807f0aac98190fb9fe1de58aa8e30dd332f 100644 +index c1d54c11901b2e7a6cd428e627a09d8de02f98f1..ad6ef4b055b120a57384fb04d851d98876319632 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -355,7 +355,7 @@ config("internal_config") { @@ -21,7 +21,7 @@ index 6ac9e37d0426bc8312c347cbc0ec61c2a636608f..79b78807f0aac98190fb9fe1de58aa8e defines += [ "BUILDING_V8_SHARED" ] } } -@@ -4323,7 +4323,7 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -4316,7 +4316,7 @@ if (current_toolchain == v8_generator_toolchain) { "src/interpreter/bytecodes.h", ] @@ -30,7 +30,7 @@ index 6ac9e37d0426bc8312c347cbc0ec61c2a636608f..79b78807f0aac98190fb9fe1de58aa8e deps = [ ":v8_libbase", -@@ -4356,6 +4356,8 @@ if (current_toolchain == v8_snapshot_toolchain) { +@@ -4349,6 +4349,8 @@ if (current_toolchain == v8_snapshot_toolchain) { configs = [ ":internal_config" ] diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch index eb8af747de986..e2a7e4042e899 100644 --- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch +++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch @@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not contain any standard C++ library exports (e.g. `std::ostringstream`). diff --git a/BUILD.gn b/BUILD.gn -index bf06d50979db2e3b989cb996a3b29e42bae05c76..a388baea736340d24c8d6b787e512d7cd85bad12 100644 +index ef5e9e71f23fbbf0ac9bac9a7ae3b8443e2117cc..92ca30d4fb4b6f60cc95788748292fef4ec53b92 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -355,6 +355,10 @@ config("internal_config") { diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch index 97cac321fea09..c4d099805d84e 100644 --- a/patches/v8/expose_mksnapshot.patch +++ b/patches/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 79b78807f0aac98190fb9fe1de58aa8e30dd332f..bf06d50979db2e3b989cb996a3b29e42bae05c76 100644 +index ad6ef4b055b120a57384fb04d851d98876319632..ef5e9e71f23fbbf0ac9bac9a7ae3b8443e2117cc 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -4334,7 +4334,6 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -4327,7 +4327,6 @@ if (current_toolchain == v8_generator_toolchain) { if (current_toolchain == v8_snapshot_toolchain) { v8_executable("mksnapshot") { From 72b6f11958ed931420c28e10640f2bcd87f0cf22 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Mon, 29 Jun 2020 14:10:05 -0700 Subject: [PATCH 24/79] [XProto] Remove usage of Shape extension https://chromium-review.googlesource.com/c/chromium/src/+/2262113 --- shell/browser/native_window_views.cc | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc index a06d0758b0ba5..9c8fbd92c93bf 100644 --- a/shell/browser/native_window_views.cc +++ b/shell/browser/native_window_views.cc @@ -957,16 +957,23 @@ void NativeWindowViews::SetIgnoreMouseEvents(bool ignore, bool forward) { SetForwardMouseMessages(forward); } #elif defined(USE_X11) + auto* connection = x11::Connection::Get(); if (ignore) { - XRectangle r = {0, 0, 1, 1}; - XShapeCombineRectangles(gfx::GetXDisplay(), - static_cast(GetAcceleratedWidget()), - ShapeInput, 0, 0, &r, 1, ShapeSet, - static_cast(x11::ClipOrdering::YXBanded)); + x11::Rectangle r{0, 0, 1, 1}; + connection->shape().Rectangles({ + .operation = x11::Shape::So::Set, + .destination_kind = x11::Shape::Sk::Input, + .ordering = x11::ClipOrdering::YXBanded, + .destination_window = static_cast(GetAcceleratedWidget()), + .rectangles = {r}, + }); } else { - XShapeCombineMask(gfx::GetXDisplay(), - static_cast(GetAcceleratedWidget()), ShapeInput, - 0, 0, x11::None, ShapeSet); + connection->shape().Mask({ + .operation = x11::Shape::So::Set, + .destination_kind = x11::Shape::Sk::Input, + .destination_window = static_cast(GetAcceleratedWidget()), + .source_bitmap = x11::Pixmap::None, + }); } #endif } From 07b0b65c1d2fb3945ffebb934e7ba222cc248c50 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Mon, 29 Jun 2020 14:15:15 -0700 Subject: [PATCH 25/79] fixup! add empty floc blocklist to BrowserProcessImpl --- shell/browser/browser_process_impl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/browser/browser_process_impl.cc b/shell/browser/browser_process_impl.cc index 1bf3ee6496b82..80d42743a197c 100644 --- a/shell/browser/browser_process_impl.cc +++ b/shell/browser/browser_process_impl.cc @@ -9,7 +9,7 @@ #include #include "chrome/common/chrome_switches.h" -#include "components/federated_learning/floc_blocklist_service.h" +#include "components/federated_learning/floc_blocklist_service.h" // nogncheck #include "components/prefs/in_memory_pref_store.h" #include "components/prefs/overlay_user_pref_store.h" #include "components/prefs/pref_registry.h" From 841b71c847fb57f60fc5b4cf848b0f9eab9fa72b Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Mon, 29 Jun 2020 19:23:25 -0700 Subject: [PATCH 26/79] Require macOS 10.15.1 sdk https://chromium-review.googlesource.com/c/chromium/src/+/2238504 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fc3c6c5dd8bc9..a1ddc3df758e2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -77,12 +77,12 @@ machine-linux-2xlarge: &machine-linux-2xlarge machine-mac: &machine-mac macos: - xcode: "11.1.0" + xcode: "11.3.1" machine-mac-large: &machine-mac-large resource_class: large macos: - xcode: "11.1.0" + xcode: "11.3.1" # Build configurations options. env-testing-build: &env-testing-build From 188709a0f196967c779366385405acf209028c81 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Mon, 29 Jun 2020 20:52:41 -0700 Subject: [PATCH 27/79] Use newer Xcode version 11.5.0 --- .circleci/config.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a1ddc3df758e2..222afdf14510d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -77,12 +77,12 @@ machine-linux-2xlarge: &machine-linux-2xlarge machine-mac: &machine-mac macos: - xcode: "11.3.1" + xcode: "11.5.0" machine-mac-large: &machine-mac-large resource_class: large macos: - xcode: "11.3.1" + xcode: "11.5.0" # Build configurations options. env-testing-build: &env-testing-build @@ -889,8 +889,8 @@ step-minimize-workspace-size-from-checkout: &step-minimize-workspace-size-from-c step-save-src-cache: &step-save-src-cache save_cache: paths: - - /portal - key: v7-src-cache-{{ checksum "/portal/src/electron/.depshash" }} + - /var/portal + key: v7-src-cache-{{ checksum "/var/portal/src/electron/.depshash" }} name: Persisting src cache # Check for doc only change @@ -1018,9 +1018,9 @@ steps-checkout-and-save-cache: &steps-checkout-and-save-cache - run: name: Move src folder to the cross-OS portal command: | - sudo mkdir -p /portal - sudo chown -R $(id -u):$(id -g) /portal - mv ./src /portal + sudo mkdir -p /var/portal + sudo chown -R $(id -u):$(id -g) /var/portal + mv ./src /var/portal - *step-save-src-cache steps-electron-gn-check: &steps-electron-gn-check @@ -1229,16 +1229,16 @@ commands: - run: name: Prepare for cross-OS sync restore command: | - sudo mkdir -p /portal - sudo chown -R $(id -u):$(id -g) /portal + sudo mkdir -p /var/portal + sudo chown -R $(id -u):$(id -g) /var/portal - *step-maybe-restore-src-cache - run: name: Fix the src cache restore point on macOS command: | - if [ -d "/portal/src" ]; then + if [ -d "/var/portal/src" ]; then echo Relocating Cache rm -rf src - mv /portal/src ./ + mv /var/portal/src ./ fi checkout-from-cache: steps: From af79be80dc7934dac8e35f336234cd82da43f016 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Mon, 29 Jun 2020 21:03:13 -0700 Subject: [PATCH 28/79] update src cache --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 222afdf14510d..cd93d5703eb3b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -811,7 +811,7 @@ step-touch-sync-done: &step-touch-sync-done step-maybe-restore-src-cache: &step-maybe-restore-src-cache restore_cache: keys: - - v7-src-cache-{{ checksum "src/electron/.depshash" }} + - v8-src-cache-{{ checksum "src/electron/.depshash" }} name: Restoring src cache # Restore exact or closest git cache based on the hash of DEPS and .circle-sync-done @@ -890,7 +890,7 @@ step-save-src-cache: &step-save-src-cache save_cache: paths: - /var/portal - key: v7-src-cache-{{ checksum "/var/portal/src/electron/.depshash" }} + key: v8-src-cache-{{ checksum "/var/portal/src/electron/.depshash" }} name: Persisting src cache # Check for doc only change From 7bce721a437097ab2b2ea7136653fc0510e29d1f Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Tue, 30 Jun 2020 06:00:24 -0700 Subject: [PATCH 29/79] chore: bump chromium in DEPS to 60a9883e35db3f6f91916f0878e88e1849c17b11 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 5133a5b1aa45d..18820e211fc45 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - '31c0105e50fcc4e94de33e5c8602c755ace4a32b', + '60a9883e35db3f6f91916f0878e88e1849c17b11', 'node_version': 'v12.18.1', 'nan_version': From 97b84cc2ca9e29a50446f4cf258ee218dfcd9d88 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Tue, 30 Jun 2020 09:43:28 -0700 Subject: [PATCH 30/79] chore: update patches --- .../add_didinstallconditionalfeatures.patch | 4 +- patches/chromium/add_realloc.patch | 2 +- ...rustedauthclient_to_urlloaderfactory.patch | 12 ++-- patches/chromium/blink_local_frame.patch | 2 +- patches/chromium/can_create_window.patch | 4 +- ...esources_not_chrome_for_spellchecker.patch | 4 +- patches/chromium/command-ismediakey.patch | 2 +- .../crash_allow_setting_more_options.patch | 4 +- .../disable_compositor_recycling.patch | 2 +- ...screen_rendering_with_viz_compositor.patch | 2 +- ...review_disabled_when_printing_to_pdf.patch | 2 +- ...use_key_listener_for_internal_chrome.patch | 2 +- patches/chromium/frame_host_manager.patch | 4 +- patches/chromium/mas-cfisobjc.patch | 6 +- .../chromium/mas_blink_no_private_api.patch | 6 +- .../mas_disable_custom_window_frame.patch | 20 +++--- .../mas_disable_remote_accessibility.patch | 26 ++++---- .../chromium/mas_disable_remote_layer.patch | 10 +-- patches/chromium/mas_no_private_api.patch | 66 +++++++++---------- patches/chromium/picture-in-picture.patch | 2 +- patches/chromium/printing.patch | 20 +++--- .../render_widget_host_view_mac.patch | 8 +-- ...ove_contentrendererclient_shouldfork.patch | 6 +- patches/chromium/webview_cross_drag.patch | 2 +- .../worker_context_will_destroy.patch | 10 +-- patches/v8/add_realloc.patch | 2 +- patches/v8/build_gn.patch | 2 +- patches/v8/dcheck.patch | 2 +- ...export_private_v8_symbols_on_windows.patch | 2 +- patches/v8/expose_mksnapshot.patch | 2 +- 30 files changed, 119 insertions(+), 119 deletions(-) diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index 0213dc4aa1897..7654121d9c84f 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -23,7 +23,7 @@ index 4e195f960d7b9bf50f6784ce380a84a10867914f..dbf85ffe8504bdbab1c4c29f085e5307 int32_t world_id) {} virtual void DidClearWindowObject() {} diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index c2379d87a94113332bf6537340d62fb613d1dba6..37670e0284ae1df27ae665365c0119e279e7133c 100644 +index 867931dc881798fe52d74e1d7a9b78815da78a69..213d1df1c12f7f5109440e9c775476856ce29f5f 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -4711,6 +4711,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, @@ -67,7 +67,7 @@ index fc03157647020be347aad4aa472a053c05b120d9..96684e567c16f12774eae67f08b2f4c3 virtual void WillReleaseScriptContext(v8::Local, int32_t world_id) {} diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc -index 5ac9a7ed3d0f91764452579992471c83104de64f..15ac214bc9177f2fc228cf93c459a7b385bdc582 100644 +index 2c0252c1342e62a142558c4ec48829404b0428b4..c145ed92de9fab565bb10ee0f2d92c8c4560b8fd 100644 --- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc +++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc @@ -201,6 +201,7 @@ void LocalWindowProxy::Initialize() { diff --git a/patches/chromium/add_realloc.patch b/patches/chromium/add_realloc.patch index 0ad4a73cf8894..325ee1005a67d 100644 --- a/patches/chromium/add_realloc.patch +++ b/patches/chromium/add_realloc.patch @@ -39,7 +39,7 @@ index 2aef366ac8194aa261cbca6abc051f7da8a988d3..3c7d66c81032636abcca4f1538ce9b7f GIN_EXPORT static ArrayBufferAllocator* SharedInstance(); diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc -index 04f635ffba0393e80e793a526d9bb221df2ac648..2299a662b20abb4917a7128053bc060210d9d558 100644 +index 77724df403e7ec9f1995e62b8737cb1d46ce20b1..244412c9a52ba701b161d1391e5f3cfb73307afc 100644 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc @@ -672,6 +672,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator { diff --git a/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch b/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch index e4f38e268bfc9..efb023ba8cdfa 100644 --- a/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch +++ b/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch @@ -49,10 +49,10 @@ index 6d15b6b5ff7b36b85f6b8200b76a32b285f0e675..c21234572976a6de7db5b0f2f7f44ec7 // the per-context allow patterns that is managed via NetworkContext // interface. This still respects the per-context block lists. diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc -index 628b38e9db47f9730aebd5dfe9c785ceea28ea0a..6007a8f2d350b8951ba5f2ce910813f044bcf381 100644 +index 1614fd8d734a0adfa33d22d05b4abaf042975d46..e5559d3351a928f89b08f57ed12d26091b31ce6d 100644 --- a/services/network/url_loader.cc +++ b/services/network/url_loader.cc -@@ -470,6 +470,7 @@ URLLoader::URLLoader( +@@ -471,6 +471,7 @@ URLLoader::URLLoader( base::WeakPtr keepalive_statistics_recorder, base::WeakPtr network_usage_accumulator, mojom::TrustedURLLoaderHeaderClient* url_loader_header_client, @@ -60,7 +60,7 @@ index 628b38e9db47f9730aebd5dfe9c785ceea28ea0a..6007a8f2d350b8951ba5f2ce910813f0 mojom::OriginPolicyManager* origin_policy_manager, std::unique_ptr trust_token_helper_factory, mojo::PendingRemote cookie_observer) -@@ -533,6 +534,11 @@ URLLoader::URLLoader( +@@ -534,6 +535,11 @@ URLLoader::URLLoader( header_client_.set_disconnect_handler( base::BindOnce(&URLLoader::OnMojoDisconnect, base::Unretained(this))); } @@ -72,7 +72,7 @@ index 628b38e9db47f9730aebd5dfe9c785ceea28ea0a..6007a8f2d350b8951ba5f2ce910813f0 if (want_raw_headers_) { options_ |= mojom::kURLLoadOptionSendSSLInfoWithResponse | mojom::kURLLoadOptionSendSSLInfoForCertificateError; -@@ -1056,7 +1062,7 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request, +@@ -1057,7 +1063,7 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request, // |this| may have been deleted. return; } @@ -81,7 +81,7 @@ index 628b38e9db47f9730aebd5dfe9c785ceea28ea0a..6007a8f2d350b8951ba5f2ce910813f0 OnAuthCredentials(base::nullopt); return; } -@@ -1072,11 +1078,20 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request, +@@ -1073,11 +1079,20 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request, if (url_request->response_headers()) head->headers = url_request->response_headers(); head->auth_challenge_info = auth_info; @@ -108,7 +108,7 @@ index 628b38e9db47f9730aebd5dfe9c785ceea28ea0a..6007a8f2d350b8951ba5f2ce910813f0 auth_challenge_responder_receiver_.set_disconnect_handler( base::BindOnce(&URLLoader::DeleteSelf, base::Unretained(this))); diff --git a/services/network/url_loader.h b/services/network/url_loader.h -index 33e6b100ef3ebfea62a9445bb8aa4b45034f7f25..b70780428d056e5306e215ba7d86a2e729ffaeda 100644 +index 1c8a9ce4ba5f41cb7a4d415337ff087894fee3df..1ea5d86177ff568a13e3d10767316ae496298d10 100644 --- a/services/network/url_loader.h +++ b/services/network/url_loader.h @@ -115,6 +115,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch index 2e5b1be620060..8f9133fdc637f 100644 --- a/patches/chromium/blink_local_frame.patch +++ b/patches/chromium/blink_local_frame.patch @@ -14,7 +14,7 @@ when there is code doing that. This patch reverts the change to fix the crash in Electron. diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc -index 3e9a5cb8f4a38092e3e25063febc37d9dbb2c5c2..f7c08c0bdecb17aa08b183a5f77592561547da04 100644 +index 6c0f6573dade902086a8a0e5f7fd82e41cf1a692..444e3b26f868f090936dadb3ad6996b3addfdced 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc @@ -539,10 +539,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index 6ca3e66f0be0d..c519cd8b7a90a 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -9,10 +9,10 @@ potentially prevent a window from being created. TODO(loc): this patch is currently broken. diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc -index fc19f12103a2beca5a3cdd26112877cca6ce761c..12945d7f28cb016d73a1b04b4291b461dffbb969 100644 +index 1ff08abe1a0307d777ea9e6e1f5a51ddfe6f35c1..6039b2a52ec406af00264dedbb8a18dc4682d454 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc -@@ -4769,6 +4769,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -4787,6 +4787,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch index 4b1a866648fdf..dc7773602f42c 100644 --- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch +++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch @@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from Electrons grit header instead of Chromes diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 8c11b4a86b1517232d99fdbd7ae2c84d68f12dac..982bd9c0f5970140489c2879e53ab2f017edc8e2 100644 +index 9629e9474064badb4c5ba1241e395f443c2ccabb..5339b5188dff5a2c9937c62f8da97f3b0a024b81 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -5524,6 +5524,7 @@ static_library("browser") { +@@ -5531,6 +5531,7 @@ static_library("browser") { deps += [ "//components/spellcheck/browser", "//components/spellcheck/common", diff --git a/patches/chromium/command-ismediakey.patch b/patches/chromium/command-ismediakey.patch index 5ba1146d4c08b..24b36c0ed6759 100644 --- a/patches/chromium/command-ismediakey.patch +++ b/patches/chromium/command-ismediakey.patch @@ -74,7 +74,7 @@ index 6052fd13ff3d63cf8a4b019b058efb61aad39c3b..42eac7a7b656096c1d2039e340037ac8 } return VKEY_UNKNOWN; } -@@ -193,7 +199,10 @@ CGEventRef MediaKeysListenerImpl::EventTapCallback(CGEventTapProxy proxy, +@@ -193,7 +199,10 @@ static CGEventRef EventTapCallback(CGEventTapProxy proxy, int key_code = (data1 & 0xFFFF0000) >> 16; if (key_code != NX_KEYTYPE_PLAY && key_code != NX_KEYTYPE_NEXT && key_code != NX_KEYTYPE_PREVIOUS && key_code != NX_KEYTYPE_FAST && diff --git a/patches/chromium/crash_allow_setting_more_options.patch b/patches/chromium/crash_allow_setting_more_options.patch index 25cc2a2e89bd3..896afb9ad4692 100644 --- a/patches/chromium/crash_allow_setting_more_options.patch +++ b/patches/chromium/crash_allow_setting_more_options.patch @@ -78,7 +78,7 @@ diff --git a/components/crash/core/app/crashpad_mac.mm b/components/crash/core/a index 0b594d053d7c7f2a8eae9a15e62daacab52ffa64..96210530f699a2331f57415beddc20ed19b9cb4b 100644 --- a/components/crash/core/app/crashpad_mac.mm +++ b/components/crash/core/app/crashpad_mac.mm -@@ -67,6 +67,8 @@ std::map GetProcessSimpleAnnotations() { +@@ -67,6 +67,8 @@ } // @autoreleasepool return process_annotations; }(); @@ -87,7 +87,7 @@ index 0b594d053d7c7f2a8eae9a15e62daacab52ffa64..96210530f699a2331f57415beddc20ed return annotations; } -@@ -137,6 +139,13 @@ base::FilePath PlatformCrashpadInitialization( +@@ -137,6 +139,13 @@ void DumpProcessWithoutCrashing(task_t task_port) { std::vector arguments; diff --git a/patches/chromium/disable_compositor_recycling.patch b/patches/chromium/disable_compositor_recycling.patch index 8da0db349933b..29301f5cbeb68 100644 --- a/patches/chromium/disable_compositor_recycling.patch +++ b/patches/chromium/disable_compositor_recycling.patch @@ -9,7 +9,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/cont index d240fa425224d2917f523b866921d4ae5950a4d3..eb8e76d86cb8293fe2ec75f42f20df41d8795f2c 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm -@@ -478,7 +478,11 @@ void RenderWidgetHostViewMac::WasOccluded() { +@@ -478,7 +478,11 @@ return; host()->WasHidden(); diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch index 486caa1b90255..147b27646aae0 100644 --- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch +++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch @@ -94,7 +94,7 @@ index 1026b739d283f0fc252fa2af83a6d4cf51bc8553..fe562ab60ce98b8bb0c5080a6428deb3 private: const HWND hwnd_; diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn -index 7b6f69e3dcceab02039aa08afd5f4d10b277864e..34ae6a515894c679f13663ce1ef608ec5429c5b6 100644 +index 0979770409131aed4bea76d33b2748c01dde9541..d256ec42bb2154628de7d8d08cc8cf4b6d928911 100644 --- a/components/viz/service/BUILD.gn +++ b/components/viz/service/BUILD.gn @@ -111,6 +111,8 @@ viz_component("service") { diff --git a/patches/chromium/fix_account_for_print_preview_disabled_when_printing_to_pdf.patch b/patches/chromium/fix_account_for_print_preview_disabled_when_printing_to_pdf.patch index afdf81af7fe95..f887c91fef258 100644 --- a/patches/chromium/fix_account_for_print_preview_disabled_when_printing_to_pdf.patch +++ b/patches/chromium/fix_account_for_print_preview_disabled_when_printing_to_pdf.patch @@ -10,7 +10,7 @@ understanding, it seems like we slightly misuse the print preview API and this is fallout from using it in a way the code doesn't expect. diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc -index ad9f504e47f83156fb388de9bee2b8efa8aad12c..663bd7186baf52e79fa549f5d1adde1a24e88d1b 100644 +index fc39f8874402904021e804a5b7fc754709f25353..40c80983f0d2d45058ee49a3542825d3fa822a8b 100644 --- a/components/printing/renderer/print_render_frame_helper.cc +++ b/components/printing/renderer/print_render_frame_helper.cc @@ -1491,6 +1491,7 @@ PrintRenderFrameHelper::CreatePreviewDocument() { diff --git a/patches/chromium/fix_use_the_new_mediaplaypause_key_listener_for_internal_chrome.patch b/patches/chromium/fix_use_the_new_mediaplaypause_key_listener_for_internal_chrome.patch index 891578361cdba..b711b3c08f7b7 100644 --- a/patches/chromium/fix_use_the_new_mediaplaypause_key_listener_for_internal_chrome.patch +++ b/patches/chromium/fix_use_the_new_mediaplaypause_key_listener_for_internal_chrome.patch @@ -12,7 +12,7 @@ diff --git a/chrome/browser/extensions/global_shortcut_listener_mac.mm b/chrome/ index befe726af9c10b1563a7fc0bb77cc55f65943d5c..bac51f33f35f96fe4ecc764cf5ca887176642f74 100644 --- a/chrome/browser/extensions/global_shortcut_listener_mac.mm +++ b/chrome/browser/extensions/global_shortcut_listener_mac.mm -@@ -39,7 +39,7 @@ GlobalShortcutListenerMac::GlobalShortcutListenerMac() +@@ -39,7 +39,7 @@ // global MediaKeysListener to receive media keys. if (!content::MediaKeysListenerManager::IsMediaKeysListenerManagerEnabled()) { media_keys_listener_ = ui::MediaKeysListener::Create( diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index d37a4b0718eeb..335f02b8ebdd2 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -42,7 +42,7 @@ index 6b03c07316eaab83a50afc123fc9f17b1c1dfa3b..e821571731e4e1a93f873477c7410de7 // another SiteInstance for the same site. void RegisterSiteInstance(SiteInstanceImpl* site_instance); diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc -index 6f13dd3aded702faa63bd8c092b3541349c538c0..09defb2502fce17775fe1e767291f3106adedb0a 100644 +index e148adae878dcf8b5f3bed031117d80ad9bc64de..5009db56748489e25c9e687b8e876821b4c85d8f 100644 --- a/content/browser/frame_host/navigation_request.cc +++ b/content/browser/frame_host/navigation_request.cc @@ -1410,6 +1410,21 @@ void NavigationRequest::BeginNavigation() { @@ -106,7 +106,7 @@ index 6941326796bb7e7b056ae0f83345edb2e4cb0479..8e8e1e6d994809159cf0433a4feeec85 READY_TO_COMMIT, diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc -index 4d39ae3c17ee807b744dc4e8406c55fc623a779d..28acc2401ec7fc035c2548e633847fd297fb88a4 100644 +index 0016807829602fc175cffe1c42760f5aa75f0232..7b29974edcb5c05ebb43b782c25f9e8312c47aba 100644 --- a/content/browser/frame_host/render_frame_host_manager.cc +++ b/content/browser/frame_host/render_frame_host_manager.cc @@ -2304,6 +2304,16 @@ bool RenderFrameHostManager::InitRenderView( diff --git a/patches/chromium/mas-cfisobjc.patch b/patches/chromium/mas-cfisobjc.patch index 151a91a41faa6..1879e9e404082 100644 --- a/patches/chromium/mas-cfisobjc.patch +++ b/patches/chromium/mas-cfisobjc.patch @@ -9,7 +9,7 @@ diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm index be12912dcd0ef0cf046ee2d4033a18ecfdf1e992..d2af322a9d5751105e2c8fe023aad9a91027bf05 100644 --- a/base/mac/foundation_util.mm +++ b/base/mac/foundation_util.mm -@@ -28,12 +28,6 @@ CFTypeID SecKeyGetTypeID(); +@@ -28,12 +28,6 @@ #if !defined(OS_IOS) CFTypeID SecACLGetTypeID(); CFTypeID SecTrustedApplicationGetTypeID(); @@ -22,7 +22,7 @@ index be12912dcd0ef0cf046ee2d4033a18ecfdf1e992..d2af322a9d5751105e2c8fe023aad9a9 #endif } // extern "C" -@@ -326,8 +320,7 @@ NSFont* CFToNSCast(CTFontRef cf_val) { +@@ -326,8 +320,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) { const_cast(reinterpret_cast(cf_val)); DCHECK(!cf_val || CTFontGetTypeID() == CFGetTypeID(cf_val) || @@ -32,7 +32,7 @@ index be12912dcd0ef0cf046ee2d4033a18ecfdf1e992..d2af322a9d5751105e2c8fe023aad9a9 return ns_val; } -@@ -398,9 +391,6 @@ CFCast(const CFTypeRef& cf_val) { +@@ -398,9 +391,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) { return (CTFontRef)(cf_val); } diff --git a/patches/chromium/mas_blink_no_private_api.patch b/patches/chromium/mas_blink_no_private_api.patch index bbbc8584b58b8..38b83d60c1f5c 100644 --- a/patches/chromium/mas_blink_no_private_api.patch +++ b/patches/chromium/mas_blink_no_private_api.patch @@ -18,7 +18,7 @@ index 94afefcee81b87c05bf9b1199d90d3d4b5ea84a6..2ec7f04c71824b47de1ddbf1f0e8625d extern "C" { // Kill ring calls. Would be better to use NSKillRing.h, but that's not -@@ -39,38 +40,53 @@ NSString* _NSYankFromKillRing(); +@@ -39,38 +40,53 @@ void _NSNewKillRingSequence(); void _NSSetKillRingToYankedState(); } @@ -92,7 +92,7 @@ index 8f4ae94bc1d8188d041654c50511f3346eee79de..fa06f47abbff3dcda937bf0b794f616e namespace blink { -@@ -95,10 +97,12 @@ bool ThemePainterMac::PaintTextField(const Node* node, +@@ -95,10 +97,12 @@ void _NSDrawCarbonThemeListBox(NSRect frame, // behavior change while remaining a fragile solution. // https://bugs.chromium.org/p/chromium/issues/detail?id=658085#c3 if (!use_ns_text_field_cell) { @@ -105,7 +105,7 @@ index 8f4ae94bc1d8188d041654c50511f3346eee79de..fa06f47abbff3dcda937bf0b794f616e return false; } -@@ -186,10 +190,12 @@ bool ThemePainterMac::PaintTextArea(const Node* node, +@@ -186,10 +190,12 @@ void _NSDrawCarbonThemeListBox(NSRect frame, const IntRect& r) { ScopedColorSchemeAppearance appearance(style.UsedColorScheme()); LocalCurrentGraphicsContext local_context(paint_info.context, r); diff --git a/patches/chromium/mas_disable_custom_window_frame.patch b/patches/chromium/mas_disable_custom_window_frame.patch index 036715ab57616..a65f0da5a1764 100644 --- a/patches/chromium/mas_disable_custom_window_frame.patch +++ b/patches/chromium/mas_disable_custom_window_frame.patch @@ -7,7 +7,7 @@ Disable private window frame APIs (NSNextStepFrame and NSThemeFrame) for MAS build. diff --git a/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm b/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm -index b02eda676ce4fbab772206df46689803556edceb..4d87ca8f05fed639faeb0c72f666fb26074a3bbb 100644 +index 2cd283de6677f0c256940ab475eb6c58d8040f54..ad7f1f0c05b491977ccd5650c94248e876ad2b0e 100644 --- a/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm +++ b/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm @@ -9,6 +9,7 @@ @@ -18,7 +18,7 @@ index b02eda676ce4fbab772206df46689803556edceb..4d87ca8f05fed639faeb0c72f666fb26 @interface NSWindow (PrivateBrowserNativeWidgetAPI) + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle; @end -@@ -63,6 +64,8 @@ +@@ -63,6 +64,8 @@ - (NSRect)_draggableFrame NS_DEPRECATED_MAC(10_10, 10_11) { @end @@ -27,7 +27,7 @@ index b02eda676ce4fbab772206df46689803556edceb..4d87ca8f05fed639faeb0c72f666fb26 @implementation BrowserNativeWidgetWindow // Prevent detached tabs from glitching when the window is partially offscreen. -@@ -84,6 +87,7 @@ +@@ -88,6 +91,7 @@ - (NSRect)constrainFrameRect:(NSRect)rect toScreen:(NSScreen*)screen { // NSWindow (PrivateAPI) overrides. @@ -35,7 +35,7 @@ index b02eda676ce4fbab772206df46689803556edceb..4d87ca8f05fed639faeb0c72f666fb26 + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle { // - NSThemeFrame and its subclasses will be nil if it's missing at runtime. if ([BrowserWindowFrame class]) -@@ -98,6 +102,8 @@ +@@ -102,6 +106,8 @@ - (BOOL)_usesCustomDrawing { return NO; } @@ -57,7 +57,7 @@ index 8416c7c6e052dafb2aad61c0bd3224c36e945d23..cd356beda023ab2409b16d58ca38c70b @interface NSWindow (PrivateAPI) + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle; @end -@@ -18,8 +20,12 @@ +@@ -18,8 +20,12 @@ - (CGFloat)_titlebarHeight { } @end @@ -70,7 +70,7 @@ index 8416c7c6e052dafb2aad61c0bd3224c36e945d23..cd356beda023ab2409b16d58ca38c70b + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle { if ([NativeWidgetMacFramelessNSWindowFrame class]) { return [NativeWidgetMacFramelessNSWindowFrame class]; -@@ -27,4 +33,6 @@ +@@ -27,4 +33,6 @@ + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle { return [super frameViewClassForStyleMask:windowStyle]; } @@ -111,7 +111,7 @@ index 757c72d98de11f611309f4f5af8d0d9aab639181..a6319a0760308df6bac6b39ad3500ad7 - (BOOL)hasKeyAppearance; - (long long)_resizeDirectionForMouseLocation:(CGPoint)location; - (BOOL)_isConsideredOpenForPersistentState; -@@ -58,6 +60,8 @@ +@@ -58,6 +60,8 @@ - (void)cr_mouseDownOnFrameView:(NSEvent*)event { } @end @@ -120,7 +120,7 @@ index 757c72d98de11f611309f4f5af8d0d9aab639181..a6319a0760308df6bac6b39ad3500ad7 @implementation NativeWidgetMacNSWindowTitledFrame - (void)mouseDown:(NSEvent*)event { if (base::mac::IsAtMostOS10_11() && self.window.isMovable) -@@ -84,6 +88,8 @@ +@@ -84,6 +88,8 @@ - (BOOL)usesCustomDrawing { } @end @@ -129,7 +129,7 @@ index 757c72d98de11f611309f4f5af8d0d9aab639181..a6319a0760308df6bac6b39ad3500ad7 @implementation NativeWidgetMacNSWindow { @private base::scoped_nsobject _commandDispatcher; -@@ -165,6 +171,8 @@ +@@ -165,6 +171,8 @@ - (BOOL)hasViewsMenuActive { // NSWindow overrides. @@ -138,7 +138,7 @@ index 757c72d98de11f611309f4f5af8d0d9aab639181..a6319a0760308df6bac6b39ad3500ad7 + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle { if (windowStyle & NSWindowStyleMaskTitled) { if (Class customFrame = [NativeWidgetMacNSWindowTitledFrame class]) -@@ -176,6 +184,8 @@ +@@ -176,6 +184,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle { return [super frameViewClassForStyleMask:windowStyle]; } diff --git a/patches/chromium/mas_disable_remote_accessibility.patch b/patches/chromium/mas_disable_remote_accessibility.patch index b1c4fd7403d48..8b1a1ee3b4580 100644 --- a/patches/chromium/mas_disable_remote_accessibility.patch +++ b/patches/chromium/mas_disable_remote_accessibility.patch @@ -17,7 +17,7 @@ diff --git a/components/remote_cocoa/app_shim/application_bridge.mm b/components index 9ddda9116e7284cbccde8a51e23ad7560dd06367..e846091ad99b0154636489e53491209ff3cbfaaa 100644 --- a/components/remote_cocoa/app_shim/application_bridge.mm +++ b/components/remote_cocoa/app_shim/application_bridge.mm -@@ -49,6 +49,7 @@ class NativeWidgetBridgeOwner : public NativeWidgetNSWindowHostHelper { +@@ -49,6 +49,7 @@ // NativeWidgetNSWindowHostHelper: id GetNativeViewAccessible() override { @@ -25,7 +25,7 @@ index 9ddda9116e7284cbccde8a51e23ad7560dd06367..e846091ad99b0154636489e53491209f if (!remote_accessibility_element_) { int64_t browser_pid = 0; std::vector element_token; -@@ -59,6 +60,9 @@ class NativeWidgetBridgeOwner : public NativeWidgetNSWindowHostHelper { +@@ -59,6 +60,9 @@ id GetNativeViewAccessible() override { ui::RemoteAccessibility::GetRemoteElementFromToken(element_token); } return remote_accessibility_element_.get(); @@ -35,7 +35,7 @@ index 9ddda9116e7284cbccde8a51e23ad7560dd06367..e846091ad99b0154636489e53491209f } void DispatchKeyEvent(ui::KeyEvent* event) override { bool event_handled = false; -@@ -96,8 +100,10 @@ class NativeWidgetBridgeOwner : public NativeWidgetNSWindowHostHelper { +@@ -96,8 +100,10 @@ void GetWordAt(const gfx::Point& location_in_content, mojo::AssociatedRemote text_input_host_remote_; std::unique_ptr bridge_; @@ -50,7 +50,7 @@ diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm index 2ee45cb069ec5d78d9c7a3f61fdd1d444a590f41..badc4323b910f8e3957583e05af303472cb204f6 100644 --- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm +++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm -@@ -543,10 +543,12 @@ void NativeWidgetNSWindowBridge::CreateContentView(uint64_t ns_view_id, +@@ -543,10 +543,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) { // this should be treated as an error and caught early. CHECK(bridged_view_); @@ -67,7 +67,7 @@ diff --git a/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm b/cont index c3a9fbf0f9d2b80c1de42a22ad094a286f0b559b..02493d4b62c98a3aebd3e460c459218a4dc4ea8e 100644 --- a/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm +++ b/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm -@@ -70,8 +70,10 @@ class RenderWidgetHostNSViewBridgeOwner +@@ -70,8 +70,10 @@ id GetFocusedBrowserAccessibilityElement() override { return nil; } void SetAccessibilityWindow(NSWindow* window) override { @@ -78,7 +78,7 @@ index c3a9fbf0f9d2b80c1de42a22ad094a286f0b559b..02493d4b62c98a3aebd3e460c459218a } void ForwardKeyboardEvent(const content::NativeWebKeyboardEvent& key_event, -@@ -133,8 +135,10 @@ class RenderWidgetHostNSViewBridgeOwner +@@ -133,8 +135,10 @@ void SmartMagnify(const blink::WebGestureEvent& web_event) override { mojo::AssociatedRemote host_; std::unique_ptr bridge_; @@ -120,7 +120,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/cont index eb75e4d47204118c963110c549835941776f5110..d240fa425224d2917f523b866921d4ae5950a4d3 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm -@@ -233,8 +233,10 @@ RenderWidgetHostViewMac::~RenderWidgetHostViewMac() { +@@ -233,8 +233,10 @@ void RenderWidgetHostViewMac::MigrateNSViewBridge( remote_cocoa::mojom::Application* remote_cocoa_application, uint64_t parent_ns_view_id) { @@ -131,7 +131,7 @@ index eb75e4d47204118c963110c549835941776f5110..d240fa425224d2917f523b866921d4ae // Disconnect from the previous bridge (this will have the effect of // destroying the associated bridge), and close the receiver (to allow it -@@ -1377,8 +1379,10 @@ RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessible() { +@@ -1377,8 +1379,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback, gfx::NativeViewAccessible RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessibleForWindow() { @@ -142,7 +142,7 @@ index eb75e4d47204118c963110c549835941776f5110..d240fa425224d2917f523b866921d4ae return [GetInProcessNSView() window]; } -@@ -1410,9 +1414,11 @@ id RenderWidgetHostViewMac::GetFocusedBrowserAccessibilityElement() { +@@ -1410,9 +1414,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback, } void RenderWidgetHostViewMac::SetAccessibilityWindow(NSWindow* window) { @@ -154,7 +154,7 @@ index eb75e4d47204118c963110c549835941776f5110..d240fa425224d2917f523b866921d4ae } bool RenderWidgetHostViewMac::SyncIsWidgetForMainFrame( -@@ -1899,12 +1905,14 @@ void RenderWidgetHostViewMac::StopSpeaking() { +@@ -1899,12 +1905,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback, void RenderWidgetHostViewMac::SetRemoteAccessibilityWindowToken( const std::vector& window_token) { @@ -239,7 +239,7 @@ diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa index 2256c365af5b1af79458fdcb0cb9d44c9ff641fd..f4949b071a177452b0074a2436669e9846558d1a 100644 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm -@@ -282,14 +282,22 @@ gfx::NativeViewAccessible +@@ -282,14 +282,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator, NativeWidgetMacNSWindowHost::GetNativeViewAccessibleForNSView() const { if (in_process_ns_window_bridge_) return in_process_ns_window_bridge_->ns_view(); @@ -262,7 +262,7 @@ index 2256c365af5b1af79458fdcb0cb9d44c9ff641fd..f4949b071a177452b0074a2436669e98 } remote_cocoa::mojom::NativeWidgetNSWindow* -@@ -1118,6 +1126,7 @@ void NativeWidgetMacNSWindowHost::OnFocusWindowToolbar() { +@@ -1118,6 +1126,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator, void NativeWidgetMacNSWindowHost::SetRemoteAccessibilityTokens( const std::vector& window_token, const std::vector& view_token) { @@ -270,7 +270,7 @@ index 2256c365af5b1af79458fdcb0cb9d44c9ff641fd..f4949b071a177452b0074a2436669e98 remote_window_accessible_ = ui::RemoteAccessibility::GetRemoteElementFromToken(window_token); remote_view_accessible_ = -@@ -1125,14 +1134,17 @@ void NativeWidgetMacNSWindowHost::SetRemoteAccessibilityTokens( +@@ -1125,14 +1134,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator, [remote_view_accessible_ setWindowUIElement:remote_window_accessible_.get()]; [remote_view_accessible_ setTopLevelUIElement:remote_window_accessible_.get()]; diff --git a/patches/chromium/mas_disable_remote_layer.patch b/patches/chromium/mas_disable_remote_layer.patch index 35f24f47c2e66..68d19bc90a580 100644 --- a/patches/chromium/mas_disable_remote_layer.patch +++ b/patches/chromium/mas_disable_remote_layer.patch @@ -44,7 +44,7 @@ diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.mm b/gpu/ipc/se index f0dd2928aefcfef71e148e4e5c1e88dd7f9b0724..3461a7839a13f5c34c78b9b13997d5d3e42977a4 100644 --- a/gpu/ipc/service/image_transport_surface_overlay_mac.mm +++ b/gpu/ipc/service/image_transport_surface_overlay_mac.mm -@@ -51,7 +51,7 @@ ImageTransportSurfaceOverlayMacBase:: +@@ -51,7 +51,7 @@ ca_layer_tree_coordinator_.reset(new ui::CALayerTreeCoordinator( use_remote_layer_api_, allow_av_sample_buffer_display_layer)); @@ -53,7 +53,7 @@ index f0dd2928aefcfef71e148e4e5c1e88dd7f9b0724..3461a7839a13f5c34c78b9b13997d5d3 // Create the CAContext to send this to the GPU process, and the layer for // the context. if (use_remote_layer_api_) { -@@ -60,6 +60,7 @@ ImageTransportSurfaceOverlayMacBase:: +@@ -60,6 +60,7 @@ options:@{}] retain]); [ca_context_ setLayer:ca_layer_tree_coordinator_->GetCALayerForDisplay()]; } @@ -61,7 +61,7 @@ index f0dd2928aefcfef71e148e4e5c1e88dd7f9b0724..3461a7839a13f5c34c78b9b13997d5d3 } template -@@ -140,7 +141,9 @@ ImageTransportSurfaceOverlayMacBase::SwapBuffersInternal( +@@ -140,7 +141,9 @@ "GLImpl", static_cast(gl::GetGLImplementation()), "width", pixel_size_.width()); if (use_remote_layer_api_) { @@ -75,7 +75,7 @@ diff --git a/ui/accelerated_widget_mac/display_ca_layer_tree.mm b/ui/accelerated index 0db8f3e223e3cb8e289af63a50104fb6823ed46a..d7969cf08317731bf8e1c8545a07734412593e37 100644 --- a/ui/accelerated_widget_mac/display_ca_layer_tree.mm +++ b/ui/accelerated_widget_mac/display_ca_layer_tree.mm -@@ -98,6 +98,7 @@ void DisplayCALayerTree::UpdateCALayerTree( +@@ -98,6 +98,7 @@ - (void)setContentsChanged; } void DisplayCALayerTree::GotCALayerFrame(uint32_t ca_context_id) { @@ -83,7 +83,7 @@ index 0db8f3e223e3cb8e289af63a50104fb6823ed46a..d7969cf08317731bf8e1c8545a077344 // Early-out if the remote layer has not changed. if ([remote_layer_ contextId] == ca_context_id) return; -@@ -122,6 +123,9 @@ void DisplayCALayerTree::GotCALayerFrame(uint32_t ca_context_id) { +@@ -122,6 +123,9 @@ - (void)setContentsChanged; [io_surface_layer_ removeFromSuperlayer]; io_surface_layer_.reset(); } diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch index 8b11bf4c89e0e..d7f441ecb0aa7 100644 --- a/patches/chromium/mas_no_private_api.patch +++ b/patches/chromium/mas_no_private_api.patch @@ -10,7 +10,7 @@ diff --git a/content/browser/accessibility/accessibility_tree_formatter_mac.mm b index 6074fd6fb7da7c0e927fa81e8095729349520417..df7e644d20b75c0ace31d34d7a605efff805fa21 100644 --- a/content/browser/accessibility/accessibility_tree_formatter_mac.mm +++ b/content/browser/accessibility/accessibility_tree_formatter_mac.mm -@@ -573,7 +573,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( +@@ -573,7 +573,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, 0 == strcmp([value objCType], @encode(NSRange))) { return PopulateRange([value rangeValue]); } @@ -19,7 +19,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..df7e644d20b75c0ace31d34d7a605eff // AXTextMarker if (content::IsAXTextMarker(value)) { return PopulateTextPosition(content::AXTextMarkerToPosition(value).get(), -@@ -584,7 +584,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( +@@ -584,7 +584,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, if (content::IsAXTextMarkerRange(value)) { return PopulateTextMarkerRange(value, line_indexes_map); } @@ -28,7 +28,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..df7e644d20b75c0ace31d34d7a605eff // Accessible object if ([value isKindOfClass:[BrowserAccessibilityCocoa class]]) { return base::Value(NodeToLineIndex(value, line_indexes_map)); -@@ -635,7 +635,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextPosition( +@@ -635,7 +635,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, kConstValuePrefix + affinity); return set; } @@ -37,7 +37,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..df7e644d20b75c0ace31d34d7a605eff base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( id object, const LineIndexesMap& line_indexes_map) const { -@@ -650,7 +650,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( +@@ -650,7 +650,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, dict.SetPath("focus", PopulateTextPosition(range.focus(), line_indexes_map)); return dict; } @@ -93,7 +93,7 @@ diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/cont index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe91289c3e 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm -@@ -208,6 +208,7 @@ NSString* const +@@ -208,6 +208,7 @@ NSString* const NSAccessibilityLengthForTextMarkerRangeParameterizedAttribute = @"AXLengthForTextMarkerRange"; @@ -101,7 +101,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Private attributes that can be used for testing text markers, e.g. in dump // tree tests. NSString* const -@@ -219,6 +220,7 @@ NSString* const +@@ -219,6 +220,7 @@ NSString* const NSAccessibilityTextMarkerNodeDebugDescriptionParameterizedAttribute = @"AXTextMarkerNodeDebugDescription"; @@ -109,7 +109,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Other private attributes. NSString* const NSAccessibilitySelectTextWithCriteriaParameterizedAttribute = -@@ -242,6 +244,7 @@ NSDictionary* attributeToMethodNameMap = nil; +@@ -242,6 +244,7 @@ // VoiceOver uses -1 to mean "no limit" for AXResultsLimit. const int kAXResultsLimitNoLimit = -1; @@ -117,7 +117,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe extern "C" { // The following are private accessibility APIs required for cursor navigation -@@ -470,6 +473,7 @@ NSAttributedString* GetAttributedTextForTextMarkerRange(id marker_range) { +@@ -470,6 +473,7 @@ void AddMisspelledTextAttributes(const AXPlatformRange& ax_range, AddMisspelledTextAttributes(ax_range, attributed_text); return attributed_text; } @@ -125,7 +125,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Returns an autoreleased copy of the AXNodeData's attribute. NSString* NSStringForStringAttribute(BrowserAccessibility* browserAccessibility, -@@ -727,6 +731,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired"; +@@ -727,6 +731,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) { #define NSAccessibilityLanguageAttribute @"AXLanguage" #endif @@ -133,7 +133,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe bool content::IsAXTextMarker(id object) { if (object == nil) return false; -@@ -770,6 +775,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -770,6 +775,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) { kCFAllocatorDefault, anchor_textmarker, focus_textmarker); return [static_cast(cf_marker_range) autorelease]; } @@ -141,7 +141,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe @implementation BrowserAccessibilityCocoa -@@ -807,7 +813,9 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -807,7 +813,9 @@ + (void)initialize { {NSAccessibilityEditableAncestorAttribute, @"editableAncestor"}, {NSAccessibilityElementBusyAttribute, @"elementBusy"}, {NSAccessibilityEnabledAttribute, @"enabled"}, @@ -151,7 +151,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe {NSAccessibilityExpandedAttribute, @"expanded"}, {NSAccessibilityFocusableAncestorAttribute, @"focusableAncestor"}, {NSAccessibilityFocusedAttribute, @"focused"}, -@@ -819,8 +827,10 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -819,8 +827,10 @@ + (void)initialize { {NSAccessibilityHighestEditableAncestorAttribute, @"highestEditableAncestor"}, {NSAccessibilityIndexAttribute, @"index"}, @@ -162,7 +162,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe {NSAccessibilityInvalidAttribute, @"invalid"}, {NSAccessibilityIsMultiSelectableAttribute, @"isMultiSelectable"}, {NSAccessibilityLanguageAttribute, @"language"}, -@@ -842,13 +852,17 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -842,13 +852,17 @@ + (void)initialize { {NSAccessibilityRowsAttribute, @"rows"}, // TODO(aboxhall): expose // NSAccessibilityServesAsTitleForUIElementsAttribute @@ -180,7 +180,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe {NSAccessibilitySizeAttribute, @"size"}, {NSAccessibilitySortDirectionAttribute, @"sortDirection"}, {NSAccessibilitySubroleAttribute, @"subrole"}, -@@ -1336,6 +1350,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -1336,6 +1350,7 @@ - (NSNumber*)enabled { ax::mojom::Restriction::kDisabled]; } @@ -188,7 +188,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Returns a text marker that points to the last character in the document that // can be selected with VoiceOver. - (id)endTextMarker { -@@ -1346,6 +1361,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -1346,6 +1361,7 @@ - (id)endTextMarker { BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); return CreateTextMarker(position->CreatePositionAtEndOfAnchor()); } @@ -196,7 +196,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe - (NSNumber*)expanded { if (![self instanceActive]) -@@ -1495,6 +1511,8 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -1495,6 +1511,8 @@ - (NSNumber*)index { return nil; } @@ -205,7 +205,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe - (NSNumber*)insertionPointLineNumber { if (![self instanceActive]) return nil; -@@ -1517,6 +1535,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -1517,6 +1535,7 @@ - (NSNumber*)insertionPointLineNumber { caretPosition->AsTextPosition()->text_offset()); return @(std::distance(lineBreaks.begin(), iterator)); } @@ -213,7 +213,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Returns whether or not this node should be ignored in the // accessibility tree. -@@ -2193,6 +2212,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -2193,6 +2212,7 @@ - (NSArray*)selectedChildren { return ret; } @@ -221,7 +221,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe - (NSString*)selectedText { if (![self instanceActive]) return nil; -@@ -2204,11 +2224,13 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -2204,11 +2224,13 @@ - (NSString*)selectedText { return nil; return base::SysUTF16ToNSString(range.GetText()); } @@ -235,7 +235,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe - (NSValue*)selectedTextRange { if (![self instanceActive]) return nil; -@@ -2229,12 +2251,15 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -2229,12 +2251,15 @@ - (NSValue*)selectedTextRange { int selLength = range.GetText().length(); return [NSValue valueWithRange:NSMakeRange(selStart, selLength)]; } @@ -251,7 +251,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe - (NSValue*)size { if (![self instanceActive]) -@@ -2267,6 +2292,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -2267,6 +2292,7 @@ - (NSString*)sortDirection { return nil; } @@ -259,7 +259,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Returns a text marker that points to the first character in the document that // can be selected with VoiceOver. - (id)startTextMarker { -@@ -2277,6 +2303,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -2277,6 +2303,7 @@ - (id)startTextMarker { BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); return CreateTextMarker(position->CreatePositionAtStartOfAnchor()); } @@ -267,7 +267,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Returns a subrole based upon the role. - (NSString*)subrole { -@@ -2599,11 +2626,13 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -2599,11 +2626,13 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range { NSMutableAttributedString* attributedInnerText = [[[NSMutableAttributedString alloc] initWithString:base::SysUTF16ToNSString(innerText)] autorelease]; @@ -281,7 +281,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe return [attributedInnerText attributedSubstringFromRange:range]; } -@@ -2707,9 +2736,8 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -2707,9 +2736,8 @@ - (id)accessibilityAttributeValue:(NSString*)attribute return ToBrowserAccessibilityCocoa(cell); } @@ -293,7 +293,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe BrowserAccessibilityPositionInstance position = CreatePositionFromTextMarker(parameter); if (!position->IsNullPosition()) -@@ -3022,6 +3050,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -3022,6 +3050,7 @@ AXPlatformRange range(std::move(lineStartPosition), return CreateTextMarker(root->CreatePositionAt(index)); } @@ -301,7 +301,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe if ([attribute isEqualToString: NSAccessibilityBoundsForRangeParameterizedAttribute]) { -@@ -3057,6 +3086,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -3057,6 +3086,7 @@ AXPlatformRange range(std::move(lineStartPosition), return nil; } @@ -309,7 +309,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe if ([attribute isEqualToString: NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) { -@@ -3171,6 +3201,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -3171,6 +3201,7 @@ AXPlatformRange range(std::move(lineStartPosition), return @(child->GetIndexInParent()); } @@ -321,7 +321,7 @@ diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm index 83d0106f0f237dea75dfafe011bf527d97240d0d..462577a0dbd0fcc1baf17acd9678317cb27503fa 100644 --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm -@@ -525,6 +525,7 @@ NSDictionary* BrowserAccessibilityManagerMac:: +@@ -525,6 +525,7 @@ void PostAnnouncementNotification(NSString* announcement) { [user_info setObject:native_focus_object forKey:NSAccessibilityTextChangeElement]; @@ -329,7 +329,7 @@ index 83d0106f0f237dea75dfafe011bf527d97240d0d..462577a0dbd0fcc1baf17acd9678317c id selected_text = [native_focus_object selectedTextMarkerRange]; if (selected_text) { NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute = -@@ -532,6 +533,7 @@ NSDictionary* BrowserAccessibilityManagerMac:: +@@ -532,6 +533,7 @@ void PostAnnouncementNotification(NSString* announcement) { [user_info setObject:selected_text forKey:NSAccessibilitySelectedTextMarkerRangeAttribute]; } @@ -353,7 +353,7 @@ index 28ca1646af0b0cce40d27baec71cbe65adc334fa..bae65c1f485bc02eb9ef2ebf7018af4a namespace content { -@@ -22,6 +24,7 @@ namespace { +@@ -22,6 +24,7 @@ // verifies there are no existing open connections), and then indicates that // Chrome should continue execution without access to launchservicesd. void DisableSystemServices() { @@ -381,7 +381,7 @@ index b29b68be6fa6b0329ed03c2d9011690c5e6f83c5..3a8aca70701534d19cdf1655da188114 extern "C" { // Undocumented IOBluetooth Preference API [1]. Used by `blueutil` [2] and // `Karabiner` [3] to programmatically control the Bluetooth state. Calling the -@@ -49,6 +50,7 @@ extern "C" { +@@ -49,6 +50,7 @@ // [4] https://support.apple.com/kb/PH25091 void IOBluetoothPreferenceSetControllerPowerState(int state); } @@ -389,7 +389,7 @@ index b29b68be6fa6b0329ed03c2d9011690c5e6f83c5..3a8aca70701534d19cdf1655da188114 namespace { -@@ -118,8 +120,10 @@ BluetoothAdapterMac::BluetoothAdapterMac() +@@ -118,8 +120,10 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) { controller_state_function_( base::BindRepeating(&BluetoothAdapterMac::GetHostControllerState, base::Unretained(this))), @@ -400,7 +400,7 @@ index b29b68be6fa6b0329ed03c2d9011690c5e6f83c5..3a8aca70701534d19cdf1655da188114 should_update_name_(true), classic_discovery_manager_( BluetoothDiscoveryManagerMac::CreateClassic(this)), -@@ -304,8 +308,12 @@ base::WeakPtr BluetoothAdapterMac::GetWeakPtr() { +@@ -304,8 +308,12 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) { } bool BluetoothAdapterMac::SetPoweredImpl(bool powered) { diff --git a/patches/chromium/picture-in-picture.patch b/patches/chromium/picture-in-picture.patch index 69820b15a6f5f..2ce546f0f3cb9 100644 --- a/patches/chromium/picture-in-picture.patch +++ b/patches/chromium/picture-in-picture.patch @@ -35,7 +35,7 @@ index e9b64a823ae7e25361f37190d247af0fa6a6f68a..43fdb0ad50d2b11a1bc28aa0f358c6dd #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/color_palette.h" diff --git a/chrome/browser/ui/views/overlay/overlay_window_views.cc b/chrome/browser/ui/views/overlay/overlay_window_views.cc -index 46cb8b1319cdd4baf729c86ecaafe418bb687921..fcb46c349abdb41e74c56b614d490b032949f332 100644 +index 31ea06a7cee464ee4074c80279f5bb2a02aef21c..4ee4be3ba12f7cd18b62fe72c00be10d382a4caa 100644 --- a/chrome/browser/ui/views/overlay/overlay_window_views.cc +++ b/chrome/browser/ui/views/overlay/overlay_window_views.cc @@ -19,7 +19,7 @@ diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch index 02cecbff7d2d9..0c85a369b1c53 100644 --- a/patches/chromium/printing.patch +++ b/patches/chromium/printing.patch @@ -420,10 +420,10 @@ index 9fbea6d0a2dbe55b1d600fbc217dee5aa8ae8cd5..de9bd267e408c02fd4da7d903523c0e6 // content::BrowserMessageFilter: bool OnMessageReceived(const IPC::Message& message) override; diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom -index faccd2a6881b74f1fa6538fc1011071ac54b03e0..342fba6eb86ee803aae6f11826ee5ccc1a6eeed0 100644 +index 033bd41f2ae9c4d072f951ba0d930adf69114176..21ad6a9c39e89f5cae83357c48a358e266e48306 100644 --- a/components/printing/common/print.mojom +++ b/components/printing/common/print.mojom -@@ -99,7 +99,7 @@ interface PrintPreviewUI { +@@ -119,7 +119,7 @@ interface PrintPreviewUI { interface PrintRenderFrame { // Tells the RenderFrame to switch the CSS to print media type, render every // requested page, and then switch back the CSS to display media type. @@ -433,7 +433,7 @@ index faccd2a6881b74f1fa6538fc1011071ac54b03e0..342fba6eb86ee803aae6f11826ee5ccc // Tells the RenderFrame to switch the CSS to print media type, render every // requested page using the print preview document's frame/node, and then diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc -index 6ec0fc46b27554cdf49a7ba41ee070f7f4c41270..ad9f504e47f83156fb388de9bee2b8efa8aad12c 100644 +index 2a97938d20b69760b48c51a6712d646cd47339d7..fc39f8874402904021e804a5b7fc754709f25353 100644 --- a/components/printing/renderer/print_render_frame_helper.cc +++ b/components/printing/renderer/print_render_frame_helper.cc @@ -41,6 +41,7 @@ @@ -490,7 +490,7 @@ index 6ec0fc46b27554cdf49a7ba41ee070f7f4c41270..ad9f504e47f83156fb388de9bee2b8ef print_preview_context_.OnPrintPreview(); if (print_preview_context_.IsForArc()) { -@@ -1784,7 +1788,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { +@@ -1785,7 +1789,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { auto self = weak_ptr_factory_.GetWeakPtr(); Print(duplicate_node.GetDocument().GetFrame(), duplicate_node, @@ -501,7 +501,7 @@ index 6ec0fc46b27554cdf49a7ba41ee070f7f4c41270..ad9f504e47f83156fb388de9bee2b8ef // Check if |this| is still valid. if (!self) return; -@@ -1795,7 +1801,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { +@@ -1796,7 +1802,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, const blink::WebNode& node, @@ -512,7 +512,7 @@ index 6ec0fc46b27554cdf49a7ba41ee070f7f4c41270..ad9f504e47f83156fb388de9bee2b8ef // If still not finished with earlier print request simply ignore. if (prep_frame_view_) return; -@@ -1803,7 +1811,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, +@@ -1804,7 +1812,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, FrameReference frame_ref(frame); int expected_page_count = 0; @@ -521,7 +521,7 @@ index 6ec0fc46b27554cdf49a7ba41ee070f7f4c41270..ad9f504e47f83156fb388de9bee2b8ef DidFinishPrinting(FAIL_PRINT_INIT); return; // Failed to init print page settings. } -@@ -1823,8 +1831,11 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, +@@ -1824,8 +1832,11 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, PrintMsg_PrintPages_Params print_settings; auto self = weak_ptr_factory_.GetWeakPtr(); @@ -535,7 +535,7 @@ index 6ec0fc46b27554cdf49a7ba41ee070f7f4c41270..ad9f504e47f83156fb388de9bee2b8ef // Check if |this| is still valid. if (!self) return; -@@ -2063,10 +2074,23 @@ void PrintRenderFrameHelper::IPCProcessed() { +@@ -2064,10 +2075,23 @@ void PrintRenderFrameHelper::IPCProcessed() { base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this); } @@ -562,7 +562,7 @@ index 6ec0fc46b27554cdf49a7ba41ee070f7f4c41270..ad9f504e47f83156fb388de9bee2b8ef // Check if the printer returned any settings, if the settings is empty, we // can safely assume there are no printer drivers configured. So we safely // terminate. -@@ -2086,12 +2110,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) { +@@ -2087,12 +2111,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) { return result; } @@ -582,7 +582,7 @@ index 6ec0fc46b27554cdf49a7ba41ee070f7f4c41270..ad9f504e47f83156fb388de9bee2b8ef Send(new PrintHostMsg_ShowInvalidPrinterSettingsError(routing_id())); return false; diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h -index ed6c6019fa189a0757a37516f82871c637a455a1..d0ad3502bc6d14f231d94b9dd4c9d4f372d17d25 100644 +index dbf78f87024a2200154f7811e07466072508eff0..9f7b5f9f013bc59dd3dbcccab5bda1d5e30baf6d 100644 --- a/components/printing/renderer/print_render_frame_helper.h +++ b/components/printing/renderer/print_render_frame_helper.h @@ -225,7 +225,7 @@ class PrintRenderFrameHelper diff --git a/patches/chromium/render_widget_host_view_mac.patch b/patches/chromium/render_widget_host_view_mac.patch index 6dea6a0c90a95..0b35c074d3c55 100644 --- a/patches/chromium/render_widget_host_view_mac.patch +++ b/patches/chromium/render_widget_host_view_mac.patch @@ -25,7 +25,7 @@ index bd3c6c1724bee8f06544a2aece0ae5e45c145e4d..d84160a3ce7d08e64053b4634f490669 // These are not documented, so use only after checking -respondsToSelector:. @interface NSApplication (UndocumentedSpeechMethods) - (void)speakString:(NSString*)string; -@@ -645,6 +650,9 @@ void ExtractUnderlines(NSAttributedString* string, +@@ -645,6 +650,9 @@ - (BOOL)acceptsMouseEventsWhenInactive { } - (BOOL)acceptsFirstMouse:(NSEvent*)theEvent { @@ -35,7 +35,7 @@ index bd3c6c1724bee8f06544a2aece0ae5e45c145e4d..d84160a3ce7d08e64053b4634f490669 return [self acceptsMouseEventsWhenInactive]; } -@@ -1078,6 +1086,10 @@ void ExtractUnderlines(NSAttributedString* string, +@@ -1078,6 +1086,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv { eventType == NSKeyDown && !(modifierFlags & NSCommandKeyMask); @@ -46,7 +46,7 @@ index bd3c6c1724bee8f06544a2aece0ae5e45c145e4d..d84160a3ce7d08e64053b4634f490669 // We only handle key down events and just simply forward other events. if (eventType != NSKeyDown) { _hostHelper->ForwardKeyboardEvent(event, latency_info); -@@ -1854,9 +1866,11 @@ void ExtractUnderlines(NSAttributedString* string, +@@ -1854,9 +1866,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 // @@ -58,7 +58,7 @@ index bd3c6c1724bee8f06544a2aece0ae5e45c145e4d..d84160a3ce7d08e64053b4634f490669 - (NSArray*)validAttributesForMarkedText { // This code is just copied from WebKit except renaming variables. -@@ -1865,7 +1879,10 @@ extern NSString* NSTextInputReplacementRangeAttributeName; +@@ -1865,7 +1879,10 @@ - (NSArray*)validAttributesForMarkedText { initWithObjects:NSUnderlineStyleAttributeName, NSUnderlineColorAttributeName, NSMarkedClauseSegmentAttributeName, diff --git a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch index 32e73fc737bc9..b53fa48f1ac04 100644 --- a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch +++ b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch @@ -9,10 +9,10 @@ for every navigation to keep Node.js working properly. Once Native Modules in th are required to be NAPI or context aware (Electron v11), this patch can be removed. diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc -index 03d1e6a078433e15accf847439182f7c8dea3f00..bf5dc00667ff0e47e9a0833ad302d06c39b5f822 100644 +index 08d7b045b83d6dfc50fc8e48e8c1e2c81b390e20..78e18e18a122e870337467c5593ae4d0f74fa94e 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -1306,6 +1306,25 @@ bool ChromeContentRendererClient::AllowPopup() { +@@ -1312,6 +1312,25 @@ bool ChromeContentRendererClient::AllowPopup() { #endif } @@ -92,7 +92,7 @@ index d57edc0cea54b9d78700c3b9acdcfcc5f17341dd..e56aae188d7d8f46a4438b8e99f7e9b7 // |url|. If the function returns a valid |new_url|, the request must be // updated to use it. The |force_ignore_site_for_cookies| output parameter diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 37670e0284ae1df27ae665365c0119e279e7133c..4002316737bdce3f143906bd457b5b4fd0e458f6 100644 +index 213d1df1c12f7f5109440e9c775476856ce29f5f..3b122da72652145eb04b22d18c46c600c9f7a949 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -5454,6 +5454,23 @@ void RenderFrameImpl::BeginNavigation( diff --git a/patches/chromium/webview_cross_drag.patch b/patches/chromium/webview_cross_drag.patch index 94843102d181e..737fdcc0e413f 100644 --- a/patches/chromium/webview_cross_drag.patch +++ b/patches/chromium/webview_cross_drag.patch @@ -26,7 +26,7 @@ diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser index a964f38b830f62bf694646033e1c24e0cf4557c5..61e69fdebaca038d09b5ebab71fd20e2e13188f0 100644 --- a/content/browser/web_contents/web_drag_dest_mac.mm +++ b/content/browser/web_contents/web_drag_dest_mac.mm -@@ -384,9 +384,7 @@ void DropCompletionCallback( +@@ -384,9 +384,7 @@ - (void)setDragStartTrackersForProcess:(int)processID { } - (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH { diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch index 7bc9f696495f3..6821e2c15072a 100644 --- a/patches/chromium/worker_context_will_destroy.patch +++ b/patches/chromium/worker_context_will_destroy.patch @@ -26,10 +26,10 @@ index f6d2f50e8d6b4a5df796f2d4478ccd3048101532..d57edc0cea54b9d78700c3b9acdcfcc5 // 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 8611e03b633c26f197f71bdfbe0b340bd0f20c16..5216b1692783a7347c93cc9907a6f6bc139ff95e 100644 +index 5fdbf2ad77b331b5593a3592429d389ee4577713..b8958eb6478f3b34fe14a3b977190943fad83b71 100644 --- a/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc -@@ -866,6 +866,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { +@@ -854,6 +854,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread(); } @@ -43,7 +43,7 @@ index 8611e03b633c26f197f71bdfbe0b340bd0f20c16..5216b1692783a7347c93cc9907a6f6bc 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 d70f60d361b4df9c8aeb417c18f8634bd1f9482b..f719cdc32135e01694a5c430b9bb5609c4d8a89b 100644 +index df25b9f5da050cc9a040bf462353a4729c4b03c6..df4ffe4e2781c359b53bf533b285f36f840d8611 100644 --- a/content/renderer/renderer_blink_platform_impl.h +++ b/content/renderer/renderer_blink_platform_impl.h @@ -184,6 +184,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { @@ -55,10 +55,10 @@ index d70f60d361b4df9c8aeb417c18f8634bd1f9482b..f719cdc32135e01694a5c430b9bb5609 const blink::WebString& header_name) override; diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h -index 1e9931b2da6283c4fd93a7abfba33a82d1aeb933..829524c4a22d1454c227bed30632bd819373f8c0 100644 +index 2af136afcbd54c2fb74f02f066e0353ea078231a..904ed2f459b5fb6b8fffb6e9c67d5cbf280ec10b 100644 --- a/third_party/blink/public/platform/platform.h +++ b/third_party/blink/public/platform/platform.h -@@ -626,6 +626,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -610,6 +610,7 @@ class BLINK_PLATFORM_EXPORT Platform { virtual void DidStartWorkerThread() {} virtual void WillStopWorkerThread() {} virtual void WorkerContextCreated(const v8::Local& worker) {} diff --git a/patches/v8/add_realloc.patch b/patches/v8/add_realloc.patch index 6cfb917d341e8..3b14c097369bf 100644 --- a/patches/v8/add_realloc.patch +++ b/patches/v8/add_realloc.patch @@ -30,7 +30,7 @@ index 00a4ae280322334c20d10f0921a5b1a7594e03fa..fa8116d882bdf8270c56fbdf3b627210 * 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/api.cc b/src/api/api.cc -index 49b1a1d15734dc284264c3b9af6a99559c0367dd..8776d3369e2c5f36b43309e38def79d25fc231d9 100644 +index 9a0a271d3c323f20da7ad70f929907c3c8906b3e..a39c4e3f10d5079406f469b76a1ea96c8b2831d8 100644 --- a/src/api/api.cc +++ b/src/api/api.cc @@ -533,6 +533,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) { diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch index 5bdc11a41d1f5..573613512e367 100644 --- a/patches/v8/build_gn.patch +++ b/patches/v8/build_gn.patch @@ -9,7 +9,7 @@ necessary for native modules to load. Also, some fixes relating to mksnapshot on ARM. diff --git a/BUILD.gn b/BUILD.gn -index c1d54c11901b2e7a6cd428e627a09d8de02f98f1..ad6ef4b055b120a57384fb04d851d98876319632 100644 +index 501639d810ac1716c9aee9dad472b915cb8259e6..f1106c9750daf3ba05b5b6f3b166254fe04818de 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -355,7 +355,7 @@ config("internal_config") { diff --git a/patches/v8/dcheck.patch b/patches/v8/dcheck.patch index b38618a55aaab..d40b7b06d2bae 100644 --- a/patches/v8/dcheck.patch +++ b/patches/v8/dcheck.patch @@ -6,7 +6,7 @@ Subject: dcheck.patch https://github.com/auchenberg/volkswagen diff --git a/src/api/api.cc b/src/api/api.cc -index 8776d3369e2c5f36b43309e38def79d25fc231d9..827dd51fc68b180e1e2f3a0b93ef950959982e06 100644 +index a39c4e3f10d5079406f469b76a1ea96c8b2831d8..10693ab15c5e21b40144978b37f3aa994b06e02f 100644 --- a/src/api/api.cc +++ b/src/api/api.cc @@ -8656,7 +8656,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) { diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch index e2a7e4042e899..9694d6029cc6a 100644 --- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch +++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch @@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not contain any standard C++ library exports (e.g. `std::ostringstream`). diff --git a/BUILD.gn b/BUILD.gn -index ef5e9e71f23fbbf0ac9bac9a7ae3b8443e2117cc..92ca30d4fb4b6f60cc95788748292fef4ec53b92 100644 +index 10c29f15adba9c28f21ab7625004d44e1711aaac..b5f731d6baaccf3f8a221d0e55e02e03bdd0ec9d 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -355,6 +355,10 @@ config("internal_config") { diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch index c4d099805d84e..a719efbd186ca 100644 --- a/patches/v8/expose_mksnapshot.patch +++ b/patches/v8/expose_mksnapshot.patch @@ -6,7 +6,7 @@ Subject: expose_mksnapshot.patch Needed in order to target mksnapshot for mksnapshot zip. diff --git a/BUILD.gn b/BUILD.gn -index ad6ef4b055b120a57384fb04d851d98876319632..ef5e9e71f23fbbf0ac9bac9a7ae3b8443e2117cc 100644 +index f1106c9750daf3ba05b5b6f3b166254fe04818de..10c29f15adba9c28f21ab7625004d44e1711aaac 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -4327,7 +4327,6 @@ if (current_toolchain == v8_generator_toolchain) { From 8101d956f50c222f8527f8aece885d2a1a22ac56 Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Tue, 30 Jun 2020 09:46:32 -0700 Subject: [PATCH 31/79] Reland "Reland "New toolchain for Windows 10 19041 SDK"" https://chromium-review.googlesource.com/c/chromium/src/+/2255527 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 0c8bc9c7f7407..622450e836ff0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,7 +29,7 @@ version: 1.0.{build} build_cloud: electron-16-core -image: vs2019bt-16.4.0 +image: vs2019bt-16.6.2 environment: GIT_CACHE_PATH: C:\Users\electron\libcc_cache ELECTRON_OUT_DIR: Default From ef66b3f0e452c2a545713bc7b0786ec0895c7dfb Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Tue, 30 Jun 2020 17:45:00 +0000 Subject: [PATCH 32/79] update patches --- patches/chromium/command-ismediakey.patch | 2 +- .../crash_allow_setting_more_options.patch | 4 +- .../disable_compositor_recycling.patch | 2 +- ...use_key_listener_for_internal_chrome.patch | 2 +- patches/chromium/mas-cfisobjc.patch | 6 +- .../chromium/mas_blink_no_private_api.patch | 6 +- .../mas_disable_custom_window_frame.patch | 18 ++--- .../mas_disable_remote_accessibility.patch | 26 ++++---- .../chromium/mas_disable_remote_layer.patch | 10 +-- patches/chromium/mas_no_private_api.patch | 66 +++++++++---------- .../render_widget_host_view_mac.patch | 8 +-- patches/chromium/webview_cross_drag.patch | 2 +- 12 files changed, 76 insertions(+), 76 deletions(-) diff --git a/patches/chromium/command-ismediakey.patch b/patches/chromium/command-ismediakey.patch index 24b36c0ed6759..5ba1146d4c08b 100644 --- a/patches/chromium/command-ismediakey.patch +++ b/patches/chromium/command-ismediakey.patch @@ -74,7 +74,7 @@ index 6052fd13ff3d63cf8a4b019b058efb61aad39c3b..42eac7a7b656096c1d2039e340037ac8 } return VKEY_UNKNOWN; } -@@ -193,7 +199,10 @@ static CGEventRef EventTapCallback(CGEventTapProxy proxy, +@@ -193,7 +199,10 @@ CGEventRef MediaKeysListenerImpl::EventTapCallback(CGEventTapProxy proxy, int key_code = (data1 & 0xFFFF0000) >> 16; if (key_code != NX_KEYTYPE_PLAY && key_code != NX_KEYTYPE_NEXT && key_code != NX_KEYTYPE_PREVIOUS && key_code != NX_KEYTYPE_FAST && diff --git a/patches/chromium/crash_allow_setting_more_options.patch b/patches/chromium/crash_allow_setting_more_options.patch index 896afb9ad4692..25cc2a2e89bd3 100644 --- a/patches/chromium/crash_allow_setting_more_options.patch +++ b/patches/chromium/crash_allow_setting_more_options.patch @@ -78,7 +78,7 @@ diff --git a/components/crash/core/app/crashpad_mac.mm b/components/crash/core/a index 0b594d053d7c7f2a8eae9a15e62daacab52ffa64..96210530f699a2331f57415beddc20ed19b9cb4b 100644 --- a/components/crash/core/app/crashpad_mac.mm +++ b/components/crash/core/app/crashpad_mac.mm -@@ -67,6 +67,8 @@ +@@ -67,6 +67,8 @@ std::map GetProcessSimpleAnnotations() { } // @autoreleasepool return process_annotations; }(); @@ -87,7 +87,7 @@ index 0b594d053d7c7f2a8eae9a15e62daacab52ffa64..96210530f699a2331f57415beddc20ed return annotations; } -@@ -137,6 +139,13 @@ void DumpProcessWithoutCrashing(task_t task_port) { +@@ -137,6 +139,13 @@ base::FilePath PlatformCrashpadInitialization( std::vector arguments; diff --git a/patches/chromium/disable_compositor_recycling.patch b/patches/chromium/disable_compositor_recycling.patch index 29301f5cbeb68..8da0db349933b 100644 --- a/patches/chromium/disable_compositor_recycling.patch +++ b/patches/chromium/disable_compositor_recycling.patch @@ -9,7 +9,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/cont index d240fa425224d2917f523b866921d4ae5950a4d3..eb8e76d86cb8293fe2ec75f42f20df41d8795f2c 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm -@@ -478,7 +478,11 @@ +@@ -478,7 +478,11 @@ void RenderWidgetHostViewMac::WasOccluded() { return; host()->WasHidden(); diff --git a/patches/chromium/fix_use_the_new_mediaplaypause_key_listener_for_internal_chrome.patch b/patches/chromium/fix_use_the_new_mediaplaypause_key_listener_for_internal_chrome.patch index b711b3c08f7b7..891578361cdba 100644 --- a/patches/chromium/fix_use_the_new_mediaplaypause_key_listener_for_internal_chrome.patch +++ b/patches/chromium/fix_use_the_new_mediaplaypause_key_listener_for_internal_chrome.patch @@ -12,7 +12,7 @@ diff --git a/chrome/browser/extensions/global_shortcut_listener_mac.mm b/chrome/ index befe726af9c10b1563a7fc0bb77cc55f65943d5c..bac51f33f35f96fe4ecc764cf5ca887176642f74 100644 --- a/chrome/browser/extensions/global_shortcut_listener_mac.mm +++ b/chrome/browser/extensions/global_shortcut_listener_mac.mm -@@ -39,7 +39,7 @@ +@@ -39,7 +39,7 @@ GlobalShortcutListenerMac::GlobalShortcutListenerMac() // global MediaKeysListener to receive media keys. if (!content::MediaKeysListenerManager::IsMediaKeysListenerManagerEnabled()) { media_keys_listener_ = ui::MediaKeysListener::Create( diff --git a/patches/chromium/mas-cfisobjc.patch b/patches/chromium/mas-cfisobjc.patch index 1879e9e404082..151a91a41faa6 100644 --- a/patches/chromium/mas-cfisobjc.patch +++ b/patches/chromium/mas-cfisobjc.patch @@ -9,7 +9,7 @@ diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm index be12912dcd0ef0cf046ee2d4033a18ecfdf1e992..d2af322a9d5751105e2c8fe023aad9a91027bf05 100644 --- a/base/mac/foundation_util.mm +++ b/base/mac/foundation_util.mm -@@ -28,12 +28,6 @@ +@@ -28,12 +28,6 @@ CFTypeID SecKeyGetTypeID(); #if !defined(OS_IOS) CFTypeID SecACLGetTypeID(); CFTypeID SecTrustedApplicationGetTypeID(); @@ -22,7 +22,7 @@ index be12912dcd0ef0cf046ee2d4033a18ecfdf1e992..d2af322a9d5751105e2c8fe023aad9a9 #endif } // extern "C" -@@ -326,8 +320,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) { +@@ -326,8 +320,7 @@ NSFont* CFToNSCast(CTFontRef cf_val) { const_cast(reinterpret_cast(cf_val)); DCHECK(!cf_val || CTFontGetTypeID() == CFGetTypeID(cf_val) || @@ -32,7 +32,7 @@ index be12912dcd0ef0cf046ee2d4033a18ecfdf1e992..d2af322a9d5751105e2c8fe023aad9a9 return ns_val; } -@@ -398,9 +391,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) { +@@ -398,9 +391,6 @@ CFCast(const CFTypeRef& cf_val) { return (CTFontRef)(cf_val); } diff --git a/patches/chromium/mas_blink_no_private_api.patch b/patches/chromium/mas_blink_no_private_api.patch index 38b83d60c1f5c..bbbc8584b58b8 100644 --- a/patches/chromium/mas_blink_no_private_api.patch +++ b/patches/chromium/mas_blink_no_private_api.patch @@ -18,7 +18,7 @@ index 94afefcee81b87c05bf9b1199d90d3d4b5ea84a6..2ec7f04c71824b47de1ddbf1f0e8625d extern "C" { // Kill ring calls. Would be better to use NSKillRing.h, but that's not -@@ -39,38 +40,53 @@ +@@ -39,38 +40,53 @@ NSString* _NSYankFromKillRing(); void _NSNewKillRingSequence(); void _NSSetKillRingToYankedState(); } @@ -92,7 +92,7 @@ index 8f4ae94bc1d8188d041654c50511f3346eee79de..fa06f47abbff3dcda937bf0b794f616e namespace blink { -@@ -95,10 +97,12 @@ void _NSDrawCarbonThemeListBox(NSRect frame, +@@ -95,10 +97,12 @@ bool ThemePainterMac::PaintTextField(const Node* node, // behavior change while remaining a fragile solution. // https://bugs.chromium.org/p/chromium/issues/detail?id=658085#c3 if (!use_ns_text_field_cell) { @@ -105,7 +105,7 @@ index 8f4ae94bc1d8188d041654c50511f3346eee79de..fa06f47abbff3dcda937bf0b794f616e return false; } -@@ -186,10 +190,12 @@ void _NSDrawCarbonThemeListBox(NSRect frame, +@@ -186,10 +190,12 @@ bool ThemePainterMac::PaintTextArea(const Node* node, const IntRect& r) { ScopedColorSchemeAppearance appearance(style.UsedColorScheme()); LocalCurrentGraphicsContext local_context(paint_info.context, r); diff --git a/patches/chromium/mas_disable_custom_window_frame.patch b/patches/chromium/mas_disable_custom_window_frame.patch index a65f0da5a1764..554db884c796c 100644 --- a/patches/chromium/mas_disable_custom_window_frame.patch +++ b/patches/chromium/mas_disable_custom_window_frame.patch @@ -18,7 +18,7 @@ index 2cd283de6677f0c256940ab475eb6c58d8040f54..ad7f1f0c05b491977ccd5650c94248e8 @interface NSWindow (PrivateBrowserNativeWidgetAPI) + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle; @end -@@ -63,6 +64,8 @@ - (NSRect)_draggableFrame NS_DEPRECATED_MAC(10_10, 10_11) { +@@ -63,6 +64,8 @@ @end @@ -27,7 +27,7 @@ index 2cd283de6677f0c256940ab475eb6c58d8040f54..ad7f1f0c05b491977ccd5650c94248e8 @implementation BrowserNativeWidgetWindow // Prevent detached tabs from glitching when the window is partially offscreen. -@@ -88,6 +91,7 @@ - (NSRect)constrainFrameRect:(NSRect)rect toScreen:(NSScreen*)screen { +@@ -88,6 +91,7 @@ // NSWindow (PrivateAPI) overrides. @@ -35,7 +35,7 @@ index 2cd283de6677f0c256940ab475eb6c58d8040f54..ad7f1f0c05b491977ccd5650c94248e8 + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle { // - NSThemeFrame and its subclasses will be nil if it's missing at runtime. if ([BrowserWindowFrame class]) -@@ -102,6 +106,8 @@ - (BOOL)_usesCustomDrawing { +@@ -102,6 +106,8 @@ return NO; } @@ -57,7 +57,7 @@ index 8416c7c6e052dafb2aad61c0bd3224c36e945d23..cd356beda023ab2409b16d58ca38c70b @interface NSWindow (PrivateAPI) + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle; @end -@@ -18,8 +20,12 @@ - (CGFloat)_titlebarHeight { +@@ -18,8 +20,12 @@ } @end @@ -70,7 +70,7 @@ index 8416c7c6e052dafb2aad61c0bd3224c36e945d23..cd356beda023ab2409b16d58ca38c70b + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle { if ([NativeWidgetMacFramelessNSWindowFrame class]) { return [NativeWidgetMacFramelessNSWindowFrame class]; -@@ -27,4 +33,6 @@ + (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle { +@@ -27,4 +33,6 @@ return [super frameViewClassForStyleMask:windowStyle]; } @@ -111,7 +111,7 @@ index 757c72d98de11f611309f4f5af8d0d9aab639181..a6319a0760308df6bac6b39ad3500ad7 - (BOOL)hasKeyAppearance; - (long long)_resizeDirectionForMouseLocation:(CGPoint)location; - (BOOL)_isConsideredOpenForPersistentState; -@@ -58,6 +60,8 @@ - (void)cr_mouseDownOnFrameView:(NSEvent*)event { +@@ -58,6 +60,8 @@ } @end @@ -120,7 +120,7 @@ index 757c72d98de11f611309f4f5af8d0d9aab639181..a6319a0760308df6bac6b39ad3500ad7 @implementation NativeWidgetMacNSWindowTitledFrame - (void)mouseDown:(NSEvent*)event { if (base::mac::IsAtMostOS10_11() && self.window.isMovable) -@@ -84,6 +88,8 @@ - (BOOL)usesCustomDrawing { +@@ -84,6 +88,8 @@ } @end @@ -129,7 +129,7 @@ index 757c72d98de11f611309f4f5af8d0d9aab639181..a6319a0760308df6bac6b39ad3500ad7 @implementation NativeWidgetMacNSWindow { @private base::scoped_nsobject _commandDispatcher; -@@ -165,6 +171,8 @@ - (BOOL)hasViewsMenuActive { +@@ -165,6 +171,8 @@ // NSWindow overrides. @@ -138,7 +138,7 @@ index 757c72d98de11f611309f4f5af8d0d9aab639181..a6319a0760308df6bac6b39ad3500ad7 + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle { if (windowStyle & NSWindowStyleMaskTitled) { if (Class customFrame = [NativeWidgetMacNSWindowTitledFrame class]) -@@ -176,6 +184,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle { +@@ -176,6 +184,8 @@ return [super frameViewClassForStyleMask:windowStyle]; } diff --git a/patches/chromium/mas_disable_remote_accessibility.patch b/patches/chromium/mas_disable_remote_accessibility.patch index 8b1a1ee3b4580..b1c4fd7403d48 100644 --- a/patches/chromium/mas_disable_remote_accessibility.patch +++ b/patches/chromium/mas_disable_remote_accessibility.patch @@ -17,7 +17,7 @@ diff --git a/components/remote_cocoa/app_shim/application_bridge.mm b/components index 9ddda9116e7284cbccde8a51e23ad7560dd06367..e846091ad99b0154636489e53491209ff3cbfaaa 100644 --- a/components/remote_cocoa/app_shim/application_bridge.mm +++ b/components/remote_cocoa/app_shim/application_bridge.mm -@@ -49,6 +49,7 @@ +@@ -49,6 +49,7 @@ class NativeWidgetBridgeOwner : public NativeWidgetNSWindowHostHelper { // NativeWidgetNSWindowHostHelper: id GetNativeViewAccessible() override { @@ -25,7 +25,7 @@ index 9ddda9116e7284cbccde8a51e23ad7560dd06367..e846091ad99b0154636489e53491209f if (!remote_accessibility_element_) { int64_t browser_pid = 0; std::vector element_token; -@@ -59,6 +60,9 @@ id GetNativeViewAccessible() override { +@@ -59,6 +60,9 @@ class NativeWidgetBridgeOwner : public NativeWidgetNSWindowHostHelper { ui::RemoteAccessibility::GetRemoteElementFromToken(element_token); } return remote_accessibility_element_.get(); @@ -35,7 +35,7 @@ index 9ddda9116e7284cbccde8a51e23ad7560dd06367..e846091ad99b0154636489e53491209f } void DispatchKeyEvent(ui::KeyEvent* event) override { bool event_handled = false; -@@ -96,8 +100,10 @@ void GetWordAt(const gfx::Point& location_in_content, +@@ -96,8 +100,10 @@ class NativeWidgetBridgeOwner : public NativeWidgetNSWindowHostHelper { mojo::AssociatedRemote text_input_host_remote_; std::unique_ptr bridge_; @@ -50,7 +50,7 @@ diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm index 2ee45cb069ec5d78d9c7a3f61fdd1d444a590f41..badc4323b910f8e3957583e05af303472cb204f6 100644 --- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm +++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm -@@ -543,10 +543,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) { +@@ -543,10 +543,12 @@ void NativeWidgetNSWindowBridge::CreateContentView(uint64_t ns_view_id, // this should be treated as an error and caught early. CHECK(bridged_view_); @@ -67,7 +67,7 @@ diff --git a/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm b/cont index c3a9fbf0f9d2b80c1de42a22ad094a286f0b559b..02493d4b62c98a3aebd3e460c459218a4dc4ea8e 100644 --- a/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm +++ b/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm -@@ -70,8 +70,10 @@ id GetFocusedBrowserAccessibilityElement() override { +@@ -70,8 +70,10 @@ class RenderWidgetHostNSViewBridgeOwner return nil; } void SetAccessibilityWindow(NSWindow* window) override { @@ -78,7 +78,7 @@ index c3a9fbf0f9d2b80c1de42a22ad094a286f0b559b..02493d4b62c98a3aebd3e460c459218a } void ForwardKeyboardEvent(const content::NativeWebKeyboardEvent& key_event, -@@ -133,8 +135,10 @@ void SmartMagnify(const blink::WebGestureEvent& web_event) override { +@@ -133,8 +135,10 @@ class RenderWidgetHostNSViewBridgeOwner mojo::AssociatedRemote host_; std::unique_ptr bridge_; @@ -120,7 +120,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/cont index eb75e4d47204118c963110c549835941776f5110..d240fa425224d2917f523b866921d4ae5950a4d3 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm -@@ -233,8 +233,10 @@ +@@ -233,8 +233,10 @@ RenderWidgetHostViewMac::~RenderWidgetHostViewMac() { void RenderWidgetHostViewMac::MigrateNSViewBridge( remote_cocoa::mojom::Application* remote_cocoa_application, uint64_t parent_ns_view_id) { @@ -131,7 +131,7 @@ index eb75e4d47204118c963110c549835941776f5110..d240fa425224d2917f523b866921d4ae // Disconnect from the previous bridge (this will have the effect of // destroying the associated bridge), and close the receiver (to allow it -@@ -1377,8 +1379,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback, +@@ -1377,8 +1379,10 @@ RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessible() { gfx::NativeViewAccessible RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessibleForWindow() { @@ -142,7 +142,7 @@ index eb75e4d47204118c963110c549835941776f5110..d240fa425224d2917f523b866921d4ae return [GetInProcessNSView() window]; } -@@ -1410,9 +1414,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback, +@@ -1410,9 +1414,11 @@ id RenderWidgetHostViewMac::GetFocusedBrowserAccessibilityElement() { } void RenderWidgetHostViewMac::SetAccessibilityWindow(NSWindow* window) { @@ -154,7 +154,7 @@ index eb75e4d47204118c963110c549835941776f5110..d240fa425224d2917f523b866921d4ae } bool RenderWidgetHostViewMac::SyncIsWidgetForMainFrame( -@@ -1899,12 +1905,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback, +@@ -1899,12 +1905,14 @@ void RenderWidgetHostViewMac::StopSpeaking() { void RenderWidgetHostViewMac::SetRemoteAccessibilityWindowToken( const std::vector& window_token) { @@ -239,7 +239,7 @@ diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa index 2256c365af5b1af79458fdcb0cb9d44c9ff641fd..f4949b071a177452b0074a2436669e9846558d1a 100644 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm -@@ -282,14 +282,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator, +@@ -282,14 +282,22 @@ gfx::NativeViewAccessible NativeWidgetMacNSWindowHost::GetNativeViewAccessibleForNSView() const { if (in_process_ns_window_bridge_) return in_process_ns_window_bridge_->ns_view(); @@ -262,7 +262,7 @@ index 2256c365af5b1af79458fdcb0cb9d44c9ff641fd..f4949b071a177452b0074a2436669e98 } remote_cocoa::mojom::NativeWidgetNSWindow* -@@ -1118,6 +1126,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator, +@@ -1118,6 +1126,7 @@ void NativeWidgetMacNSWindowHost::OnFocusWindowToolbar() { void NativeWidgetMacNSWindowHost::SetRemoteAccessibilityTokens( const std::vector& window_token, const std::vector& view_token) { @@ -270,7 +270,7 @@ index 2256c365af5b1af79458fdcb0cb9d44c9ff641fd..f4949b071a177452b0074a2436669e98 remote_window_accessible_ = ui::RemoteAccessibility::GetRemoteElementFromToken(window_token); remote_view_accessible_ = -@@ -1125,14 +1134,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator, +@@ -1125,14 +1134,17 @@ void NativeWidgetMacNSWindowHost::SetRemoteAccessibilityTokens( [remote_view_accessible_ setWindowUIElement:remote_window_accessible_.get()]; [remote_view_accessible_ setTopLevelUIElement:remote_window_accessible_.get()]; diff --git a/patches/chromium/mas_disable_remote_layer.patch b/patches/chromium/mas_disable_remote_layer.patch index 68d19bc90a580..35f24f47c2e66 100644 --- a/patches/chromium/mas_disable_remote_layer.patch +++ b/patches/chromium/mas_disable_remote_layer.patch @@ -44,7 +44,7 @@ diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.mm b/gpu/ipc/se index f0dd2928aefcfef71e148e4e5c1e88dd7f9b0724..3461a7839a13f5c34c78b9b13997d5d3e42977a4 100644 --- a/gpu/ipc/service/image_transport_surface_overlay_mac.mm +++ b/gpu/ipc/service/image_transport_surface_overlay_mac.mm -@@ -51,7 +51,7 @@ +@@ -51,7 +51,7 @@ ImageTransportSurfaceOverlayMacBase:: ca_layer_tree_coordinator_.reset(new ui::CALayerTreeCoordinator( use_remote_layer_api_, allow_av_sample_buffer_display_layer)); @@ -53,7 +53,7 @@ index f0dd2928aefcfef71e148e4e5c1e88dd7f9b0724..3461a7839a13f5c34c78b9b13997d5d3 // Create the CAContext to send this to the GPU process, and the layer for // the context. if (use_remote_layer_api_) { -@@ -60,6 +60,7 @@ +@@ -60,6 +60,7 @@ ImageTransportSurfaceOverlayMacBase:: options:@{}] retain]); [ca_context_ setLayer:ca_layer_tree_coordinator_->GetCALayerForDisplay()]; } @@ -61,7 +61,7 @@ index f0dd2928aefcfef71e148e4e5c1e88dd7f9b0724..3461a7839a13f5c34c78b9b13997d5d3 } template -@@ -140,7 +141,9 @@ +@@ -140,7 +141,9 @@ ImageTransportSurfaceOverlayMacBase::SwapBuffersInternal( "GLImpl", static_cast(gl::GetGLImplementation()), "width", pixel_size_.width()); if (use_remote_layer_api_) { @@ -75,7 +75,7 @@ diff --git a/ui/accelerated_widget_mac/display_ca_layer_tree.mm b/ui/accelerated index 0db8f3e223e3cb8e289af63a50104fb6823ed46a..d7969cf08317731bf8e1c8545a07734412593e37 100644 --- a/ui/accelerated_widget_mac/display_ca_layer_tree.mm +++ b/ui/accelerated_widget_mac/display_ca_layer_tree.mm -@@ -98,6 +98,7 @@ - (void)setContentsChanged; +@@ -98,6 +98,7 @@ void DisplayCALayerTree::UpdateCALayerTree( } void DisplayCALayerTree::GotCALayerFrame(uint32_t ca_context_id) { @@ -83,7 +83,7 @@ index 0db8f3e223e3cb8e289af63a50104fb6823ed46a..d7969cf08317731bf8e1c8545a077344 // Early-out if the remote layer has not changed. if ([remote_layer_ contextId] == ca_context_id) return; -@@ -122,6 +123,9 @@ - (void)setContentsChanged; +@@ -122,6 +123,9 @@ void DisplayCALayerTree::GotCALayerFrame(uint32_t ca_context_id) { [io_surface_layer_ removeFromSuperlayer]; io_surface_layer_.reset(); } diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch index d7f441ecb0aa7..8b11bf4c89e0e 100644 --- a/patches/chromium/mas_no_private_api.patch +++ b/patches/chromium/mas_no_private_api.patch @@ -10,7 +10,7 @@ diff --git a/content/browser/accessibility/accessibility_tree_formatter_mac.mm b index 6074fd6fb7da7c0e927fa81e8095729349520417..df7e644d20b75c0ace31d34d7a605efff805fa21 100644 --- a/content/browser/accessibility/accessibility_tree_formatter_mac.mm +++ b/content/browser/accessibility/accessibility_tree_formatter_mac.mm -@@ -573,7 +573,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, +@@ -573,7 +573,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( 0 == strcmp([value objCType], @encode(NSRange))) { return PopulateRange([value rangeValue]); } @@ -19,7 +19,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..df7e644d20b75c0ace31d34d7a605eff // AXTextMarker if (content::IsAXTextMarker(value)) { return PopulateTextPosition(content::AXTextMarkerToPosition(value).get(), -@@ -584,7 +584,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, +@@ -584,7 +584,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( if (content::IsAXTextMarkerRange(value)) { return PopulateTextMarkerRange(value, line_indexes_map); } @@ -28,7 +28,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..df7e644d20b75c0ace31d34d7a605eff // Accessible object if ([value isKindOfClass:[BrowserAccessibilityCocoa class]]) { return base::Value(NodeToLineIndex(value, line_indexes_map)); -@@ -635,7 +635,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, +@@ -635,7 +635,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextPosition( kConstValuePrefix + affinity); return set; } @@ -37,7 +37,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..df7e644d20b75c0ace31d34d7a605eff base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( id object, const LineIndexesMap& line_indexes_map) const { -@@ -650,7 +650,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, +@@ -650,7 +650,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( dict.SetPath("focus", PopulateTextPosition(range.focus(), line_indexes_map)); return dict; } @@ -93,7 +93,7 @@ diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/cont index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe91289c3e 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm -@@ -208,6 +208,7 @@ +@@ -208,6 +208,7 @@ NSString* const NSString* const NSAccessibilityLengthForTextMarkerRangeParameterizedAttribute = @"AXLengthForTextMarkerRange"; @@ -101,7 +101,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Private attributes that can be used for testing text markers, e.g. in dump // tree tests. NSString* const -@@ -219,6 +220,7 @@ +@@ -219,6 +220,7 @@ NSString* const NSString* const NSAccessibilityTextMarkerNodeDebugDescriptionParameterizedAttribute = @"AXTextMarkerNodeDebugDescription"; @@ -109,7 +109,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Other private attributes. NSString* const NSAccessibilitySelectTextWithCriteriaParameterizedAttribute = -@@ -242,6 +244,7 @@ +@@ -242,6 +244,7 @@ NSDictionary* attributeToMethodNameMap = nil; // VoiceOver uses -1 to mean "no limit" for AXResultsLimit. const int kAXResultsLimitNoLimit = -1; @@ -117,7 +117,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe extern "C" { // The following are private accessibility APIs required for cursor navigation -@@ -470,6 +473,7 @@ void AddMisspelledTextAttributes(const AXPlatformRange& ax_range, +@@ -470,6 +473,7 @@ NSAttributedString* GetAttributedTextForTextMarkerRange(id marker_range) { AddMisspelledTextAttributes(ax_range, attributed_text); return attributed_text; } @@ -125,7 +125,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Returns an autoreleased copy of the AXNodeData's attribute. NSString* NSStringForStringAttribute(BrowserAccessibility* browserAccessibility, -@@ -727,6 +731,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) { +@@ -727,6 +731,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired"; #define NSAccessibilityLanguageAttribute @"AXLanguage" #endif @@ -133,7 +133,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe bool content::IsAXTextMarker(id object) { if (object == nil) return false; -@@ -770,6 +775,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) { +@@ -770,6 +775,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { kCFAllocatorDefault, anchor_textmarker, focus_textmarker); return [static_cast(cf_marker_range) autorelease]; } @@ -141,7 +141,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe @implementation BrowserAccessibilityCocoa -@@ -807,7 +813,9 @@ + (void)initialize { +@@ -807,7 +813,9 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { {NSAccessibilityEditableAncestorAttribute, @"editableAncestor"}, {NSAccessibilityElementBusyAttribute, @"elementBusy"}, {NSAccessibilityEnabledAttribute, @"enabled"}, @@ -151,7 +151,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe {NSAccessibilityExpandedAttribute, @"expanded"}, {NSAccessibilityFocusableAncestorAttribute, @"focusableAncestor"}, {NSAccessibilityFocusedAttribute, @"focused"}, -@@ -819,8 +827,10 @@ + (void)initialize { +@@ -819,8 +827,10 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { {NSAccessibilityHighestEditableAncestorAttribute, @"highestEditableAncestor"}, {NSAccessibilityIndexAttribute, @"index"}, @@ -162,7 +162,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe {NSAccessibilityInvalidAttribute, @"invalid"}, {NSAccessibilityIsMultiSelectableAttribute, @"isMultiSelectable"}, {NSAccessibilityLanguageAttribute, @"language"}, -@@ -842,13 +852,17 @@ + (void)initialize { +@@ -842,13 +852,17 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { {NSAccessibilityRowsAttribute, @"rows"}, // TODO(aboxhall): expose // NSAccessibilityServesAsTitleForUIElementsAttribute @@ -180,7 +180,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe {NSAccessibilitySizeAttribute, @"size"}, {NSAccessibilitySortDirectionAttribute, @"sortDirection"}, {NSAccessibilitySubroleAttribute, @"subrole"}, -@@ -1336,6 +1350,7 @@ - (NSNumber*)enabled { +@@ -1336,6 +1350,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { ax::mojom::Restriction::kDisabled]; } @@ -188,7 +188,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Returns a text marker that points to the last character in the document that // can be selected with VoiceOver. - (id)endTextMarker { -@@ -1346,6 +1361,7 @@ - (id)endTextMarker { +@@ -1346,6 +1361,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); return CreateTextMarker(position->CreatePositionAtEndOfAnchor()); } @@ -196,7 +196,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe - (NSNumber*)expanded { if (![self instanceActive]) -@@ -1495,6 +1511,8 @@ - (NSNumber*)index { +@@ -1495,6 +1511,8 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return nil; } @@ -205,7 +205,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe - (NSNumber*)insertionPointLineNumber { if (![self instanceActive]) return nil; -@@ -1517,6 +1535,7 @@ - (NSNumber*)insertionPointLineNumber { +@@ -1517,6 +1535,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { caretPosition->AsTextPosition()->text_offset()); return @(std::distance(lineBreaks.begin(), iterator)); } @@ -213,7 +213,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Returns whether or not this node should be ignored in the // accessibility tree. -@@ -2193,6 +2212,7 @@ - (NSArray*)selectedChildren { +@@ -2193,6 +2212,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return ret; } @@ -221,7 +221,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe - (NSString*)selectedText { if (![self instanceActive]) return nil; -@@ -2204,11 +2224,13 @@ - (NSString*)selectedText { +@@ -2204,11 +2224,13 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return nil; return base::SysUTF16ToNSString(range.GetText()); } @@ -235,7 +235,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe - (NSValue*)selectedTextRange { if (![self instanceActive]) return nil; -@@ -2229,12 +2251,15 @@ - (NSValue*)selectedTextRange { +@@ -2229,12 +2251,15 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { int selLength = range.GetText().length(); return [NSValue valueWithRange:NSMakeRange(selStart, selLength)]; } @@ -251,7 +251,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe - (NSValue*)size { if (![self instanceActive]) -@@ -2267,6 +2292,7 @@ - (NSString*)sortDirection { +@@ -2267,6 +2292,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return nil; } @@ -259,7 +259,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Returns a text marker that points to the first character in the document that // can be selected with VoiceOver. - (id)startTextMarker { -@@ -2277,6 +2303,7 @@ - (id)startTextMarker { +@@ -2277,6 +2303,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); return CreateTextMarker(position->CreatePositionAtStartOfAnchor()); } @@ -267,7 +267,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Returns a subrole based upon the role. - (NSString*)subrole { -@@ -2599,11 +2626,13 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range { +@@ -2599,11 +2626,13 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { NSMutableAttributedString* attributedInnerText = [[[NSMutableAttributedString alloc] initWithString:base::SysUTF16ToNSString(innerText)] autorelease]; @@ -281,7 +281,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe return [attributedInnerText attributedSubstringFromRange:range]; } -@@ -2707,9 +2736,8 @@ - (id)accessibilityAttributeValue:(NSString*)attribute +@@ -2707,9 +2736,8 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return ToBrowserAccessibilityCocoa(cell); } @@ -293,7 +293,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe BrowserAccessibilityPositionInstance position = CreatePositionFromTextMarker(parameter); if (!position->IsNullPosition()) -@@ -3022,6 +3050,7 @@ AXPlatformRange range(std::move(lineStartPosition), +@@ -3022,6 +3050,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return CreateTextMarker(root->CreatePositionAt(index)); } @@ -301,7 +301,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe if ([attribute isEqualToString: NSAccessibilityBoundsForRangeParameterizedAttribute]) { -@@ -3057,6 +3086,7 @@ AXPlatformRange range(std::move(lineStartPosition), +@@ -3057,6 +3086,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return nil; } @@ -309,7 +309,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe if ([attribute isEqualToString: NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) { -@@ -3171,6 +3201,7 @@ AXPlatformRange range(std::move(lineStartPosition), +@@ -3171,6 +3201,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return @(child->GetIndexInParent()); } @@ -321,7 +321,7 @@ diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm index 83d0106f0f237dea75dfafe011bf527d97240d0d..462577a0dbd0fcc1baf17acd9678317cb27503fa 100644 --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm -@@ -525,6 +525,7 @@ void PostAnnouncementNotification(NSString* announcement) { +@@ -525,6 +525,7 @@ NSDictionary* BrowserAccessibilityManagerMac:: [user_info setObject:native_focus_object forKey:NSAccessibilityTextChangeElement]; @@ -329,7 +329,7 @@ index 83d0106f0f237dea75dfafe011bf527d97240d0d..462577a0dbd0fcc1baf17acd9678317c id selected_text = [native_focus_object selectedTextMarkerRange]; if (selected_text) { NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute = -@@ -532,6 +533,7 @@ void PostAnnouncementNotification(NSString* announcement) { +@@ -532,6 +533,7 @@ NSDictionary* BrowserAccessibilityManagerMac:: [user_info setObject:selected_text forKey:NSAccessibilitySelectedTextMarkerRangeAttribute]; } @@ -353,7 +353,7 @@ index 28ca1646af0b0cce40d27baec71cbe65adc334fa..bae65c1f485bc02eb9ef2ebf7018af4a namespace content { -@@ -22,6 +24,7 @@ +@@ -22,6 +24,7 @@ namespace { // verifies there are no existing open connections), and then indicates that // Chrome should continue execution without access to launchservicesd. void DisableSystemServices() { @@ -381,7 +381,7 @@ index b29b68be6fa6b0329ed03c2d9011690c5e6f83c5..3a8aca70701534d19cdf1655da188114 extern "C" { // Undocumented IOBluetooth Preference API [1]. Used by `blueutil` [2] and // `Karabiner` [3] to programmatically control the Bluetooth state. Calling the -@@ -49,6 +50,7 @@ +@@ -49,6 +50,7 @@ extern "C" { // [4] https://support.apple.com/kb/PH25091 void IOBluetoothPreferenceSetControllerPowerState(int state); } @@ -389,7 +389,7 @@ index b29b68be6fa6b0329ed03c2d9011690c5e6f83c5..3a8aca70701534d19cdf1655da188114 namespace { -@@ -118,8 +120,10 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) { +@@ -118,8 +120,10 @@ BluetoothAdapterMac::BluetoothAdapterMac() controller_state_function_( base::BindRepeating(&BluetoothAdapterMac::GetHostControllerState, base::Unretained(this))), @@ -400,7 +400,7 @@ index b29b68be6fa6b0329ed03c2d9011690c5e6f83c5..3a8aca70701534d19cdf1655da188114 should_update_name_(true), classic_discovery_manager_( BluetoothDiscoveryManagerMac::CreateClassic(this)), -@@ -304,8 +308,12 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) { +@@ -304,8 +308,12 @@ base::WeakPtr BluetoothAdapterMac::GetWeakPtr() { } bool BluetoothAdapterMac::SetPoweredImpl(bool powered) { diff --git a/patches/chromium/render_widget_host_view_mac.patch b/patches/chromium/render_widget_host_view_mac.patch index 0b35c074d3c55..6dea6a0c90a95 100644 --- a/patches/chromium/render_widget_host_view_mac.patch +++ b/patches/chromium/render_widget_host_view_mac.patch @@ -25,7 +25,7 @@ index bd3c6c1724bee8f06544a2aece0ae5e45c145e4d..d84160a3ce7d08e64053b4634f490669 // These are not documented, so use only after checking -respondsToSelector:. @interface NSApplication (UndocumentedSpeechMethods) - (void)speakString:(NSString*)string; -@@ -645,6 +650,9 @@ - (BOOL)acceptsMouseEventsWhenInactive { +@@ -645,6 +650,9 @@ void ExtractUnderlines(NSAttributedString* string, } - (BOOL)acceptsFirstMouse:(NSEvent*)theEvent { @@ -35,7 +35,7 @@ index bd3c6c1724bee8f06544a2aece0ae5e45c145e4d..d84160a3ce7d08e64053b4634f490669 return [self acceptsMouseEventsWhenInactive]; } -@@ -1078,6 +1086,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv { +@@ -1078,6 +1086,10 @@ void ExtractUnderlines(NSAttributedString* string, eventType == NSKeyDown && !(modifierFlags & NSCommandKeyMask); @@ -46,7 +46,7 @@ index bd3c6c1724bee8f06544a2aece0ae5e45c145e4d..d84160a3ce7d08e64053b4634f490669 // We only handle key down events and just simply forward other events. if (eventType != NSKeyDown) { _hostHelper->ForwardKeyboardEvent(event, latency_info); -@@ -1854,9 +1866,11 @@ - (NSAccessibilityRole)accessibilityRole { +@@ -1854,9 +1866,11 @@ void ExtractUnderlines(NSAttributedString* string, // Since this implementation doesn't have to wait any IPC calls, this doesn't // make any key-typing jank. --hbono 7/23/09 // @@ -58,7 +58,7 @@ index bd3c6c1724bee8f06544a2aece0ae5e45c145e4d..d84160a3ce7d08e64053b4634f490669 - (NSArray*)validAttributesForMarkedText { // This code is just copied from WebKit except renaming variables. -@@ -1865,7 +1879,10 @@ - (NSArray*)validAttributesForMarkedText { +@@ -1865,7 +1879,10 @@ extern NSString* NSTextInputReplacementRangeAttributeName; initWithObjects:NSUnderlineStyleAttributeName, NSUnderlineColorAttributeName, NSMarkedClauseSegmentAttributeName, diff --git a/patches/chromium/webview_cross_drag.patch b/patches/chromium/webview_cross_drag.patch index 737fdcc0e413f..94843102d181e 100644 --- a/patches/chromium/webview_cross_drag.patch +++ b/patches/chromium/webview_cross_drag.patch @@ -26,7 +26,7 @@ diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser index a964f38b830f62bf694646033e1c24e0cf4557c5..61e69fdebaca038d09b5ebab71fd20e2e13188f0 100644 --- a/content/browser/web_contents/web_drag_dest_mac.mm +++ b/content/browser/web_contents/web_drag_dest_mac.mm -@@ -384,9 +384,7 @@ - (void)setDragStartTrackersForProcess:(int)processID { +@@ -384,9 +384,7 @@ void DropCompletionCallback( } - (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH { From 96fdd12b5c568d55fc9c9bccab020ca822a7b41a Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Tue, 30 Jun 2020 13:08:07 -0700 Subject: [PATCH 33/79] Convert raw NonClientFrameViews to unique_ptrs https://chromium-review.googlesource.com/c/chromium/src/+/2240417 --- shell/browser/native_window_views.cc | 10 +++++----- shell/browser/native_window_views.h | 2 +- shell/browser/ui/views/electron_views_delegate.cc | 4 ++-- shell/browser/ui/views/electron_views_delegate.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc index 9c8fbd92c93bf..fd98a95ee79a5 100644 --- a/shell/browser/native_window_views.cc +++ b/shell/browser/native_window_views.cc @@ -1415,17 +1415,17 @@ views::ClientView* NativeWindowViews::CreateClientView(views::Widget* widget) { return new NativeWindowClientView(widget, root_view_.get(), this); } -views::NonClientFrameView* NativeWindowViews::CreateNonClientFrameView( - views::Widget* widget) { +std::unique_ptr +NativeWindowViews::CreateNonClientFrameView(views::Widget* widget) { #if defined(OS_WIN) - WinFrameView* frame_view = new WinFrameView; + auto frame_view = std::make_unique(); frame_view->Init(this, widget); return frame_view; #else if (has_frame()) { - return new NativeFrameView(this, widget); + return std::make_unique(this, widget); } else { - FramelessView* frame_view = new FramelessView; + auto frame_view = std::make_unique(); frame_view->Init(this, widget); return frame_view; } diff --git a/shell/browser/native_window_views.h b/shell/browser/native_window_views.h index a330bed8e143d..59a7ae76bb549 100644 --- a/shell/browser/native_window_views.h +++ b/shell/browser/native_window_views.h @@ -184,7 +184,7 @@ class NativeWindowViews : public NativeWindow, gfx::NativeView child, const gfx::Point& location) override; views::ClientView* CreateClientView(views::Widget* widget) override; - views::NonClientFrameView* CreateNonClientFrameView( + std::unique_ptr CreateNonClientFrameView( views::Widget* widget) override; void OnWidgetMove() override; #if defined(OS_WIN) diff --git a/shell/browser/ui/views/electron_views_delegate.cc b/shell/browser/ui/views/electron_views_delegate.cc index e21023f1b3c32..bdc206f7d40c0 100644 --- a/shell/browser/ui/views/electron_views_delegate.cc +++ b/shell/browser/ui/views/electron_views_delegate.cc @@ -59,8 +59,8 @@ gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const { } #endif -views::NonClientFrameView* ViewsDelegate::CreateDefaultNonClientFrameView( - views::Widget* widget) { +std::unique_ptr +ViewsDelegate::CreateDefaultNonClientFrameView(views::Widget* widget) { return nullptr; } diff --git a/shell/browser/ui/views/electron_views_delegate.h b/shell/browser/ui/views/electron_views_delegate.h index 8ed463e38a12c..d19bbf252a31d 100644 --- a/shell/browser/ui/views/electron_views_delegate.h +++ b/shell/browser/ui/views/electron_views_delegate.h @@ -43,7 +43,7 @@ class ViewsDelegate : public views::ViewsDelegate { #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) gfx::ImageSkia* GetDefaultWindowIcon() const override; #endif - views::NonClientFrameView* CreateDefaultNonClientFrameView( + std::unique_ptr CreateDefaultNonClientFrameView( views::Widget* widget) override; void AddRef() override; void ReleaseRef() override; From 64f236317126b851f818d8fc075bd951a532616b Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Tue, 30 Jun 2020 14:40:58 -0700 Subject: [PATCH 34/79] [printing] Move PrintHostMsg_DidPreviewDocument_Params to print.mojom https://chromium-review.googlesource.com/c/chromium/src/+/2257035 --- .../printing/print_preview_message_handler.cc | 24 +++++++++---------- .../printing/print_preview_message_handler.h | 5 ++-- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/shell/browser/printing/print_preview_message_handler.cc b/shell/browser/printing/print_preview_message_handler.cc index 8f20b51a4adf0..a756bdd021350 100644 --- a/shell/browser/printing/print_preview_message_handler.cc +++ b/shell/browser/printing/print_preview_message_handler.cc @@ -74,14 +74,14 @@ bool PrintPreviewMessageHandler::OnMessageReceived( void PrintPreviewMessageHandler::OnMetafileReadyForPrinting( content::RenderFrameHost* render_frame_host, - const PrintHostMsg_DidPreviewDocument_Params& params, + const printing::mojom::DidPreviewDocumentParams& params, const PrintHostMsg_PreviewIds& ids) { // Always try to stop the worker. StopWorker(params.document_cookie); - const printing::mojom::DidPrintContentParams& content = params.content; - if (!content.metafile_data_region.IsValid() || - params.expected_pages_count <= 0) { + const base::ReadOnlySharedMemoryRegion& metafile = + params.content->metafile_data_region; + if (!metafile.IsValid() || params.expected_pages_count <= 0) { RejectPromise(ids.request_id); return; } @@ -91,23 +91,23 @@ void PrintPreviewMessageHandler::OnMetafileReadyForPrinting( printing::PrintCompositeClient::FromWebContents(web_contents()); DCHECK(client); - auto callback = - base::BindOnce(&PrintPreviewMessageHandler::OnCompositePdfDocumentDone, - weak_ptr_factory_.GetWeakPtr(), ids); + auto callback = base::BindOnce( + &PrintPreviewMessageHandler::OnCompositeDocumentToPdfDone, + weak_ptr_factory_.GetWeakPtr(), ids); client->DoCompositeDocumentToPdf( - params.document_cookie, render_frame_host, content, + params.document_cookie, render_frame_host, *(params.content), mojo::WrapCallbackWithDefaultInvokeIfNotRun( std::move(callback), printing::mojom::PrintCompositor::Status::kCompositingFailure, base::ReadOnlySharedMemoryRegion())); } else { - ResolvePromise(ids.request_id, - base::RefCountedSharedMemoryMapping::CreateFromWholeRegion( - content.metafile_data_region)); + ResolvePromise( + ids.request_id, + base::RefCountedSharedMemoryMapping::CreateFromWholeRegion(metafile)); } } -void PrintPreviewMessageHandler::OnCompositePdfDocumentDone( +void PrintPreviewMessageHandler::OnCompositeDocumentToPdfDone( const PrintHostMsg_PreviewIds& ids, printing::mojom::PrintCompositor::Status status, base::ReadOnlySharedMemoryRegion region) { diff --git a/shell/browser/printing/print_preview_message_handler.h b/shell/browser/printing/print_preview_message_handler.h index e30f01e4852b2..d0305438afc48 100644 --- a/shell/browser/printing/print_preview_message_handler.h +++ b/shell/browser/printing/print_preview_message_handler.h @@ -18,7 +18,6 @@ #include "shell/common/gin_helper/promise.h" #include "v8/include/v8.h" -struct PrintHostMsg_DidPreviewDocument_Params; struct PrintHostMsg_PreviewIds; namespace content { @@ -50,9 +49,9 @@ class PrintPreviewMessageHandler void OnMetafileReadyForPrinting( content::RenderFrameHost* render_frame_host, - const PrintHostMsg_DidPreviewDocument_Params& params, + const printing::mojom::DidPreviewDocumentParams& params, const PrintHostMsg_PreviewIds& ids); - void OnCompositePdfDocumentDone( + void OnCompositeDocumentToPdfDone( const PrintHostMsg_PreviewIds& ids, printing::mojom::PrintCompositor::Status status, base::ReadOnlySharedMemoryRegion region); From d0bf5c5bfd551a78ca7a031c122d36e9b3f2503b Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Wed, 1 Jul 2020 06:01:08 -0700 Subject: [PATCH 35/79] chore: bump chromium in DEPS to 12c233c2a85bfa28fb279f390121ba681e52a71b --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 18820e211fc45..4992b3920d4b8 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - '60a9883e35db3f6f91916f0878e88e1849c17b11', + '12c233c2a85bfa28fb279f390121ba681e52a71b', 'node_version': 'v12.18.1', 'nan_version': From a1d31f76c55c861e790d064e5d3bce1b6e9f1dbc Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 1 Jul 2020 20:04:35 -0700 Subject: [PATCH 36/79] chore: update patches --- .../add_didinstallconditionalfeatures.patch | 6 ++--- patches/chromium/blink_local_frame.patch | 2 +- patches/chromium/can_create_window.patch | 22 +++++++++---------- ...esources_not_chrome_for_spellchecker.patch | 2 +- patches/chromium/dcheck.patch | 2 +- .../disable_compositor_recycling.patch | 2 +- patches/chromium/disable_hidden.patch | 2 +- ...screen_rendering_with_viz_compositor.patch | 8 +++---- ...ns_through_the_web_contents_delegate.patch | 2 +- patches/chromium/frame_host_manager.patch | 8 +++---- ...gpu_notify_when_dxdiag_request_fails.patch | 8 +++---- .../mas_disable_remote_accessibility.patch | 2 +- patches/chromium/no_cache_storage_check.patch | 2 +- .../chromium/notification_provenance.patch | 2 +- patches/chromium/printing.patch | 2 +- ...r_changes_to_the_webcontentsobserver.patch | 12 +++++----- patches/chromium/resource_file_conflict.patch | 2 +- ...ove_contentrendererclient_shouldfork.patch | 4 ++-- patches/chromium/web_contents.patch | 4 ++-- .../worker_context_will_destroy.patch | 12 +++++----- patches/v8/build_gn.patch | 8 +++---- patches/v8/dcheck.patch | 2 +- ...export_private_v8_symbols_on_windows.patch | 8 +++---- patches/v8/expose_mksnapshot.patch | 4 ++-- 24 files changed, 64 insertions(+), 64 deletions(-) diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index 7654121d9c84f..1cd64c5f51476 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -23,10 +23,10 @@ index 4e195f960d7b9bf50f6784ce380a84a10867914f..dbf85ffe8504bdbab1c4c29f085e5307 int32_t world_id) {} virtual void DidClearWindowObject() {} diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 867931dc881798fe52d74e1d7a9b78815da78a69..213d1df1c12f7f5109440e9c775476856ce29f5f 100644 +index 9a2dcfcd552a1e8caab8f720d559dbc7a2867b7d..7a33f8a3baa6fc2e6a11490c23ec778556b59719 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4711,6 +4711,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, +@@ -4716,6 +4716,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, observer.DidCreateScriptContext(context, world_id); } @@ -40,7 +40,7 @@ index 867931dc881798fe52d74e1d7a9b78815da78a69..213d1df1c12f7f5109440e9c77547685 int world_id) { for (auto& observer : observers_) diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h -index ad6d3cc15e2f5aed7bfa412b8486e4476b9d2bd8..642edda7d9ca1841824dcac5baa1ea73a5dc1ebf 100644 +index 78365c699b6ebd94a33c3cd59bcecd00de71739c..49ec071f8aab732aa9dd28271adf8ccb9920d8e1 100644 --- a/content/renderer/render_frame_impl.h +++ b/content/renderer/render_frame_impl.h @@ -714,6 +714,8 @@ class CONTENT_EXPORT RenderFrameImpl diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch index 8f9133fdc637f..22941b4489562 100644 --- a/patches/chromium/blink_local_frame.patch +++ b/patches/chromium/blink_local_frame.patch @@ -14,7 +14,7 @@ when there is code doing that. This patch reverts the change to fix the crash in Electron. diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc -index 6c0f6573dade902086a8a0e5f7fd82e41cf1a692..444e3b26f868f090936dadb3ad6996b3addfdced 100644 +index 1387c4da8f43b76885c94c40c1147e6632d0f363..47d2ab71160645996b048fadc7058a2338e953f7 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc @@ -539,10 +539,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index c519cd8b7a90a..2b630656c6fde 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -9,10 +9,10 @@ potentially prevent a window from being created. TODO(loc): this patch is currently broken. diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc -index 1ff08abe1a0307d777ea9e6e1f5a51ddfe6f35c1..6039b2a52ec406af00264dedbb8a18dc4682d454 100644 +index 2b58ad65bf2d87fcbaf889c32a2d5efa86abff4a..29bc91a5f9fcddf246399afdeafdf307a36ea617 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc -@@ -4787,6 +4787,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -4791,6 +4791,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, @@ -21,10 +21,10 @@ index 1ff08abe1a0307d777ea9e6e1f5a51ddfe6f35c1..6039b2a52ec406af00264dedbb8a18dc &no_javascript_access); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 1afd8ac2c2cf78efa1386b89227e4a5d2ca0ce60..4a576f48e677c7d91726e9c59dd4a24a4d64c792 100644 +index 4f56a70f997e037e4aea33cae97a69655328a249..31398279fbddfdf5d789edee7924ab768a167801 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3087,9 +3087,9 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow( +@@ -3082,9 +3082,9 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow( } if (delegate_) { @@ -38,7 +38,7 @@ index 1afd8ac2c2cf78efa1386b89227e4a5d2ca0ce60..4a576f48e677c7d91726e9c59dd4a24a for (auto& observer : observers_) { diff --git a/content/common/frame.mojom b/content/common/frame.mojom -index 118a262e5e18c22df6a01312b9f99b235d60ae50..329a92f9c0089cf8f94c7cd2fe990204c670419c 100644 +index 3081409cd29a3e42847c4ed18f7bf7b2d095f503..02e615a569db5fe9535c6e3b470699f841679d05 100644 --- a/content/common/frame.mojom +++ b/content/common/frame.mojom @@ -277,6 +277,10 @@ struct CreateNewWindowParams { @@ -158,10 +158,10 @@ index c6a990f873066fec1ac7ce5e088ecd02d2142e71..272b613f658ef4bfa3869cbd17d342ce // 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 1d17a41e553bf4d7181a1dcfac9f9e379b6dffcb..384d7150daaeda547e0085e3031b706784ceb7dd 100644 +index ac490ef585ba1d103a80314d80e84cf8d10ad3b7..9f090d636f5a516607280ddfc71d5630dd16afa2 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 -@@ -399,6 +399,8 @@ bool WebTestContentBrowserClient::CanCreateWindow( +@@ -386,6 +386,8 @@ bool WebTestContentBrowserClient::CanCreateWindow( const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -171,10 +171,10 @@ index 1d17a41e553bf4d7181a1dcfac9f9e379b6dffcb..384d7150daaeda547e0085e3031b7067 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 21f7e0d85006bc35872c237b98a14d9644bb1488..d3fef30d9731e4cc6cfe404003b9b1fa8cea53e1 100644 +index ffa293ef83232521a7751a431116a5efbc6af46a..4000a08bd7ddcc401cf64d8bf3874dd0e6460954 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 -@@ -79,6 +79,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient { +@@ -78,6 +78,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient { const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -206,10 +206,10 @@ index 4f735ad0d97eaac9a57dad137e479f8a7ec33a36..0a3c5821962c85609b64b3625fa6b8d6 } // namespace blink diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc -index 33423ebac5746f13203e9d4aa433bd6b1f6a54f2..c5cd539fbe4239565e7d0506c48999a30e916df3 100644 +index 7cccc33174e66eb40fd87ad3c35248f557e928cb..69147d1b199d4e4e6b3a84bf21c686432ba45cbb 100644 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc -@@ -2002,6 +2002,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, +@@ -1973,6 +1973,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, } WebWindowFeatures window_features = GetWindowFeaturesFromString(features); diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch index dc7773602f42c..2a07ca29a1746 100644 --- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch +++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch @@ -7,7 +7,7 @@ spellchecker uses a few IDS_ resources. We need to load these from Electrons grit header instead of Chromes diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 9629e9474064badb4c5ba1241e395f443c2ccabb..5339b5188dff5a2c9937c62f8da97f3b0a024b81 100644 +index 7b0b898d063b541494fbb2ae2039754dbcf5379d..c67dc35829306e9e73f11cb1b068aa3bf98073b6 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -5531,6 +5531,7 @@ static_library("browser") { diff --git a/patches/chromium/dcheck.patch b/patches/chromium/dcheck.patch index 54c93b8acc37b..16952860ead59 100644 --- a/patches/chromium/dcheck.patch +++ b/patches/chromium/dcheck.patch @@ -17,7 +17,7 @@ only one or two specific checks fail. Then it's better to simply comment out the failing checks and allow the rest of the target to have them enabled. diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc -index ab8a6971a5214880ba2132b341dc19f2f61403e8..7e99dadf4853ac1baabde3f208be49895c2879ad 100644 +index cc12496fa0110adb06fb65b9d8afc4829f380200..f7ae3f782d6bdf94fba386c0d05f57f8364dba19 100644 --- a/content/browser/frame_host/navigation_controller_impl.cc +++ b/content/browser/frame_host/navigation_controller_impl.cc @@ -1267,8 +1267,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation( diff --git a/patches/chromium/disable_compositor_recycling.patch b/patches/chromium/disable_compositor_recycling.patch index 8da0db349933b..39536e69cffd3 100644 --- a/patches/chromium/disable_compositor_recycling.patch +++ b/patches/chromium/disable_compositor_recycling.patch @@ -6,7 +6,7 @@ Subject: fix: disabling compositor recycling Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron. 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 d240fa425224d2917f523b866921d4ae5950a4d3..eb8e76d86cb8293fe2ec75f42f20df41d8795f2c 100644 +index a595a18a7f5805bcfee9c2ffad1bf37411ea8d38..97be5122d2df9c8b95f3c59907528dde1d3003a6 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -478,7 +478,11 @@ void RenderWidgetHostViewMac::WasOccluded() { diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch index bbd991168eed2..199842a1998d8 100644 --- a/patches/chromium/disable_hidden.patch +++ b/patches/chromium/disable_hidden.patch @@ -6,7 +6,7 @@ Subject: disable_hidden.patch Electron uses this to disable background throttling for hidden windows. diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc -index 1bce7961d24d29cf8d14c8f7646e88e5f9d72ee6..bf6baff690af930acf19c2a544c8f00ab492bb8e 100644 +index 23bdec473c0a7f8e487b104034e46545c7462784..44db58950f9c334aaea8a8fb1b076a53bbb53c97 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -667,6 +667,9 @@ void RenderWidgetHostImpl::WasHidden() { diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch index 147b27646aae0..3a6a68ed9a080 100644 --- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch +++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch @@ -107,10 +107,10 @@ index 0979770409131aed4bea76d33b2748c01dde9541..d256ec42bb2154628de7d8d08cc8cf4b "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 da8936a87cfe156a90952c1ca79d9faf6ef2cd1f..6fd321aaf610ee985868af62b0e856f19e8be264 100644 +index 08dc8bd190b1506b9ec1c8ae39bf3ee56a1203e2..5361890756fa39b825da4698725ce221e0ca2a26 100644 --- a/components/viz/service/display_embedder/output_surface_provider_impl.cc +++ b/components/viz/service/display_embedder/output_surface_provider_impl.cc -@@ -21,6 +21,7 @@ +@@ -22,6 +22,7 @@ #include "components/viz/service/display_embedder/server_shared_bitmap_manager.h" #include "components/viz/service/display_embedder/skia_output_surface_dependency_impl.h" #include "components/viz/service/display_embedder/skia_output_surface_impl.h" @@ -118,7 +118,7 @@ index da8936a87cfe156a90952c1ca79d9faf6ef2cd1f..6fd321aaf610ee985868af62b0e856f1 #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" -@@ -34,6 +35,7 @@ +@@ -35,6 +36,7 @@ #include "gpu/ipc/scheduler_sequence.h" #include "gpu/ipc/service/gpu_channel_manager_delegate.h" #include "gpu/ipc/service/image_transport_surface.h" @@ -126,7 +126,7 @@ index da8936a87cfe156a90952c1ca79d9faf6ef2cd1f..6fd321aaf610ee985868af62b0e856f1 #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_context.h" #include "ui/gl/init/gl_factory.h" -@@ -223,6 +225,22 @@ OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform( +@@ -224,6 +226,22 @@ OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform( if (headless_) return std::make_unique(); diff --git a/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch b/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch index f50bc63a05586..3330078adadc9 100644 --- a/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch +++ b/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch @@ -13,7 +13,7 @@ This patch can be removed once app.allowRendererProcessReuse is forced to true as then Chromiums assumptions around processes become correct. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 4a576f48e677c7d91726e9c59dd4a24a4d64c792..ee336b57fa13ec611b4591cb8147ec8f29f162e2 100644 +index 31398279fbddfdf5d789edee7924ab768a167801..14a6c451bf20ce47ce309365eebbf1360aa417d3 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -2492,11 +2492,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) { diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index 335f02b8ebdd2..89470914124b3 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -42,10 +42,10 @@ index 6b03c07316eaab83a50afc123fc9f17b1c1dfa3b..e821571731e4e1a93f873477c7410de7 // another SiteInstance for the same site. void RegisterSiteInstance(SiteInstanceImpl* site_instance); diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc -index e148adae878dcf8b5f3bed031117d80ad9bc64de..5009db56748489e25c9e687b8e876821b4c85d8f 100644 +index f279669b0ef94c178ac6950748ddeb551a5c41e0..92926d8cb46f1643881b92b8b027811f38b923de 100644 --- a/content/browser/frame_host/navigation_request.cc +++ b/content/browser/frame_host/navigation_request.cc -@@ -1410,6 +1410,21 @@ void NavigationRequest::BeginNavigation() { +@@ -1415,6 +1415,21 @@ void NavigationRequest::BeginNavigation() { // it immediately. EnterChildTraceEvent("ResponseStarted", this); @@ -67,7 +67,7 @@ index e148adae878dcf8b5f3bed031117d80ad9bc64de..5009db56748489e25c9e687b8e876821 // Select an appropriate RenderFrameHost. render_frame_host_ = frame_tree_node_->render_manager()->GetFrameHostForNavigation(this); -@@ -4795,6 +4810,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { +@@ -4823,6 +4838,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { {WILL_START_REQUEST, { WILL_REDIRECT_REQUEST, WILL_PROCESS_RESPONSE, @@ -75,7 +75,7 @@ index e148adae878dcf8b5f3bed031117d80ad9bc64de..5009db56748489e25c9e687b8e876821 READY_TO_COMMIT, DID_COMMIT, CANCELING, -@@ -4808,10 +4824,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { +@@ -4836,10 +4852,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { WILL_FAIL_REQUEST, }}, {WILL_PROCESS_RESPONSE, { diff --git a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch index a616a03a85d6c..f704344a4c551 100644 --- a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch +++ b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch @@ -12,7 +12,7 @@ rendering and there is no signal from browser process on this event to identify it. diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc -index 0f73a8d0da336036e663927424a3a0ccba9e4f7b..e2fe4908e8e459bb277dfd6becdc486714e814ea 100644 +index 919ccd3f86aaecc841182de67ed94cab1008ae3d..cd9a0c9d1842daf1536b88e9d10c447ceb463d3c 100644 --- a/content/browser/gpu/gpu_data_manager_impl.cc +++ b/content/browser/gpu/gpu_data_manager_impl.cc @@ -188,6 +188,11 @@ void GpuDataManagerImpl::TerminateInfoCollectionGpuProcess() { @@ -28,7 +28,7 @@ index 0f73a8d0da336036e663927424a3a0ccba9e4f7b..e2fe4908e8e459bb277dfd6becdc4867 void GpuDataManagerImpl::UpdateGpuFeatureInfo( diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h -index 2e069f00bb0f2c263b60662988548b246b74e5d9..82e9a19b6502aeab8f5d14098f2e5c5f995c3425 100644 +index 8af48d23b020779c1714fc7ca70966e8d33f7252..5dfa29db15467f8fc55f86a2a225380c70d4aaab 100644 --- a/content/browser/gpu/gpu_data_manager_impl.h +++ b/content/browser/gpu/gpu_data_manager_impl.h @@ -95,6 +95,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDataManager, @@ -40,7 +40,7 @@ index 2e069f00bb0f2c263b60662988548b246b74e5d9..82e9a19b6502aeab8f5d14098f2e5c5f // Update the GPU feature info. This updates the blacklist and enabled status // of GPU rasterization. In the future this will be used for more features. diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc -index 54a2d002794e3cf3c40799e437456dd37df51503..777dcd996ff2a9584824e527b7b371da7878d14b 100644 +index dd4a3e4ab502005fdd7216e45ec109c1a3311536..67db08d1dda0fd0f00b25a20ce167d0eaaec504d 100644 --- a/content/browser/gpu/gpu_data_manager_impl_private.cc +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc @@ -1063,6 +1063,10 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() { @@ -55,7 +55,7 @@ index 54a2d002794e3cf3c40799e437456dd37df51503..777dcd996ff2a9584824e527b7b371da void GpuDataManagerImplPrivate::UpdateGpuFeatureInfo( diff --git a/content/browser/gpu/gpu_data_manager_impl_private.h b/content/browser/gpu/gpu_data_manager_impl_private.h -index ef74bd7541a2a47e71289b154221a5f5adf1e90b..100d393550d57c24bb0c9dc6d604ed925930bb07 100644 +index 7afb818da963271751f6ff7d876505c739ec3fae..7453817e192e01b06b8680a2209bc5c8794bb959 100644 --- a/content/browser/gpu/gpu_data_manager_impl_private.h +++ b/content/browser/gpu/gpu_data_manager_impl_private.h @@ -75,6 +75,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { diff --git a/patches/chromium/mas_disable_remote_accessibility.patch b/patches/chromium/mas_disable_remote_accessibility.patch index b1c4fd7403d48..eaee6a03dc313 100644 --- a/patches/chromium/mas_disable_remote_accessibility.patch +++ b/patches/chromium/mas_disable_remote_accessibility.patch @@ -117,7 +117,7 @@ index d5610b3ff1a834b16115647c3530618887f2155b..2643eda13762d5605f42ce7c98133bf6 // Used to force the NSApplication's focused accessibility element to be the // content::BrowserAccessibilityCocoa accessibility tree when the NSView for 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 eb75e4d47204118c963110c549835941776f5110..d240fa425224d2917f523b866921d4ae5950a4d3 100644 +index ef9d62e3031eddf3c346075a000c014665ddb1b0..a595a18a7f5805bcfee9c2ffad1bf37411ea8d38 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -233,8 +233,10 @@ RenderWidgetHostViewMac::~RenderWidgetHostViewMac() { diff --git a/patches/chromium/no_cache_storage_check.patch b/patches/chromium/no_cache_storage_check.patch index da7b418a381cc..964beaff4f5d7 100644 --- a/patches/chromium/no_cache_storage_check.patch +++ b/patches/chromium/no_cache_storage_check.patch @@ -7,7 +7,7 @@ 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 5b63f7eeb757b0aa3f5fdff58e251be296b7ec57..e76dab5e4a5860edb33883351a8151cea2158598 100644 +index 9a8a69324bb7cfe30452fba859e501f8d5a11556..0d66b53850d5fefdb169b3d081cdd67a13131baa 100644 --- a/content/browser/cache_storage/legacy/legacy_cache_storage.cc +++ b/content/browser/cache_storage/legacy/legacy_cache_storage.cc @@ -106,7 +106,7 @@ class LegacyCacheStorage::CacheLoader { diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch index a2291a5e7569d..26b7279d6f477 100644 --- a/patches/chromium/notification_provenance.patch +++ b/patches/chromium/notification_provenance.patch @@ -68,7 +68,7 @@ index a3deeb43eb353601fcee39f51bd0d2cd093628e2..2ba734593ab72ac4d3f43cee1c8a5e59 notification_service_remote_.BindNewPipeAndPassReceiver()); diff --git a/content/browser/notifications/platform_notification_context_impl.cc b/content/browser/notifications/platform_notification_context_impl.cc -index d221f2747086452c59474f17211adbfeec5a58b0..feee9f0b5f783cb4fbc60d3c29bddfaf5b4b6c46 100644 +index c2a9815e86ce8d9c1fc06866460e546678695d3d..6e32fa7d76d970e670331259301cc9cdaa201d33 100644 --- a/content/browser/notifications/platform_notification_context_impl.cc +++ b/content/browser/notifications/platform_notification_context_impl.cc @@ -208,12 +208,13 @@ void PlatformNotificationContextImpl::Shutdown() { diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch index 0c85a369b1c53..270866f20256d 100644 --- a/patches/chromium/printing.patch +++ b/patches/chromium/printing.patch @@ -31,7 +31,7 @@ index 668a14bff461e83b2c6d9d7f23d9674ff081ef12..674f141e80c0316fd47558c4d428a970 using RenderMode = PdfRenderSettings::Mode; RenderMode mode; diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc -index 52efa2037a31f84a261502107bfebc69ae5a419e..4834e92ae99f12043e5ce476370f64345ad29001 100644 +index bee0596550b52abd3fe233f779247256d4ad5123..43542c1a910830b0d610c27f269add66eda71527 100644 --- a/chrome/browser/printing/print_job_worker.cc +++ b/chrome/browser/printing/print_job_worker.cc @@ -20,7 +20,6 @@ diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch index 5ca196e86f01a..c67d34a54bed0 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -8,7 +8,7 @@ Chrome moved the SetCursor IPC message to mojo, which we use to tell OSR about ` Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2172779 diff --git a/content/browser/renderer_host/render_widget_host_delegate.h b/content/browser/renderer_host/render_widget_host_delegate.h -index 2cf28550517cd4df7bd8a0cf8d954169acce5955..0c1358cc6ffb149ac640525a4e9383744b6e1ae8 100644 +index 1feca3a3d2d13278a8c11038177caa661cbab22c..1ca75dc4b5228077f6658919b36004bcac4103a5 100644 --- a/content/browser/renderer_host/render_widget_host_delegate.h +++ b/content/browser/renderer_host/render_widget_host_delegate.h @@ -15,6 +15,7 @@ @@ -30,10 +30,10 @@ index 2cf28550517cd4df7bd8a0cf8d954169acce5955..0c1358cc6ffb149ac640525a4e938374 // RenderWidgetHost on the main frame, and false otherwise. virtual bool IsWidgetForMainFrame(RenderWidgetHostImpl*); diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc -index bf6baff690af930acf19c2a544c8f00ab492bb8e..8d205a1b052c6d670c0c2e38852734c5320f62a8 100644 +index 44db58950f9c334aaea8a8fb1b076a53bbb53c97..74dcc48deeeaccf3b0e10fed894d29b322e40004 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc -@@ -1666,6 +1666,8 @@ void RenderWidgetHostImpl::SetCursor(const WebCursor& cursor) { +@@ -1665,6 +1665,8 @@ void RenderWidgetHostImpl::SetCursor(const WebCursor& cursor) { if (!view_) return; view_->UpdateCursor(cursor); @@ -43,10 +43,10 @@ index bf6baff690af930acf19c2a544c8f00ab492bb8e..8d205a1b052c6d670c0c2e38852734c5 void RenderWidgetHostImpl::OnCursorVisibilityStateChanged(bool is_visible) { diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index b08fdaca5d59deb48d83b50d917c80908a2fa02f..e858b2fca4bb8fce0cf6dcb148c979ed96afdc7a 100644 +index 463503eaa057846790b1d9121ca7344cda44855c..d7fa11b23ab9ead3dd26b53a7ae865d6e35bfe44 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3588,6 +3588,11 @@ bool WebContentsImpl::OnUpdateDragCursor() { +@@ -3583,6 +3583,11 @@ bool WebContentsImpl::OnUpdateDragCursor() { browser_plugin_embedder_->OnUpdateDragCursor(); } @@ -59,7 +59,7 @@ index b08fdaca5d59deb48d83b50d917c80908a2fa02f..e858b2fca4bb8fce0cf6dcb148c979ed RenderWidgetHostImpl* render_widget_host) { return render_widget_host == GetMainFrame()->GetRenderWidgetHost(); diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h -index 353addcc1e7646e7ddc14a8d253d622ced94f34d..b62b7aafc2dcfa281cf82b9d8088b053db425417 100644 +index 6b36736a15d912941f55baf50eb493fdb2208169..c3552125187115bdfe9a98e24c6049930d21056f 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h @@ -920,6 +920,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch index fa4acdf357a7f..9540b97c96c8b 100644 --- a/patches/chromium/resource_file_conflict.patch +++ b/patches/chromium/resource_file_conflict.patch @@ -52,7 +52,7 @@ 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 e46e760affe12a9c2d479fcd0c987a74433c23a4..44b1a8b8debc327eae170410daa82a62c83ac078 100644 +index 5b308b31b4e9e31c2c56264368218dec18e8e72f..201959fb57f87bdf3bd17d19281a358341f1a544 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -1389,7 +1389,7 @@ if (is_chrome_branded && !is_android) { diff --git a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch index b53fa48f1ac04..95fc36f6067c6 100644 --- a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch +++ b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch @@ -92,10 +92,10 @@ index d57edc0cea54b9d78700c3b9acdcfcc5f17341dd..e56aae188d7d8f46a4438b8e99f7e9b7 // |url|. If the function returns a valid |new_url|, the request must be // updated to use it. The |force_ignore_site_for_cookies| output parameter diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 213d1df1c12f7f5109440e9c775476856ce29f5f..3b122da72652145eb04b22d18c46c600c9f7a949 100644 +index 7a33f8a3baa6fc2e6a11490c23ec778556b59719..2f65b8cfbf479842c0671675e5e05586e92f0d0c 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -5454,6 +5454,23 @@ void RenderFrameImpl::BeginNavigation( +@@ -5459,6 +5459,23 @@ void RenderFrameImpl::BeginNavigation( // we can do a per-frame check here rather than a process-wide check. bool should_fork = HasWebUIScheme(url) || HasWebUIScheme(old_url) || (enabled_bindings_ & kWebUIBindingsPolicyMask); diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch index 63246321f840a..4cae86da2f42f 100644 --- a/patches/chromium/web_contents.patch +++ b/patches/chromium/web_contents.patch @@ -9,7 +9,7 @@ is needed for OSR. Originally landed in https://github.com/electron/libchromiumcontent/pull/226. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index ee336b57fa13ec611b4591cb8147ec8f29f162e2..b08fdaca5d59deb48d83b50d917c80908a2fa02f 100644 +index 14a6c451bf20ce47ce309365eebbf1360aa417d3..463503eaa057846790b1d9121ca7344cda44855c 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -2225,6 +2225,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -34,7 +34,7 @@ index ee336b57fa13ec611b4591cb8147ec8f29f162e2..b08fdaca5d59deb48d83b50d917c8090 CHECK(view_.get()); diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h -index 40b5d17d9c73370bc128f5305aaf6ed6711d338a..f2bef5bd135825639201a88c98b68c044618473c 100644 +index 059ceced6c63ed1a91d8afc7cd6d7a95e07c2467..1ad9b01e67c0210c4c1f054a136b3cc72585b627 100644 --- a/content/public/browser/web_contents.h +++ b/content/public/browser/web_contents.h @@ -82,8 +82,11 @@ class BrowserContext; diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch index 6821e2c15072a..5fcc5cf6bf529 100644 --- a/patches/chromium/worker_context_will_destroy.patch +++ b/patches/chromium/worker_context_will_destroy.patch @@ -26,10 +26,10 @@ index f6d2f50e8d6b4a5df796f2d4478ccd3048101532..d57edc0cea54b9d78700c3b9acdcfcc5 // 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 5fdbf2ad77b331b5593a3592429d389ee4577713..b8958eb6478f3b34fe14a3b977190943fad83b71 100644 +index d6ca67dfd5e41a0c0b7744fae9ba505bb0c8bc19..d1e60e62e22b545c6fcb7b23740553e943be6a6f 100644 --- a/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc -@@ -854,6 +854,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { +@@ -864,6 +864,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread(); } @@ -43,10 +43,10 @@ index 5fdbf2ad77b331b5593a3592429d389ee4577713..b8958eb6478f3b34fe14a3b977190943 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 df25b9f5da050cc9a040bf462353a4729c4b03c6..df4ffe4e2781c359b53bf533b285f36f840d8611 100644 +index abffee3fcfa09275b24480da78b6f8fdfd5fda34..f793fcedce766171c6ac300f055d643711f8191e 100644 --- a/content/renderer/renderer_blink_platform_impl.h +++ b/content/renderer/renderer_blink_platform_impl.h -@@ -184,6 +184,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { +@@ -189,6 +189,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { void DidStartWorkerThread() override; void WillStopWorkerThread() override; void WorkerContextCreated(const v8::Local& worker) override; @@ -55,10 +55,10 @@ index df25b9f5da050cc9a040bf462353a4729c4b03c6..df4ffe4e2781c359b53bf533b285f36f const blink::WebString& header_name) override; diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h -index 2af136afcbd54c2fb74f02f066e0353ea078231a..904ed2f459b5fb6b8fffb6e9c67d5cbf280ec10b 100644 +index a2646329bf28c065c9910efbe5a3309d8a5d8e37..c79bcf9a04d7a0ce16a14ea0440067b4d0402c96 100644 --- a/third_party/blink/public/platform/platform.h +++ b/third_party/blink/public/platform/platform.h -@@ -610,6 +610,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -623,6 +623,7 @@ class BLINK_PLATFORM_EXPORT Platform { virtual void DidStartWorkerThread() {} virtual void WillStopWorkerThread() {} virtual void WorkerContextCreated(const v8::Local& worker) {} diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch index 573613512e367..82f16bbcaf63e 100644 --- a/patches/v8/build_gn.patch +++ b/patches/v8/build_gn.patch @@ -9,10 +9,10 @@ necessary for native modules to load. Also, some fixes relating to mksnapshot on ARM. diff --git a/BUILD.gn b/BUILD.gn -index 501639d810ac1716c9aee9dad472b915cb8259e6..f1106c9750daf3ba05b5b6f3b166254fe04818de 100644 +index 0ea6af76af13602574cada45cfab2b31ae2a3855..cef1d174350237db722010a2d117a4a1fbeafc22 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -355,7 +355,7 @@ config("internal_config") { +@@ -368,7 +368,7 @@ config("internal_config") { ":v8_header_features", ] @@ -21,7 +21,7 @@ index 501639d810ac1716c9aee9dad472b915cb8259e6..f1106c9750daf3ba05b5b6f3b166254f defines += [ "BUILDING_V8_SHARED" ] } } -@@ -4316,7 +4316,7 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -4330,7 +4330,7 @@ if (current_toolchain == v8_generator_toolchain) { "src/interpreter/bytecodes.h", ] @@ -30,7 +30,7 @@ index 501639d810ac1716c9aee9dad472b915cb8259e6..f1106c9750daf3ba05b5b6f3b166254f deps = [ ":v8_libbase", -@@ -4349,6 +4349,8 @@ if (current_toolchain == v8_snapshot_toolchain) { +@@ -4363,6 +4363,8 @@ if (current_toolchain == v8_snapshot_toolchain) { configs = [ ":internal_config" ] diff --git a/patches/v8/dcheck.patch b/patches/v8/dcheck.patch index d40b7b06d2bae..eb0b5cc2d50fe 100644 --- a/patches/v8/dcheck.patch +++ b/patches/v8/dcheck.patch @@ -19,7 +19,7 @@ index a39c4e3f10d5079406f469b76a1ea96c8b2831d8..10693ab15c5e21b40144978b37f3aa99 isolate->default_microtask_queue()->PerformCheckpoint(this); } diff --git a/src/heap/heap.cc b/src/heap/heap.cc -index 4d23e084b95c8f8b9f8fcd5e1059390a9d32883d..6326286418ce44869c484a46811b7079cb06f229 100644 +index aa5e3d31ff1bcbef5b4783e540cd33ea539c2d15..5f6c5ad916e19eca9bdd79bda7f9f01aaa6fe44f 100644 --- a/src/heap/heap.cc +++ b/src/heap/heap.cc @@ -5645,9 +5645,9 @@ void Heap::TearDown() { diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch index 9694d6029cc6a..e4c71ee6c6c2a 100644 --- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch +++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch @@ -12,10 +12,10 @@ This patch can be safely removed if, when it is removed, `node.lib` does not contain any standard C++ library exports (e.g. `std::ostringstream`). diff --git a/BUILD.gn b/BUILD.gn -index 10c29f15adba9c28f21ab7625004d44e1711aaac..b5f731d6baaccf3f8a221d0e55e02e03bdd0ec9d 100644 +index 34d28607d8c25a24d5fb63754f40b2959941ffa5..938e0746357f1fff7fd14b1ece053d54f7f6636d 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -355,6 +355,10 @@ config("internal_config") { +@@ -368,6 +368,10 @@ config("internal_config") { ":v8_header_features", ] @@ -27,10 +27,10 @@ index 10c29f15adba9c28f21ab7625004d44e1711aaac..b5f731d6baaccf3f8a221d0e55e02e03 defines += [ "BUILDING_V8_SHARED" ] } diff --git a/src/base/macros.h b/src/base/macros.h -index 4eb652cae559afc28da32dfefc04939f68509cd3..ab2b08d1504245982c2114f0096011c332b0092f 100644 +index 5dd52b18ae3be6e48439c314e55ea5d913296968..6a02b4e6e3522024f7995bd3b2c7171826c128e7 100644 --- a/src/base/macros.h +++ b/src/base/macros.h -@@ -389,13 +389,17 @@ bool is_inbounds(float_t v) { +@@ -396,13 +396,17 @@ bool is_inbounds(float_t v) { #ifdef V8_OS_WIN // Setup for Windows shared library export. diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch index a719efbd186ca..b0acfba2a65df 100644 --- a/patches/v8/expose_mksnapshot.patch +++ b/patches/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 f1106c9750daf3ba05b5b6f3b166254fe04818de..10c29f15adba9c28f21ab7625004d44e1711aaac 100644 +index cef1d174350237db722010a2d117a4a1fbeafc22..34d28607d8c25a24d5fb63754f40b2959941ffa5 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -4327,7 +4327,6 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -4341,7 +4341,6 @@ if (current_toolchain == v8_generator_toolchain) { if (current_toolchain == v8_snapshot_toolchain) { v8_executable("mksnapshot") { From 64b43f5cc82efd2f4e729a54b13e3db4af007047 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 1 Jul 2020 23:52:50 -0700 Subject: [PATCH 37/79] Removing oppressive language for the directory chrome/browser/apps https://chromium-review.googlesource.com/c/chromium/src/+/2269822 --- .../common/extensions/electron_extensions_client.cc | 12 ++++++------ shell/common/extensions/electron_extensions_client.h | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/shell/common/extensions/electron_extensions_client.cc b/shell/common/extensions/electron_extensions_client.cc index a2957f72debea..4022da837881c 100644 --- a/shell/common/extensions/electron_extensions_client.cc +++ b/shell/common/extensions/electron_extensions_client.cc @@ -97,15 +97,15 @@ void ElectronExtensionsClient::FilterHostPermissions( NOTIMPLEMENTED(); } -void ElectronExtensionsClient::SetScriptingWhitelist( - const ExtensionsClient::ScriptingWhitelist& whitelist) { - scripting_whitelist_ = whitelist; +void ElectronExtensionsClient::SetScriptingAllowlist( + const ExtensionsClient::ScriptingAllowlist& allowlist) { + scripting_allowlist_ = allowlist; } -const ExtensionsClient::ScriptingWhitelist& -ElectronExtensionsClient::GetScriptingWhitelist() const { +const ExtensionsClient::ScriptingAllowlist& +ElectronExtensionsClient::GetScriptingAllowlist() const { // TODO(jamescook): Real whitelist. - return scripting_whitelist_; + return scripting_allowlist_; } extensions::URLPatternSet diff --git a/shell/common/extensions/electron_extensions_client.h b/shell/common/extensions/electron_extensions_client.h index 7ed155e55bbe1..dac734bc89440 100644 --- a/shell/common/extensions/electron_extensions_client.h +++ b/shell/common/extensions/electron_extensions_client.h @@ -26,7 +26,7 @@ namespace electron { // The app_shell implementation of ExtensionsClient. class ElectronExtensionsClient : public extensions::ExtensionsClient { public: - typedef extensions::ExtensionsClient::ScriptingWhitelist ScriptingWhitelist; + using ScriptingAllowlist = extensions::ExtensionsClient::ScriptingAllowlist; ElectronExtensionsClient(); ~ElectronExtensionsClient() override; @@ -41,8 +41,8 @@ class ElectronExtensionsClient : public extensions::ExtensionsClient { const extensions::URLPatternSet& hosts, extensions::URLPatternSet* new_hosts, extensions::PermissionIDSet* permissions) const override; - void SetScriptingWhitelist(const ScriptingWhitelist& whitelist) override; - const ScriptingWhitelist& GetScriptingWhitelist() const override; + void SetScriptingAllowlist(const ScriptingAllowlist& allowlist) override; + const ScriptingAllowlist& GetScriptingAllowlist() const override; extensions::URLPatternSet GetPermittedChromeSchemeHosts( const extensions::Extension* extension, const extensions::APIPermissionSet& api_permissions) const override; @@ -52,7 +52,7 @@ class ElectronExtensionsClient : public extensions::ExtensionsClient { bool IsBlacklistUpdateURL(const GURL& url) const override; private: - ScriptingWhitelist scripting_whitelist_; + ScriptingAllowlist scripting_allowlist_; const GURL webstore_base_url_; const GURL webstore_update_url_; From ed3e1b6ac0a186bb43e6fa74389851552d62f31f Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 1 Jul 2020 23:57:39 -0700 Subject: [PATCH 38/79] Inclusion: rename SpellcheckLanguageBlacklistPolicyHandler https://chromium-review.googlesource.com/c/chromium/src/+/2267646 --- chromium_src/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn index 97087c4924c5c..bba2b6e870fa4 100644 --- a/chromium_src/BUILD.gn +++ b/chromium_src/BUILD.gn @@ -357,8 +357,8 @@ source_set("chrome_spellchecker") { "//chrome/browser/spellchecker/spellcheck_factory.h", "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc", "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h", - "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.cc", - "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.h", + "//chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.cc", + "//chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.h", "//chrome/browser/spellchecker/spellcheck_language_policy_handler.cc", "//chrome/browser/spellchecker/spellcheck_language_policy_handler.h", "//chrome/browser/spellchecker/spellcheck_service.cc", From a35497da25245f412f89cf5ab58ff16c7c16b5f1 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Thu, 2 Jul 2020 00:02:07 -0700 Subject: [PATCH 39/79] Clean up duplicate WebContents "is fullscreen" functions https://chromium-review.googlesource.com/c/chromium/src/+/2275148 --- shell/browser/api/electron_api_browser_window.cc | 2 +- shell/browser/osr/osr_render_widget_host_view.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shell/browser/api/electron_api_browser_window.cc b/shell/browser/api/electron_api_browser_window.cc index 094e4e4ed5d45..05e6f7ef2ae6e 100644 --- a/shell/browser/api/electron_api_browser_window.cc +++ b/shell/browser/api/electron_api_browser_window.cc @@ -318,7 +318,7 @@ void BrowserWindow::OnWindowResize() { void BrowserWindow::OnWindowLeaveFullScreen() { TopLevelWindow::OnWindowLeaveFullScreen(); #if defined(OS_MACOSX) - if (web_contents()->IsFullscreenForCurrentTab()) + if (web_contents()->IsFullscreen()) web_contents()->ExitFullscreen(true); #endif } diff --git a/shell/browser/osr/osr_render_widget_host_view.cc b/shell/browser/osr/osr_render_widget_host_view.cc index 471cc29b94b40..44b8714bd236d 100644 --- a/shell/browser/osr/osr_render_widget_host_view.cc +++ b/shell/browser/osr/osr_render_widget_host_view.cc @@ -138,7 +138,7 @@ class ElectronDelegatedFrameHostClient SkColor DelegatedFrameHostGetGutterColor() const override { if (view_->render_widget_host()->delegate() && - view_->render_widget_host()->delegate()->IsFullscreenForCurrentTab()) { + view_->render_widget_host()->delegate()->IsFullscreen()) { return SK_ColorWHITE; } return *view_->GetBackgroundColor(); From 865e33540514fa377f767998164970a9a0726d01 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Thu, 2 Jul 2020 00:29:08 -0700 Subject: [PATCH 40/79] Adds icon loading service with sandbox for Windows. https://chromium-review.googlesource.com/c/chromium/src/+/1987273 --- chromium_src/BUILD.gn | 8 +++++++ electron_strings.grdp | 5 ++++ patches/chromium/.patches | 1 + ...ron_resources_in_icon_reader_service.patch | 21 ++++++++++++++++ .../electron_content_utility_client.cc | 24 +++++++++++++++---- 5 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 patches/chromium/use_electron_resources_in_icon_reader_service.patch diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn index bba2b6e870fa4..7df57ee1bb5a2 100644 --- a/chromium_src/BUILD.gn +++ b/chromium_src/BUILD.gn @@ -93,6 +93,14 @@ static_library("chrome") { ] } + if (is_win) { + sources += [ + "//chrome/browser/win/icon_reader_service.cc", + "//chrome/browser/win/icon_reader_service.h", + ] + public_deps += [ "//chrome/services/util_win:lib" ] + } + if (enable_desktop_capturer) { sources += [ "//chrome/browser/media/webrtc/desktop_media_list.h", diff --git a/electron_strings.grdp b/electron_strings.grdp index 5b3f39afcfdf4..a435b0a4bff57 100644 --- a/electron_strings.grdp +++ b/electron_strings.grdp @@ -75,4 +75,9 @@ en-US,en + + + Windows Utilities + + diff --git a/patches/chromium/.patches b/patches/chromium/.patches index 7659a0089c107..111b33f0abef7 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -96,3 +96,4 @@ allow_setting_secondary_label_via_simplemenumodel.patch disable_unnecessary_ischromefirstrun_check.patch fix_swap_global_proxies_before_initializing_the_windows_proxies.patch feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch +use_electron_resources_in_icon_reader_service.patch diff --git a/patches/chromium/use_electron_resources_in_icon_reader_service.patch b/patches/chromium/use_electron_resources_in_icon_reader_service.patch new file mode 100644 index 0000000000000..5d9fd83091c49 --- /dev/null +++ b/patches/chromium/use_electron_resources_in_icon_reader_service.patch @@ -0,0 +1,21 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: deepak1556 +Date: Thu, 2 Jul 2020 00:27:40 -0700 +Subject: use electron resources in icon_reader_service + +Without this, the ID for IDS_UTILITY_PROCESS_UTILITY_WIN_NAME will be wrong on windows +and cause a DCHECK() failure + +diff --git a/chrome/browser/win/icon_reader_service.cc b/chrome/browser/win/icon_reader_service.cc +index 721e1a863cc6925908f8343002df056f2373bf0b..10b2a95162541a8ff4d010c7be864f3f41dae378 100644 +--- a/chrome/browser/win/icon_reader_service.cc ++++ b/chrome/browser/win/icon_reader_service.cc +@@ -5,7 +5,7 @@ + #include "chrome/browser/win/icon_reader_service.h" + + #include "chrome/browser/service_sandbox_type.h" +-#include "chrome/grit/generated_resources.h" ++#include "electron/grit/electron_resources.h" + #include "content/public/browser/service_process_host.h" + + mojo::Remote LaunchIconReaderInstance() { diff --git a/shell/utility/electron_content_utility_client.cc b/shell/utility/electron_content_utility_client.cc index b5443e24cc34b..dea3d0c005981 100644 --- a/shell/utility/electron_content_utility_client.cc +++ b/shell/utility/electron_content_utility_client.cc @@ -24,6 +24,8 @@ #include "chrome/services/printing/pdf_to_emf_converter_factory.h" #include "chrome/services/printing/printing_service.h" #include "chrome/services/printing/public/mojom/printing_service.mojom.h" +#include "chrome/services/util_win/public/mojom/util_read_icon.mojom.h" +#include "chrome/services/util_win/util_read_icon.h" #include "chrome/utility/printing_handler.h" #endif // defined(OS_WIN) @@ -33,13 +35,21 @@ namespace electron { namespace { -#if BUILDFLAG(ENABLE_PRINTING) && defined(OS_WIN) +#if BUILDFLAG(ENABLE_PRINT_PREVIEW) || \ + (BUILDFLAG(ENABLE_PRINTING) && defined(OS_WIN)) auto RunPrintingService( mojo::PendingReceiver receiver) { return std::make_unique(std::move(receiver)); } #endif +#if defined(OS_WIN) +auto RunWindowsIconReader( + mojo::PendingReceiver receiver) { + return std::make_unique(std::move(receiver)); +} +#endif + #if BUILDFLAG(ENABLE_PRINTING) auto RunPrintCompositor( mojo::PendingReceiver receiver) { @@ -105,11 +115,17 @@ bool ElectronContentUtilityClient::OnMessageReceived( mojo::ServiceFactory* ElectronContentUtilityClient::GetMainThreadServiceFactory() { static base::NoDestructor factory { -#if BUILDFLAG(ENABLE_PRINTING) - RunPrintCompositor, #if defined(OS_WIN) - RunPrintingService + RunWindowsIconReader, #endif + +#if BUILDFLAG(ENABLE_PRINTING) + RunPrintCompositor, +#endif + +#if BUILDFLAG(ENABLE_PRINT_PREVIEW) || \ + (BUILDFLAG(ENABLE_PRINTING) && defined(OS_WIN)) + RunPrintingService, #endif }; return factory.get(); From 10503c73f7c46f88bffdb7b982b524581b976712 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Thu, 2 Jul 2020 01:03:51 -0700 Subject: [PATCH 41/79] No more Vulkan info collection for UMA on Windows https://chromium-review.googlesource.com/c/chromium/src/+/2252818 --- .../chromium/gpu_notify_when_dxdiag_request_fails.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch index f704344a4c551..e41bf81654325 100644 --- a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch +++ b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch @@ -40,15 +40,16 @@ index 8af48d23b020779c1714fc7ca70966e8d33f7252..5dfa29db15467f8fc55f86a2a225380c // Update the GPU feature info. This updates the blacklist and enabled status // of GPU rasterization. In the future this will be used for more features. diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc -index dd4a3e4ab502005fdd7216e45ec109c1a3311536..67db08d1dda0fd0f00b25a20ce167d0eaaec504d 100644 +index dd4a3e4ab502005fdd7216e45ec109c1a3311536..3063ff2a22bef9138e1494542571a4385ac35427 100644 --- a/content/browser/gpu/gpu_data_manager_impl_private.cc +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1063,6 +1063,10 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() { +@@ -1063,6 +1063,11 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() { host->ForceShutdown(); } +bool GpuDataManagerImplPrivate::DxdiagDx12VulkanRequested() const { -+ return !(gpu_info_dx12_vulkan_request_failed_ || ++ return !(gpu_info_vulkan_request_failed_ || ++ gpu_info_dx12_request_failed_ || + gpu_info_dx_diag_request_failed_); +} #endif From b33c113012f68d71735b440039a8f03000a8707d Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Thu, 2 Jul 2020 01:06:30 -0700 Subject: [PATCH 42/79] fix lint --- shell/browser/ui/views/electron_views_delegate.h | 1 + 1 file changed, 1 insertion(+) diff --git a/shell/browser/ui/views/electron_views_delegate.h b/shell/browser/ui/views/electron_views_delegate.h index d19bbf252a31d..58c4e33cb8500 100644 --- a/shell/browser/ui/views/electron_views_delegate.h +++ b/shell/browser/ui/views/electron_views_delegate.h @@ -6,6 +6,7 @@ #define SHELL_BROWSER_UI_VIEWS_ELECTRON_VIEWS_DELEGATE_H_ #include +#include #include #include "base/compiler_specific.h" From 611f91b3736083f6db8bf65ee8a303973630c5aa Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Thu, 2 Jul 2020 02:54:09 -0700 Subject: [PATCH 43/79] chore: update buildflag conditions --- .../electron_content_utility_client.cc | 31 ++++++++++++------- .../utility/electron_content_utility_client.h | 8 ++--- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/shell/utility/electron_content_utility_client.cc b/shell/utility/electron_content_utility_client.cc index dea3d0c005981..6385428d8b6da 100644 --- a/shell/utility/electron_content_utility_client.cc +++ b/shell/utility/electron_content_utility_client.cc @@ -16,20 +16,29 @@ #include "services/service_manager/public/cpp/service.h" #include "services/service_manager/sandbox/switches.h" +#if defined(OS_WIN) +#include "chrome/services/util_win/public/mojom/util_read_icon.mojom.h" +#include "chrome/services/util_win/util_read_icon.h" +#endif // defined(OS_WIN) + #if BUILDFLAG(ENABLE_PRINTING) #include "components/services/print_compositor/print_compositor_impl.h" #include "components/services/print_compositor/public/mojom/print_compositor.mojom.h" // nogncheck +#endif // BUILDFLAG(ENABLE_PRINTING) -#if defined(OS_WIN) +#if BUILDFLAG(ENABLE_PRINTING) && defined(OS_WIN) #include "chrome/services/printing/pdf_to_emf_converter_factory.h" -#include "chrome/services/printing/printing_service.h" -#include "chrome/services/printing/public/mojom/printing_service.mojom.h" -#include "chrome/services/util_win/public/mojom/util_read_icon.mojom.h" -#include "chrome/services/util_win/util_read_icon.h" +#endif + +#if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_WIN) #include "chrome/utility/printing_handler.h" -#endif // defined(OS_WIN) +#endif -#endif // BUILDFLAG(ENABLE_PRINTING) +#if BUILDFLAG(ENABLE_PRINT_PREVIEW) || \ + (BUILDFLAG(ENABLE_PRINTING) && defined(OS_WIN)) +#include "chrome/services/printing/printing_service.h" +#include "chrome/services/printing/public/mojom/printing_service.mojom.h" +#endif namespace electron { @@ -70,7 +79,7 @@ auto RunProxyResolver( ElectronContentUtilityClient::ElectronContentUtilityClient() : utility_process_running_elevated_(false) { -#if BUILDFLAG(ENABLE_PRINTING) && defined(OS_WIN) +#if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_WIN) printing_handler_ = std::make_unique(); #endif } @@ -86,17 +95,17 @@ void ElectronContentUtilityClient::ExposeInterfacesToBrowser( base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); utility_process_running_elevated_ = command_line->HasSwitch( service_manager::switches::kNoSandboxAndElevatedPrivileges); +#endif // If our process runs with elevated privileges, only add elevated Mojo // interfaces to the BinderMap. if (!utility_process_running_elevated_) { -#if BUILDFLAG(ENABLE_PRINTING) +#if BUILDFLAG(ENABLE_PRINTING) && defined(OS_WIN) binders->Add( base::BindRepeating(printing::PdfToEmfConverterFactory::Create), base::ThreadTaskRunnerHandle::Get()); #endif } -#endif } bool ElectronContentUtilityClient::OnMessageReceived( @@ -104,7 +113,7 @@ bool ElectronContentUtilityClient::OnMessageReceived( if (utility_process_running_elevated_) return false; -#if BUILDFLAG(ENABLE_PRINTING) && defined(OS_WIN) +#if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_WIN) if (printing_handler_->OnMessageReceived(message)) return true; #endif diff --git a/shell/utility/electron_content_utility_client.h b/shell/utility/electron_content_utility_client.h index 867a924bb9115..d111cfcbb59e3 100644 --- a/shell/utility/electron_content_utility_client.h +++ b/shell/utility/electron_content_utility_client.h @@ -14,9 +14,9 @@ #include "mojo/public/cpp/bindings/binder_map.h" #include "printing/buildflags/buildflags.h" -#if BUILDFLAG(ENABLE_PRINTING) && defined(OS_WIN) -#include "chrome/utility/printing_handler.h" -#endif +namespace printing { +class PrintHandler; +} namespace electron { @@ -31,7 +31,7 @@ class ElectronContentUtilityClient : public content::ContentUtilityClient { mojo::ServiceFactory* GetIOThreadServiceFactory() override; private: -#if BUILDFLAG(ENABLE_PRINTING) && defined(OS_WIN) +#if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_WIN) std::unique_ptr printing_handler_; #endif From 2d0cd32d252803b2cdcb3d655de33a0d2583ec82 Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Thu, 2 Jul 2020 06:01:09 -0700 Subject: [PATCH 44/79] chore: bump chromium in DEPS to a837d4c4230ace4f10b2768728f4044b7995dfa5 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 4992b3920d4b8..8e969abbc4ced 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - '12c233c2a85bfa28fb279f390121ba681e52a71b', + 'a837d4c4230ace4f10b2768728f4044b7995dfa5', 'node_version': 'v12.18.1', 'nan_version': From 8b2d86cb17f08c7081c623e5e559ff190bfc9620 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Thu, 2 Jul 2020 10:08:16 -0700 Subject: [PATCH 45/79] update hunspell files --- filenames.hunspell.gni | 1 + 1 file changed, 1 insertion(+) diff --git a/filenames.hunspell.gni b/filenames.hunspell.gni index 33431ccf6beb2..0c91ae1db77c2 100644 --- a/filenames.hunspell.gni +++ b/filenames.hunspell.gni @@ -10,6 +10,7 @@ hunspell_dictionaries = [ "//third_party/hunspell_dictionaries/en-AU-9-0.bdic", "//third_party/hunspell_dictionaries/en-CA-9-0.bdic", "//third_party/hunspell_dictionaries/en-GB-9-0.bdic", + "//third_party/hunspell_dictionaries/en-GB-oxendict-9-0.bdic", "//third_party/hunspell_dictionaries/en-US-9-0.bdic", "//third_party/hunspell_dictionaries/es-ES-3-0.bdic", "//third_party/hunspell_dictionaries/et-EE-3-0.bdic", From fd123dfc1e220f32861661192aa7fbd1c747b3b6 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Thu, 2 Jul 2020 10:23:00 -0700 Subject: [PATCH 46/79] chore: update patches --- .../add_didinstallconditionalfeatures.patch | 2 +- ...add_trustedauthclient_to_urlloaderfactory.patch | 6 +++--- patches/chromium/blink_local_frame.patch | 2 +- patches/chromium/blink_world_context.patch | 2 +- patches/chromium/can_create_window.patch | 14 +++++++------- ...ron_resources_not_chrome_for_spellchecker.patch | 4 ++-- .../expose_setuseragent_on_networkcontext.patch | 2 +- ...e_offscreen_rendering_with_viz_compositor.patch | 2 +- ...gations_through_the_web_contents_delegate.patch | 2 +- ...low_remote_certificate_verification_logic.patch | 2 +- ...cursor_changes_to_the_webcontentsobserver.patch | 4 ++-- patches/chromium/resource_file_conflict.patch | 6 +++--- patches/chromium/web_contents.patch | 2 +- patches/v8/add_realloc.patch | 2 +- patches/v8/build_gn.patch | 6 +++--- ..._not_export_private_v8_symbols_on_windows.patch | 2 +- patches/v8/expose_mksnapshot.patch | 4 ++-- 17 files changed, 32 insertions(+), 32 deletions(-) diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index 1cd64c5f51476..21680bf66a0f5 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -79,7 +79,7 @@ index 2c0252c1342e62a142558c4ec48829404b0428b4..c145ed92de9fab565bb10ee0f2d92c8c if (World().IsMainWorld()) { GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld(); diff --git a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc -index 7529cea5e8ccb5d9dbf3d9bacd7f637716f84909..9ec24e7e9985ab481612c7679d2a24bccbfbb4d8 100644 +index c42ed24c2288675f88f0e6262524687f6f02a221..a594b717c1ee060ffafd79352d47d64e6bcb0703 100644 --- a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc +++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc @@ -362,6 +362,13 @@ void LocalFrameClientImpl::DidCreateScriptContext( diff --git a/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch b/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch index efb023ba8cdfa..c8fe8955559e4 100644 --- a/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch +++ b/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch @@ -10,7 +10,7 @@ WebContents, and cancels the authentication if there's no WebContents available, which there isn't in the case of the 'net' module. diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom -index 6d15b6b5ff7b36b85f6b8200b76a32b285f0e675..c21234572976a6de7db5b0f2f7f44ec770832178 100644 +index ccac671f0e7e56c731cb9bd92bad788271419a7f..cfea0e5dbc28f1a4cdfea36372ce7f34f15c4de7 100644 --- a/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom @@ -214,6 +214,25 @@ struct CTPolicy { @@ -128,7 +128,7 @@ index 1c8a9ce4ba5f41cb7a4d415337ff087894fee3df..1ea5d86177ff568a13e3d10767316ae4 std::unique_ptr file_opener_for_upload_; diff --git a/services/network/url_loader_factory.cc b/services/network/url_loader_factory.cc -index c8f02a3760f938c772c9e81afff8b37e49a73cbd..7e5bb5d1384488de2dee3672f933eba643dc14f7 100644 +index 75ae8488efa7e5acfda0b21029657b525fa95f86..5dce71ee5efc97f9f63d0b5f236dccdfb05cfc79 100644 --- a/services/network/url_loader_factory.cc +++ b/services/network/url_loader_factory.cc @@ -75,6 +75,7 @@ URLLoaderFactory::URLLoaderFactory( @@ -139,7 +139,7 @@ index c8f02a3760f938c772c9e81afff8b37e49a73cbd..7e5bb5d1384488de2dee3672f933eba6 cors_url_loader_factory_(cors_url_loader_factory), cookie_observer_(std::move(params_->cookie_observer)) { DCHECK(context); -@@ -270,6 +271,7 @@ void URLLoaderFactory::CreateLoaderAndStart( +@@ -254,6 +255,7 @@ void URLLoaderFactory::CreateLoaderAndStart( std::move(keepalive_statistics_recorder), std::move(network_usage_accumulator), header_client_.is_bound() ? header_client_.get() : nullptr, diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch index 22941b4489562..b5b689611e1ed 100644 --- a/patches/chromium/blink_local_frame.patch +++ b/patches/chromium/blink_local_frame.patch @@ -14,7 +14,7 @@ when there is code doing that. This patch reverts the change to fix the crash in Electron. diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc -index 1387c4da8f43b76885c94c40c1147e6632d0f363..47d2ab71160645996b048fadc7058a2338e953f7 100644 +index 603a8f9862adfe6d8e015b34c2bb7e267f718a7b..8597c67f6c8f0d663654f7858901707d8e700867 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc @@ -539,10 +539,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { diff --git a/patches/chromium/blink_world_context.patch b/patches/chromium/blink_world_context.patch index 9decfb8556aa1..92ad8e0487c9c 100644 --- a/patches/chromium/blink_world_context.patch +++ b/patches/chromium/blink_world_context.patch @@ -20,7 +20,7 @@ index 198a934c8d9613eb612e6a8cb94d04e27a4dd021..abae04fec8e99d89a548020d50f3d8ab // Executes script in the context of the current page and returns the value // that the script evaluated to with callback. Script execution can be 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 4d6067a5cb566bde471ffcda9f01fff7509e892d..3e0b4029b0d2b97b754a8536fe38c4ffd42d50a2 100644 +index 5262720d87036af0b1f64cc42a810288436934d1..3295d0ec6904693060fe91729173f70433e2adb9 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 @@ -972,6 +972,13 @@ v8::Local WebLocalFrameImpl::GlobalProxy() const { diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index 2b630656c6fde..9279e48fce695 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -21,7 +21,7 @@ index 2b58ad65bf2d87fcbaf889c32a2d5efa86abff4a..29bc91a5f9fcddf246399afdeafdf307 &no_javascript_access); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 4f56a70f997e037e4aea33cae97a69655328a249..31398279fbddfdf5d789edee7924ab768a167801 100644 +index cf4d0c48945ecced5ecd9ef03a4f2b5eff844511..391b3d240c132ae321562f0d7850c44d1e950650 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -3082,9 +3082,9 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow( @@ -87,7 +87,7 @@ index 58367f4e696b29df1cab2336229bc408d3ba63e6..9184695ea198b0e1b41c9bb456317ca2 bool opener_suppressed, bool* no_javascript_access); diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc -index 50936cd961bf4d0e026ee3d150a34892e94601dd..f62a39dc9904f4edd7cc4e407c3d1ec58c0853c8 100644 +index b30f242d2b61b10f68f016bc1e93419b520d3b06..bfbad0007797d9c3fff78fae121aa2546b22eb95 100644 --- a/content/public/browser/web_contents_delegate.cc +++ b/content/public/browser/web_contents_delegate.cc @@ -26,6 +26,17 @@ namespace content { @@ -109,10 +109,10 @@ index 50936cd961bf4d0e026ee3d150a34892e94601dd..f62a39dc9904f4edd7cc4e407c3d1ec5 const OpenURLParams& params) { return nullptr; diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h -index e545ff70c612e98cdd79230303273a3ec7bfcaac..405152e0e90bc76b7de9c3e6946944f3ad852e5d 100644 +index 39c834d95000ce5c189d810970fc85032c9509d2..8101442f9ad81fe84d9f0e8f302184349f522541 100644 --- a/content/public/browser/web_contents_delegate.h +++ b/content/public/browser/web_contents_delegate.h -@@ -16,6 +16,7 @@ +@@ -17,6 +17,7 @@ #include "base/strings/string16.h" #include "build/build_config.h" #include "content/common/content_export.h" @@ -120,7 +120,7 @@ index e545ff70c612e98cdd79230303273a3ec7bfcaac..405152e0e90bc76b7de9c3e6946944f3 #include "content/public/browser/bluetooth_chooser.h" #include "content/public/browser/bluetooth_scanning_prompt.h" #include "content/public/browser/eye_dropper.h" -@@ -337,6 +338,13 @@ class CONTENT_EXPORT WebContentsDelegate { +@@ -338,6 +339,13 @@ class CONTENT_EXPORT WebContentsDelegate { const std::string& partition_id, SessionStorageNamespace* session_storage_namespace); @@ -206,10 +206,10 @@ index 4f735ad0d97eaac9a57dad137e479f8a7ec33a36..0a3c5821962c85609b64b3625fa6b8d6 } // namespace blink diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc -index 7cccc33174e66eb40fd87ad3c35248f557e928cb..69147d1b199d4e4e6b3a84bf21c686432ba45cbb 100644 +index e00ab34b1f114b0ecca066e01ed3a657977b411c..f198975f504aa086596a9a4f63841fe01aee78e8 100644 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc -@@ -1973,6 +1973,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, +@@ -1970,6 +1970,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, } WebWindowFeatures window_features = GetWindowFeaturesFromString(features); diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch index 2a07ca29a1746..e715b33531eb3 100644 --- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch +++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch @@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from Electrons grit header instead of Chromes diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 7b0b898d063b541494fbb2ae2039754dbcf5379d..c67dc35829306e9e73f11cb1b068aa3bf98073b6 100644 +index 68f7b98d4aad50db116cfd1789a4517c45dae610..3a9e5db308fa6601b5e8d8aaf7e4ce9f6ec89b5b 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -5531,6 +5531,7 @@ static_library("browser") { +@@ -5534,6 +5534,7 @@ static_library("browser") { deps += [ "//components/spellcheck/browser", "//components/spellcheck/common", diff --git a/patches/chromium/expose_setuseragent_on_networkcontext.patch b/patches/chromium/expose_setuseragent_on_networkcontext.patch index db6b8ba04d3a6..2b18c42944032 100644 --- a/patches/chromium/expose_setuseragent_on_networkcontext.patch +++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch @@ -63,7 +63,7 @@ index 391a02c108debdd5e5572b4a666d30dc68ece76b..0d9c4cce09db485b5e750921eed703c7 void SetEnableReferrers(bool enable_referrers) override; #if defined(OS_CHROMEOS) diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom -index 577c2b431ae8026b34fa1d881b0b29db478dc213..6d15b6b5ff7b36b85f6b8200b76a32b285f0e675 100644 +index 73b790fab0f6c6377f8206960a478778ecf6e62c..ccac671f0e7e56c731cb9bd92bad788271419a7f 100644 --- a/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom @@ -1050,6 +1050,9 @@ interface NetworkContext { diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch index 3a6a68ed9a080..4ab5ff6f91bae 100644 --- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch +++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch @@ -94,7 +94,7 @@ index 1026b739d283f0fc252fa2af83a6d4cf51bc8553..fe562ab60ce98b8bb0c5080a6428deb3 private: const HWND hwnd_; diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn -index 0979770409131aed4bea76d33b2748c01dde9541..d256ec42bb2154628de7d8d08cc8cf4b6d928911 100644 +index 3e4dd38b5bcdc1727f8f1a1faf8ad5aa21a5b9fb..4e7d3d4539d2190b21da9d4375ee0101243a97c7 100644 --- a/components/viz/service/BUILD.gn +++ b/components/viz/service/BUILD.gn @@ -111,6 +111,8 @@ viz_component("service") { diff --git a/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch b/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch index 3330078adadc9..8fe7093544343 100644 --- a/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch +++ b/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch @@ -13,7 +13,7 @@ This patch can be removed once app.allowRendererProcessReuse is forced to true as then Chromiums assumptions around processes become correct. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 31398279fbddfdf5d789edee7924ab768a167801..14a6c451bf20ce47ce309365eebbf1360aa417d3 100644 +index 391b3d240c132ae321562f0d7850c44d1e950650..0e634f0e9dac18a7e62092da73ac15c246edac67 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -2492,11 +2492,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) { diff --git a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch index e4b1f57a3c684..95a40d8d26d14 100644 --- a/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch +++ b/patches/chromium/network_service_allow_remote_certificate_verification_logic.patch @@ -208,7 +208,7 @@ index eced38ff04f8d7f3a91079b65f5ad29348bf8813..391a02c108debdd5e5572b4a666d30dc // CertNetFetcher is not used by the current platform, or if the actual // net::CertVerifier is instantiated outside of the network service. diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom -index 6d5110add0e37fee81337a79f33c7b9266a2a9b0..577c2b431ae8026b34fa1d881b0b29db478dc213 100644 +index 2c696bbb7863f02a93cacef0fd8780a5fa3ac040..73b790fab0f6c6377f8206960a478778ecf6e62c 100644 --- a/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom @@ -214,6 +214,17 @@ struct CTPolicy { diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch index c67d34a54bed0..a62d3f4981366 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -43,7 +43,7 @@ index 44db58950f9c334aaea8a8fb1b076a53bbb53c97..74dcc48deeeaccf3b0e10fed894d29b3 void RenderWidgetHostImpl::OnCursorVisibilityStateChanged(bool is_visible) { diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 463503eaa057846790b1d9121ca7344cda44855c..d7fa11b23ab9ead3dd26b53a7ae865d6e35bfe44 100644 +index 8a0eef81bb1a82bd27e97c45f0fdd212722bc458..21e60fdd61019b00e94a32ea0b75516c2d2185a3 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -3583,6 +3583,11 @@ bool WebContentsImpl::OnUpdateDragCursor() { @@ -59,7 +59,7 @@ index 463503eaa057846790b1d9121ca7344cda44855c..d7fa11b23ab9ead3dd26b53a7ae865d6 RenderWidgetHostImpl* render_widget_host) { return render_widget_host == GetMainFrame()->GetRenderWidgetHost(); diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h -index 6b36736a15d912941f55baf50eb493fdb2208169..c3552125187115bdfe9a98e24c6049930d21056f 100644 +index ef837fbb9dd65f84a2c43b5d8ec5b559e7ae2da6..1df6791b74b12377ae74ace5e9b8972cc6a42f67 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h @@ -920,6 +920,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch index 9540b97c96c8b..1a4bc248ce9f9 100644 --- a/patches/chromium/resource_file_conflict.patch +++ b/patches/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 5b308b31b4e9e31c2c56264368218dec18e8e72f..201959fb57f87bdf3bd17d19281a358341f1a544 100644 +index c34a0526bc1dac431ea7aad1346dc4508a7264d3..4672898afa6f8a71405588c86870b3307627e8c6 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -1389,7 +1389,7 @@ if (is_chrome_branded && !is_android) { +@@ -1394,7 +1394,7 @@ if (is_chrome_branded && !is_android) { } } @@ -64,7 +64,7 @@ index 5b308b31b4e9e31c2c56264368218dec18e8e72f..201959fb57f87bdf3bd17d19281a3583 chrome_paks("packed_resources") { if (is_mac) { output_dir = "$root_gen_dir/repack" -@@ -1409,6 +1409,12 @@ if (!is_android) { +@@ -1414,6 +1414,12 @@ if (!is_android) { } } diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch index 4cae86da2f42f..fe7c88e47024c 100644 --- a/patches/chromium/web_contents.patch +++ b/patches/chromium/web_contents.patch @@ -9,7 +9,7 @@ is needed for OSR. Originally landed in https://github.com/electron/libchromiumcontent/pull/226. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 14a6c451bf20ce47ce309365eebbf1360aa417d3..463503eaa057846790b1d9121ca7344cda44855c 100644 +index 0e634f0e9dac18a7e62092da73ac15c246edac67..8a0eef81bb1a82bd27e97c45f0fdd212722bc458 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -2225,6 +2225,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { diff --git a/patches/v8/add_realloc.patch b/patches/v8/add_realloc.patch index 3b14c097369bf..2eaea742ae124 100644 --- a/patches/v8/add_realloc.patch +++ b/patches/v8/add_realloc.patch @@ -12,7 +12,7 @@ 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 00a4ae280322334c20d10f0921a5b1a7594e03fa..fa8116d882bdf8270c56fbdf3b62721099869b08 100644 +index 13b40db28eb08e4ad602d23fcab2f56900896dd8..f27cc892846cd6de06ec5fc0e908a7884fc40d06 100644 --- a/include/v8.h +++ b/include/v8.h @@ -5068,6 +5068,13 @@ class V8_EXPORT ArrayBuffer : public Object { diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch index 82f16bbcaf63e..6c60169e2b1d8 100644 --- a/patches/v8/build_gn.patch +++ b/patches/v8/build_gn.patch @@ -9,7 +9,7 @@ necessary for native modules to load. Also, some fixes relating to mksnapshot on ARM. diff --git a/BUILD.gn b/BUILD.gn -index 0ea6af76af13602574cada45cfab2b31ae2a3855..cef1d174350237db722010a2d117a4a1fbeafc22 100644 +index ba52654401d98f34e2ca0de83139460292a52add..6b038b17ef772a66fcebad094218fdc47dfa6931 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -368,7 +368,7 @@ config("internal_config") { @@ -21,7 +21,7 @@ index 0ea6af76af13602574cada45cfab2b31ae2a3855..cef1d174350237db722010a2d117a4a1 defines += [ "BUILDING_V8_SHARED" ] } } -@@ -4330,7 +4330,7 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -4325,7 +4325,7 @@ if (current_toolchain == v8_generator_toolchain) { "src/interpreter/bytecodes.h", ] @@ -30,7 +30,7 @@ index 0ea6af76af13602574cada45cfab2b31ae2a3855..cef1d174350237db722010a2d117a4a1 deps = [ ":v8_libbase", -@@ -4363,6 +4363,8 @@ if (current_toolchain == v8_snapshot_toolchain) { +@@ -4358,6 +4358,8 @@ if (current_toolchain == v8_snapshot_toolchain) { configs = [ ":internal_config" ] diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch index e4c71ee6c6c2a..b62b205c1ddca 100644 --- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch +++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch @@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not contain any standard C++ library exports (e.g. `std::ostringstream`). diff --git a/BUILD.gn b/BUILD.gn -index 34d28607d8c25a24d5fb63754f40b2959941ffa5..938e0746357f1fff7fd14b1ece053d54f7f6636d 100644 +index 9af9b50623a15cad7a66d13d874a88ef34428099..126faa3c579b2b962347333ec0cabf0d903191ab 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -368,6 +368,10 @@ config("internal_config") { diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch index b0acfba2a65df..20194418c5f9b 100644 --- a/patches/v8/expose_mksnapshot.patch +++ b/patches/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 cef1d174350237db722010a2d117a4a1fbeafc22..34d28607d8c25a24d5fb63754f40b2959941ffa5 100644 +index 6b038b17ef772a66fcebad094218fdc47dfa6931..9af9b50623a15cad7a66d13d874a88ef34428099 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -4341,7 +4341,6 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -4336,7 +4336,6 @@ if (current_toolchain == v8_generator_toolchain) { if (current_toolchain == v8_snapshot_toolchain) { v8_executable("mksnapshot") { From bbfefd413e4bb4f24233741e6f0d967b85dcb05b Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Thu, 2 Jul 2020 11:19:45 -0700 Subject: [PATCH 47/79] Make content::FileSelectListener a RefCounted https://chromium-review.googlesource.com/c/chromium/src/+/2275338 --- shell/browser/common_web_contents_delegate.cc | 4 ++-- shell/browser/common_web_contents_delegate.h | 4 ++-- shell/browser/ui/inspectable_web_contents_impl.cc | 4 ++-- shell/browser/ui/inspectable_web_contents_impl.h | 4 ++-- shell/browser/web_dialog_helper.cc | 8 ++++---- shell/browser/web_dialog_helper.h | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/shell/browser/common_web_contents_delegate.cc b/shell/browser/common_web_contents_delegate.cc index 8f7e66c8eaf9d..b919d18feea0a 100644 --- a/shell/browser/common_web_contents_delegate.cc +++ b/shell/browser/common_web_contents_delegate.cc @@ -330,7 +330,7 @@ content::ColorChooser* CommonWebContentsDelegate::OpenColorChooser( void CommonWebContentsDelegate::RunFileChooser( content::RenderFrameHost* render_frame_host, - std::unique_ptr listener, + scoped_refptr listener, const blink::mojom::FileChooserParams& params) { if (!web_dialog_helper_) web_dialog_helper_ = @@ -341,7 +341,7 @@ void CommonWebContentsDelegate::RunFileChooser( void CommonWebContentsDelegate::EnumerateDirectory( content::WebContents* guest, - std::unique_ptr listener, + scoped_refptr listener, const base::FilePath& path) { if (!web_dialog_helper_) web_dialog_helper_ = diff --git a/shell/browser/common_web_contents_delegate.h b/shell/browser/common_web_contents_delegate.h index 2169b83f9eab9..2b5f0a0a4031f 100644 --- a/shell/browser/common_web_contents_delegate.h +++ b/shell/browser/common_web_contents_delegate.h @@ -84,10 +84,10 @@ class CommonWebContentsDelegate : public content::WebContentsDelegate, const std::vector& suggestions) override; void RunFileChooser(content::RenderFrameHost* render_frame_host, - std::unique_ptr listener, + scoped_refptr listener, const blink::mojom::FileChooserParams& params) override; void EnumerateDirectory(content::WebContents* web_contents, - std::unique_ptr listener, + scoped_refptr listener, const base::FilePath& path) override; void EnterFullscreenModeForTab( content::RenderFrameHost* requesting_frame, diff --git a/shell/browser/ui/inspectable_web_contents_impl.cc b/shell/browser/ui/inspectable_web_contents_impl.cc index e568b9195843f..89c999abd184c 100644 --- a/shell/browser/ui/inspectable_web_contents_impl.cc +++ b/shell/browser/ui/inspectable_web_contents_impl.cc @@ -992,7 +992,7 @@ content::ColorChooser* InspectableWebContentsImpl::OpenColorChooser( void InspectableWebContentsImpl::RunFileChooser( content::RenderFrameHost* render_frame_host, - std::unique_ptr listener, + scoped_refptr listener, const blink::mojom::FileChooserParams& params) { auto* delegate = web_contents_->GetDelegate(); if (delegate) @@ -1001,7 +1001,7 @@ void InspectableWebContentsImpl::RunFileChooser( void InspectableWebContentsImpl::EnumerateDirectory( content::WebContents* source, - std::unique_ptr listener, + scoped_refptr listener, const base::FilePath& path) { auto* delegate = web_contents_->GetDelegate(); if (delegate) diff --git a/shell/browser/ui/inspectable_web_contents_impl.h b/shell/browser/ui/inspectable_web_contents_impl.h index 3428f7310fe81..b13cd7515de32 100644 --- a/shell/browser/ui/inspectable_web_contents_impl.h +++ b/shell/browser/ui/inspectable_web_contents_impl.h @@ -187,10 +187,10 @@ class InspectableWebContentsImpl const std::vector& suggestions) override; void RunFileChooser(content::RenderFrameHost* render_frame_host, - std::unique_ptr listener, + scoped_refptr listener, const blink::mojom::FileChooserParams& params) override; void EnumerateDirectory(content::WebContents* source, - std::unique_ptr listener, + scoped_refptr listener, const base::FilePath& path) override; void SendMessageAck(int request_id, const base::Value* arg1); diff --git a/shell/browser/web_dialog_helper.cc b/shell/browser/web_dialog_helper.cc index 03286990d0577..406449672d355 100644 --- a/shell/browser/web_dialog_helper.cc +++ b/shell/browser/web_dialog_helper.cc @@ -47,7 +47,7 @@ class FileSelectHelper : public base::RefCounted, REQUIRE_ADOPTION_FOR_REFCOUNTED_TYPE(); FileSelectHelper(content::RenderFrameHost* render_frame_host, - std::unique_ptr listener, + scoped_refptr listener, blink::mojom::FileChooserParams::Mode mode) : render_frame_host_(render_frame_host), listener_(std::move(listener)), @@ -218,7 +218,7 @@ class FileSelectHelper : public base::RefCounted, void WebContentsDestroyed() override { render_frame_host_ = nullptr; } content::RenderFrameHost* render_frame_host_; - std::unique_ptr listener_; + scoped_refptr listener_; blink::mojom::FileChooserParams::Mode mode_; // DirectoryLister-specific members @@ -304,7 +304,7 @@ WebDialogHelper::~WebDialogHelper() = default; void WebDialogHelper::RunFileChooser( content::RenderFrameHost* render_frame_host, - std::unique_ptr listener, + scoped_refptr listener, const blink::mojom::FileChooserParams& params) { file_dialog::DialogSettings settings; settings.force_detached = offscreen_; @@ -346,7 +346,7 @@ void WebDialogHelper::RunFileChooser( void WebDialogHelper::EnumerateDirectory( content::WebContents* web_contents, - std::unique_ptr listener, + scoped_refptr listener, const base::FilePath& dir) { int types = base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES | base::FileEnumerator::INCLUDE_DOT_DOT; diff --git a/shell/browser/web_dialog_helper.h b/shell/browser/web_dialog_helper.h index ab745309ce02d..eeabc8e1cfbcd 100644 --- a/shell/browser/web_dialog_helper.h +++ b/shell/browser/web_dialog_helper.h @@ -31,10 +31,10 @@ class WebDialogHelper { ~WebDialogHelper(); void RunFileChooser(content::RenderFrameHost* render_frame_host, - std::unique_ptr listener, + scoped_refptr listener, const blink::mojom::FileChooserParams& params); void EnumerateDirectory(content::WebContents* web_contents, - std::unique_ptr listener, + scoped_refptr listener, const base::FilePath& path); private: From 8cdf201f1d1de652cdd6c0009a8cc78827d8f607 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Thu, 2 Jul 2020 13:42:09 -0700 Subject: [PATCH 48/79] fix build failures on MAS --- patches/chromium/mas_no_private_api.patch | 98 +++++++++++++++-------- 1 file changed, 64 insertions(+), 34 deletions(-) diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch index 8b11bf4c89e0e..994a1203aab58 100644 --- a/patches/chromium/mas_no_private_api.patch +++ b/patches/chromium/mas_no_private_api.patch @@ -7,10 +7,40 @@ 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/accessibility_tree_formatter_mac.mm b/content/browser/accessibility/accessibility_tree_formatter_mac.mm -index 6074fd6fb7da7c0e927fa81e8095729349520417..df7e644d20b75c0ace31d34d7a605efff805fa21 100644 +index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa0481551d 100644 --- a/content/browser/accessibility/accessibility_tree_formatter_mac.mm +++ b/content/browser/accessibility/accessibility_tree_formatter_mac.mm -@@ -573,7 +573,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( +@@ -341,11 +341,13 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, + param = PropertyNodeToRange(property_node); + } else if (property_name == "AXIndexForChildUIElement") { // UIElement + param = PropertyNodeToUIElement(property_node, line_indexes_map); ++#ifndef MAS_BUILD + } else if (property_name == "AXIndexForTextMarker") { // TextMarker + param = PropertyNodeToTextMarker(property_node, line_indexes_map); + } else if (property_name == + "AXStringForTextMarkerRange") { // TextMarkerRange + param = PropertyNodeToTextMarkerRange(property_node, line_indexes_map); ++#endif + } + + return param; +@@ -433,6 +435,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, + return uielement; + } + ++#ifndef MAS_BUILD + id AccessibilityTreeFormatterMac::DictNodeToTextMarker( + const PropertyNode& dictnode, + const LineIndexesMap& line_indexes_map) const { +@@ -512,6 +515,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, + + return content::AXTextMarkerRangeFrom(anchor_textmarker, focus_textmarker); + } ++#endif + + base::Value AccessibilityTreeFormatterMac::PopulateSize( + const BrowserAccessibilityCocoa* cocoa_node) const { +@@ -573,7 +577,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, 0 == strcmp([value objCType], @encode(NSRange))) { return PopulateRange([value rangeValue]); } @@ -19,7 +49,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..df7e644d20b75c0ace31d34d7a605eff // AXTextMarker if (content::IsAXTextMarker(value)) { return PopulateTextPosition(content::AXTextMarkerToPosition(value).get(), -@@ -584,7 +584,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( +@@ -584,7 +588,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, if (content::IsAXTextMarkerRange(value)) { return PopulateTextMarkerRange(value, line_indexes_map); } @@ -28,7 +58,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..df7e644d20b75c0ace31d34d7a605eff // Accessible object if ([value isKindOfClass:[BrowserAccessibilityCocoa class]]) { return base::Value(NodeToLineIndex(value, line_indexes_map)); -@@ -635,7 +635,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextPosition( +@@ -635,7 +639,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, kConstValuePrefix + affinity); return set; } @@ -37,7 +67,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..df7e644d20b75c0ace31d34d7a605eff base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( id object, const LineIndexesMap& line_indexes_map) const { -@@ -650,7 +650,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( +@@ -650,7 +654,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, dict.SetPath("focus", PopulateTextPosition(range.focus(), line_indexes_map)); return dict; } @@ -93,7 +123,7 @@ diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/cont index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe91289c3e 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm -@@ -208,6 +208,7 @@ NSString* const +@@ -208,6 +208,7 @@ NSString* const NSAccessibilityLengthForTextMarkerRangeParameterizedAttribute = @"AXLengthForTextMarkerRange"; @@ -101,7 +131,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Private attributes that can be used for testing text markers, e.g. in dump // tree tests. NSString* const -@@ -219,6 +220,7 @@ NSString* const +@@ -219,6 +220,7 @@ NSString* const NSAccessibilityTextMarkerNodeDebugDescriptionParameterizedAttribute = @"AXTextMarkerNodeDebugDescription"; @@ -109,7 +139,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Other private attributes. NSString* const NSAccessibilitySelectTextWithCriteriaParameterizedAttribute = -@@ -242,6 +244,7 @@ NSDictionary* attributeToMethodNameMap = nil; +@@ -242,6 +244,7 @@ // VoiceOver uses -1 to mean "no limit" for AXResultsLimit. const int kAXResultsLimitNoLimit = -1; @@ -117,7 +147,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe extern "C" { // The following are private accessibility APIs required for cursor navigation -@@ -470,6 +473,7 @@ NSAttributedString* GetAttributedTextForTextMarkerRange(id marker_range) { +@@ -470,6 +473,7 @@ void AddMisspelledTextAttributes(const AXPlatformRange& ax_range, AddMisspelledTextAttributes(ax_range, attributed_text); return attributed_text; } @@ -125,7 +155,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Returns an autoreleased copy of the AXNodeData's attribute. NSString* NSStringForStringAttribute(BrowserAccessibility* browserAccessibility, -@@ -727,6 +731,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired"; +@@ -727,6 +731,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) { #define NSAccessibilityLanguageAttribute @"AXLanguage" #endif @@ -133,7 +163,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe bool content::IsAXTextMarker(id object) { if (object == nil) return false; -@@ -770,6 +775,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -770,6 +775,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) { kCFAllocatorDefault, anchor_textmarker, focus_textmarker); return [static_cast(cf_marker_range) autorelease]; } @@ -141,7 +171,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe @implementation BrowserAccessibilityCocoa -@@ -807,7 +813,9 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -807,7 +813,9 @@ + (void)initialize { {NSAccessibilityEditableAncestorAttribute, @"editableAncestor"}, {NSAccessibilityElementBusyAttribute, @"elementBusy"}, {NSAccessibilityEnabledAttribute, @"enabled"}, @@ -151,7 +181,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe {NSAccessibilityExpandedAttribute, @"expanded"}, {NSAccessibilityFocusableAncestorAttribute, @"focusableAncestor"}, {NSAccessibilityFocusedAttribute, @"focused"}, -@@ -819,8 +827,10 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -819,8 +827,10 @@ + (void)initialize { {NSAccessibilityHighestEditableAncestorAttribute, @"highestEditableAncestor"}, {NSAccessibilityIndexAttribute, @"index"}, @@ -162,7 +192,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe {NSAccessibilityInvalidAttribute, @"invalid"}, {NSAccessibilityIsMultiSelectableAttribute, @"isMultiSelectable"}, {NSAccessibilityLanguageAttribute, @"language"}, -@@ -842,13 +852,17 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -842,13 +852,17 @@ + (void)initialize { {NSAccessibilityRowsAttribute, @"rows"}, // TODO(aboxhall): expose // NSAccessibilityServesAsTitleForUIElementsAttribute @@ -180,7 +210,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe {NSAccessibilitySizeAttribute, @"size"}, {NSAccessibilitySortDirectionAttribute, @"sortDirection"}, {NSAccessibilitySubroleAttribute, @"subrole"}, -@@ -1336,6 +1350,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -1336,6 +1350,7 @@ - (NSNumber*)enabled { ax::mojom::Restriction::kDisabled]; } @@ -188,7 +218,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Returns a text marker that points to the last character in the document that // can be selected with VoiceOver. - (id)endTextMarker { -@@ -1346,6 +1361,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -1346,6 +1361,7 @@ - (id)endTextMarker { BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); return CreateTextMarker(position->CreatePositionAtEndOfAnchor()); } @@ -196,7 +226,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe - (NSNumber*)expanded { if (![self instanceActive]) -@@ -1495,6 +1511,8 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -1495,6 +1511,8 @@ - (NSNumber*)index { return nil; } @@ -205,7 +235,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe - (NSNumber*)insertionPointLineNumber { if (![self instanceActive]) return nil; -@@ -1517,6 +1535,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -1517,6 +1535,7 @@ - (NSNumber*)insertionPointLineNumber { caretPosition->AsTextPosition()->text_offset()); return @(std::distance(lineBreaks.begin(), iterator)); } @@ -213,7 +243,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Returns whether or not this node should be ignored in the // accessibility tree. -@@ -2193,6 +2212,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -2193,6 +2212,7 @@ - (NSArray*)selectedChildren { return ret; } @@ -221,7 +251,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe - (NSString*)selectedText { if (![self instanceActive]) return nil; -@@ -2204,11 +2224,13 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -2204,11 +2224,13 @@ - (NSString*)selectedText { return nil; return base::SysUTF16ToNSString(range.GetText()); } @@ -235,7 +265,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe - (NSValue*)selectedTextRange { if (![self instanceActive]) return nil; -@@ -2229,12 +2251,15 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -2229,12 +2251,15 @@ - (NSValue*)selectedTextRange { int selLength = range.GetText().length(); return [NSValue valueWithRange:NSMakeRange(selStart, selLength)]; } @@ -251,7 +281,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe - (NSValue*)size { if (![self instanceActive]) -@@ -2267,6 +2292,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -2267,6 +2292,7 @@ - (NSString*)sortDirection { return nil; } @@ -259,7 +289,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Returns a text marker that points to the first character in the document that // can be selected with VoiceOver. - (id)startTextMarker { -@@ -2277,6 +2303,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -2277,6 +2303,7 @@ - (id)startTextMarker { BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); return CreateTextMarker(position->CreatePositionAtStartOfAnchor()); } @@ -267,7 +297,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Returns a subrole based upon the role. - (NSString*)subrole { -@@ -2599,11 +2626,13 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -2599,11 +2626,13 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range { NSMutableAttributedString* attributedInnerText = [[[NSMutableAttributedString alloc] initWithString:base::SysUTF16ToNSString(innerText)] autorelease]; @@ -281,7 +311,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe return [attributedInnerText attributedSubstringFromRange:range]; } -@@ -2707,9 +2736,8 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -2707,9 +2736,8 @@ - (id)accessibilityAttributeValue:(NSString*)attribute return ToBrowserAccessibilityCocoa(cell); } @@ -293,7 +323,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe BrowserAccessibilityPositionInstance position = CreatePositionFromTextMarker(parameter); if (!position->IsNullPosition()) -@@ -3022,6 +3050,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -3022,6 +3050,7 @@ AXPlatformRange range(std::move(lineStartPosition), return CreateTextMarker(root->CreatePositionAt(index)); } @@ -301,7 +331,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe if ([attribute isEqualToString: NSAccessibilityBoundsForRangeParameterizedAttribute]) { -@@ -3057,6 +3086,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -3057,6 +3086,7 @@ AXPlatformRange range(std::move(lineStartPosition), return nil; } @@ -309,7 +339,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe if ([attribute isEqualToString: NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) { -@@ -3171,6 +3201,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { +@@ -3171,6 +3201,7 @@ AXPlatformRange range(std::move(lineStartPosition), return @(child->GetIndexInParent()); } @@ -321,7 +351,7 @@ diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm index 83d0106f0f237dea75dfafe011bf527d97240d0d..462577a0dbd0fcc1baf17acd9678317cb27503fa 100644 --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm -@@ -525,6 +525,7 @@ NSDictionary* BrowserAccessibilityManagerMac:: +@@ -525,6 +525,7 @@ void PostAnnouncementNotification(NSString* announcement) { [user_info setObject:native_focus_object forKey:NSAccessibilityTextChangeElement]; @@ -329,7 +359,7 @@ index 83d0106f0f237dea75dfafe011bf527d97240d0d..462577a0dbd0fcc1baf17acd9678317c id selected_text = [native_focus_object selectedTextMarkerRange]; if (selected_text) { NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute = -@@ -532,6 +533,7 @@ NSDictionary* BrowserAccessibilityManagerMac:: +@@ -532,6 +533,7 @@ void PostAnnouncementNotification(NSString* announcement) { [user_info setObject:selected_text forKey:NSAccessibilitySelectedTextMarkerRangeAttribute]; } @@ -353,7 +383,7 @@ index 28ca1646af0b0cce40d27baec71cbe65adc334fa..bae65c1f485bc02eb9ef2ebf7018af4a namespace content { -@@ -22,6 +24,7 @@ namespace { +@@ -22,6 +24,7 @@ // verifies there are no existing open connections), and then indicates that // Chrome should continue execution without access to launchservicesd. void DisableSystemServices() { @@ -381,7 +411,7 @@ index b29b68be6fa6b0329ed03c2d9011690c5e6f83c5..3a8aca70701534d19cdf1655da188114 extern "C" { // Undocumented IOBluetooth Preference API [1]. Used by `blueutil` [2] and // `Karabiner` [3] to programmatically control the Bluetooth state. Calling the -@@ -49,6 +50,7 @@ extern "C" { +@@ -49,6 +50,7 @@ // [4] https://support.apple.com/kb/PH25091 void IOBluetoothPreferenceSetControllerPowerState(int state); } @@ -389,7 +419,7 @@ index b29b68be6fa6b0329ed03c2d9011690c5e6f83c5..3a8aca70701534d19cdf1655da188114 namespace { -@@ -118,8 +120,10 @@ BluetoothAdapterMac::BluetoothAdapterMac() +@@ -118,8 +120,10 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) { controller_state_function_( base::BindRepeating(&BluetoothAdapterMac::GetHostControllerState, base::Unretained(this))), @@ -400,7 +430,7 @@ index b29b68be6fa6b0329ed03c2d9011690c5e6f83c5..3a8aca70701534d19cdf1655da188114 should_update_name_(true), classic_discovery_manager_( BluetoothDiscoveryManagerMac::CreateClassic(this)), -@@ -304,8 +308,12 @@ base::WeakPtr BluetoothAdapterMac::GetWeakPtr() { +@@ -304,8 +308,12 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) { } bool BluetoothAdapterMac::SetPoweredImpl(bool powered) { From 02b386bcdf4d24e20dd45ce18cfd058b2ddc370b Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Thu, 2 Jul 2020 20:53:39 +0000 Subject: [PATCH 49/79] update patches --- patches/chromium/mas_no_private_api.patch | 72 +++++++++++------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch index 994a1203aab58..688c7a9a3dfa6 100644 --- a/patches/chromium/mas_no_private_api.patch +++ b/patches/chromium/mas_no_private_api.patch @@ -10,7 +10,7 @@ diff --git a/content/browser/accessibility/accessibility_tree_formatter_mac.mm b index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa0481551d 100644 --- a/content/browser/accessibility/accessibility_tree_formatter_mac.mm +++ b/content/browser/accessibility/accessibility_tree_formatter_mac.mm -@@ -341,11 +341,13 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, +@@ -341,11 +341,13 @@ AccessibilityTreeFormatterMac::ParamByPropertyNode( param = PropertyNodeToRange(property_node); } else if (property_name == "AXIndexForChildUIElement") { // UIElement param = PropertyNodeToUIElement(property_node, line_indexes_map); @@ -24,7 +24,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa } return param; -@@ -433,6 +435,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, +@@ -433,6 +435,7 @@ AccessibilityTreeFormatterMac::PropertyNodeToUIElement( return uielement; } @@ -32,7 +32,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa id AccessibilityTreeFormatterMac::DictNodeToTextMarker( const PropertyNode& dictnode, const LineIndexesMap& line_indexes_map) const { -@@ -512,6 +515,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, +@@ -512,6 +515,7 @@ id AccessibilityTreeFormatterMac::PropertyNodeToTextMarkerRange( return content::AXTextMarkerRangeFrom(anchor_textmarker, focus_textmarker); } @@ -40,7 +40,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa base::Value AccessibilityTreeFormatterMac::PopulateSize( const BrowserAccessibilityCocoa* cocoa_node) const { -@@ -573,7 +577,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, +@@ -573,7 +577,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( 0 == strcmp([value objCType], @encode(NSRange))) { return PopulateRange([value rangeValue]); } @@ -49,7 +49,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa // AXTextMarker if (content::IsAXTextMarker(value)) { return PopulateTextPosition(content::AXTextMarkerToPosition(value).get(), -@@ -584,7 +588,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, +@@ -584,7 +588,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject( if (content::IsAXTextMarkerRange(value)) { return PopulateTextMarkerRange(value, line_indexes_map); } @@ -58,7 +58,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa // Accessible object if ([value isKindOfClass:[BrowserAccessibilityCocoa class]]) { return base::Value(NodeToLineIndex(value, line_indexes_map)); -@@ -635,7 +639,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, +@@ -635,7 +639,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextPosition( kConstValuePrefix + affinity); return set; } @@ -67,7 +67,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( id object, const LineIndexesMap& line_indexes_map) const { -@@ -650,7 +654,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&, +@@ -650,7 +654,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange( dict.SetPath("focus", PopulateTextPosition(range.focus(), line_indexes_map)); return dict; } @@ -123,7 +123,7 @@ diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/cont index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe91289c3e 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm -@@ -208,6 +208,7 @@ +@@ -208,6 +208,7 @@ NSString* const NSString* const NSAccessibilityLengthForTextMarkerRangeParameterizedAttribute = @"AXLengthForTextMarkerRange"; @@ -131,7 +131,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Private attributes that can be used for testing text markers, e.g. in dump // tree tests. NSString* const -@@ -219,6 +220,7 @@ +@@ -219,6 +220,7 @@ NSString* const NSString* const NSAccessibilityTextMarkerNodeDebugDescriptionParameterizedAttribute = @"AXTextMarkerNodeDebugDescription"; @@ -139,7 +139,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Other private attributes. NSString* const NSAccessibilitySelectTextWithCriteriaParameterizedAttribute = -@@ -242,6 +244,7 @@ +@@ -242,6 +244,7 @@ NSDictionary* attributeToMethodNameMap = nil; // VoiceOver uses -1 to mean "no limit" for AXResultsLimit. const int kAXResultsLimitNoLimit = -1; @@ -147,7 +147,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe extern "C" { // The following are private accessibility APIs required for cursor navigation -@@ -470,6 +473,7 @@ void AddMisspelledTextAttributes(const AXPlatformRange& ax_range, +@@ -470,6 +473,7 @@ NSAttributedString* GetAttributedTextForTextMarkerRange(id marker_range) { AddMisspelledTextAttributes(ax_range, attributed_text); return attributed_text; } @@ -155,7 +155,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Returns an autoreleased copy of the AXNodeData's attribute. NSString* NSStringForStringAttribute(BrowserAccessibility* browserAccessibility, -@@ -727,6 +731,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) { +@@ -727,6 +731,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired"; #define NSAccessibilityLanguageAttribute @"AXLanguage" #endif @@ -163,7 +163,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe bool content::IsAXTextMarker(id object) { if (object == nil) return false; -@@ -770,6 +775,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) { +@@ -770,6 +775,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { kCFAllocatorDefault, anchor_textmarker, focus_textmarker); return [static_cast(cf_marker_range) autorelease]; } @@ -171,7 +171,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe @implementation BrowserAccessibilityCocoa -@@ -807,7 +813,9 @@ + (void)initialize { +@@ -807,7 +813,9 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { {NSAccessibilityEditableAncestorAttribute, @"editableAncestor"}, {NSAccessibilityElementBusyAttribute, @"elementBusy"}, {NSAccessibilityEnabledAttribute, @"enabled"}, @@ -181,7 +181,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe {NSAccessibilityExpandedAttribute, @"expanded"}, {NSAccessibilityFocusableAncestorAttribute, @"focusableAncestor"}, {NSAccessibilityFocusedAttribute, @"focused"}, -@@ -819,8 +827,10 @@ + (void)initialize { +@@ -819,8 +827,10 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { {NSAccessibilityHighestEditableAncestorAttribute, @"highestEditableAncestor"}, {NSAccessibilityIndexAttribute, @"index"}, @@ -192,7 +192,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe {NSAccessibilityInvalidAttribute, @"invalid"}, {NSAccessibilityIsMultiSelectableAttribute, @"isMultiSelectable"}, {NSAccessibilityLanguageAttribute, @"language"}, -@@ -842,13 +852,17 @@ + (void)initialize { +@@ -842,13 +852,17 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { {NSAccessibilityRowsAttribute, @"rows"}, // TODO(aboxhall): expose // NSAccessibilityServesAsTitleForUIElementsAttribute @@ -210,7 +210,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe {NSAccessibilitySizeAttribute, @"size"}, {NSAccessibilitySortDirectionAttribute, @"sortDirection"}, {NSAccessibilitySubroleAttribute, @"subrole"}, -@@ -1336,6 +1350,7 @@ - (NSNumber*)enabled { +@@ -1336,6 +1350,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { ax::mojom::Restriction::kDisabled]; } @@ -218,7 +218,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Returns a text marker that points to the last character in the document that // can be selected with VoiceOver. - (id)endTextMarker { -@@ -1346,6 +1361,7 @@ - (id)endTextMarker { +@@ -1346,6 +1361,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); return CreateTextMarker(position->CreatePositionAtEndOfAnchor()); } @@ -226,7 +226,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe - (NSNumber*)expanded { if (![self instanceActive]) -@@ -1495,6 +1511,8 @@ - (NSNumber*)index { +@@ -1495,6 +1511,8 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return nil; } @@ -235,7 +235,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe - (NSNumber*)insertionPointLineNumber { if (![self instanceActive]) return nil; -@@ -1517,6 +1535,7 @@ - (NSNumber*)insertionPointLineNumber { +@@ -1517,6 +1535,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { caretPosition->AsTextPosition()->text_offset()); return @(std::distance(lineBreaks.begin(), iterator)); } @@ -243,7 +243,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Returns whether or not this node should be ignored in the // accessibility tree. -@@ -2193,6 +2212,7 @@ - (NSArray*)selectedChildren { +@@ -2193,6 +2212,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return ret; } @@ -251,7 +251,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe - (NSString*)selectedText { if (![self instanceActive]) return nil; -@@ -2204,11 +2224,13 @@ - (NSString*)selectedText { +@@ -2204,11 +2224,13 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return nil; return base::SysUTF16ToNSString(range.GetText()); } @@ -265,7 +265,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe - (NSValue*)selectedTextRange { if (![self instanceActive]) return nil; -@@ -2229,12 +2251,15 @@ - (NSValue*)selectedTextRange { +@@ -2229,12 +2251,15 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { int selLength = range.GetText().length(); return [NSValue valueWithRange:NSMakeRange(selStart, selLength)]; } @@ -281,7 +281,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe - (NSValue*)size { if (![self instanceActive]) -@@ -2267,6 +2292,7 @@ - (NSString*)sortDirection { +@@ -2267,6 +2292,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return nil; } @@ -289,7 +289,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Returns a text marker that points to the first character in the document that // can be selected with VoiceOver. - (id)startTextMarker { -@@ -2277,6 +2303,7 @@ - (id)startTextMarker { +@@ -2277,6 +2303,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); return CreateTextMarker(position->CreatePositionAtStartOfAnchor()); } @@ -297,7 +297,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe // Returns a subrole based upon the role. - (NSString*)subrole { -@@ -2599,11 +2626,13 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range { +@@ -2599,11 +2626,13 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { NSMutableAttributedString* attributedInnerText = [[[NSMutableAttributedString alloc] initWithString:base::SysUTF16ToNSString(innerText)] autorelease]; @@ -311,7 +311,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe return [attributedInnerText attributedSubstringFromRange:range]; } -@@ -2707,9 +2736,8 @@ - (id)accessibilityAttributeValue:(NSString*)attribute +@@ -2707,9 +2736,8 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return ToBrowserAccessibilityCocoa(cell); } @@ -323,7 +323,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe BrowserAccessibilityPositionInstance position = CreatePositionFromTextMarker(parameter); if (!position->IsNullPosition()) -@@ -3022,6 +3050,7 @@ AXPlatformRange range(std::move(lineStartPosition), +@@ -3022,6 +3050,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return CreateTextMarker(root->CreatePositionAt(index)); } @@ -331,7 +331,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe if ([attribute isEqualToString: NSAccessibilityBoundsForRangeParameterizedAttribute]) { -@@ -3057,6 +3086,7 @@ AXPlatformRange range(std::move(lineStartPosition), +@@ -3057,6 +3086,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return nil; } @@ -339,7 +339,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe if ([attribute isEqualToString: NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) { -@@ -3171,6 +3201,7 @@ AXPlatformRange range(std::move(lineStartPosition), +@@ -3171,6 +3201,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) { return @(child->GetIndexInParent()); } @@ -351,7 +351,7 @@ diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm index 83d0106f0f237dea75dfafe011bf527d97240d0d..462577a0dbd0fcc1baf17acd9678317cb27503fa 100644 --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm -@@ -525,6 +525,7 @@ void PostAnnouncementNotification(NSString* announcement) { +@@ -525,6 +525,7 @@ NSDictionary* BrowserAccessibilityManagerMac:: [user_info setObject:native_focus_object forKey:NSAccessibilityTextChangeElement]; @@ -359,7 +359,7 @@ index 83d0106f0f237dea75dfafe011bf527d97240d0d..462577a0dbd0fcc1baf17acd9678317c id selected_text = [native_focus_object selectedTextMarkerRange]; if (selected_text) { NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute = -@@ -532,6 +533,7 @@ void PostAnnouncementNotification(NSString* announcement) { +@@ -532,6 +533,7 @@ NSDictionary* BrowserAccessibilityManagerMac:: [user_info setObject:selected_text forKey:NSAccessibilitySelectedTextMarkerRangeAttribute]; } @@ -383,7 +383,7 @@ index 28ca1646af0b0cce40d27baec71cbe65adc334fa..bae65c1f485bc02eb9ef2ebf7018af4a namespace content { -@@ -22,6 +24,7 @@ +@@ -22,6 +24,7 @@ namespace { // verifies there are no existing open connections), and then indicates that // Chrome should continue execution without access to launchservicesd. void DisableSystemServices() { @@ -411,7 +411,7 @@ index b29b68be6fa6b0329ed03c2d9011690c5e6f83c5..3a8aca70701534d19cdf1655da188114 extern "C" { // Undocumented IOBluetooth Preference API [1]. Used by `blueutil` [2] and // `Karabiner` [3] to programmatically control the Bluetooth state. Calling the -@@ -49,6 +50,7 @@ +@@ -49,6 +50,7 @@ extern "C" { // [4] https://support.apple.com/kb/PH25091 void IOBluetoothPreferenceSetControllerPowerState(int state); } @@ -419,7 +419,7 @@ index b29b68be6fa6b0329ed03c2d9011690c5e6f83c5..3a8aca70701534d19cdf1655da188114 namespace { -@@ -118,8 +120,10 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) { +@@ -118,8 +120,10 @@ BluetoothAdapterMac::BluetoothAdapterMac() controller_state_function_( base::BindRepeating(&BluetoothAdapterMac::GetHostControllerState, base::Unretained(this))), @@ -430,7 +430,7 @@ index b29b68be6fa6b0329ed03c2d9011690c5e6f83c5..3a8aca70701534d19cdf1655da188114 should_update_name_(true), classic_discovery_manager_( BluetoothDiscoveryManagerMac::CreateClassic(this)), -@@ -304,8 +308,12 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) { +@@ -304,8 +308,12 @@ base::WeakPtr BluetoothAdapterMac::GetWeakPtr() { } bool BluetoothAdapterMac::SetPoweredImpl(bool powered) { From f91c1ab1628a60695f59e542920f2ff4ef8084fb Mon Sep 17 00:00:00 2001 From: Deepak Mohan Date: Thu, 2 Jul 2020 15:09:40 -0700 Subject: [PATCH 50/79] fixup! Reland "[base] Stop including check.h, notreached.h, etc. in logging.h" --- shell/browser/notifications/win/notification_presenter_win.cc | 1 + .../desktop_notification_controller.cc | 1 + .../notifications/win/win32_desktop_notifications/toast.h | 2 +- .../notifications/win/win32_desktop_notifications/toast_uia.cc | 3 +++ shell/browser/relauncher_win.cc | 1 + shell/browser/ui/win/jump_list.cc | 1 + shell/browser/ui/win/notify_icon.cc | 1 + shell/browser/ui/win/notify_icon_host.cc | 1 + shell/common/application_info_win.cc | 1 + 9 files changed, 11 insertions(+), 1 deletion(-) diff --git a/shell/browser/notifications/win/notification_presenter_win.cc b/shell/browser/notifications/win/notification_presenter_win.cc index d9303c3183e0b..bacf04481f5eb 100644 --- a/shell/browser/notifications/win/notification_presenter_win.cc +++ b/shell/browser/notifications/win/notification_presenter_win.cc @@ -13,6 +13,7 @@ #include "base/environment.h" #include "base/files/file_util.h" #include "base/hash/md5.h" +#include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" #include "base/time/time.h" diff --git a/shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc b/shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc index 4af49f7b27ce7..74fa6a5f3e43e 100644 --- a/shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc +++ b/shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.cc @@ -17,6 +17,7 @@ #include #include +#include "base/check.h" #include "shell/browser/notifications/win/win32_desktop_notifications/common.h" #include "shell/browser/notifications/win/win32_desktop_notifications/toast.h" diff --git a/shell/browser/notifications/win/win32_desktop_notifications/toast.h b/shell/browser/notifications/win/win32_desktop_notifications/toast.h index e041b105e5590..869eb13a7dac0 100644 --- a/shell/browser/notifications/win/win32_desktop_notifications/toast.h +++ b/shell/browser/notifications/win/win32_desktop_notifications/toast.h @@ -9,7 +9,7 @@ #include "shell/browser/notifications/win/win32_desktop_notifications/desktop_notification_controller.h" -#include "base/logging.h" +#include "base/check.h" namespace electron { diff --git a/shell/browser/notifications/win/win32_desktop_notifications/toast_uia.cc b/shell/browser/notifications/win/win32_desktop_notifications/toast_uia.cc index edc81399ec223..29afb7f22b6aa 100644 --- a/shell/browser/notifications/win/win32_desktop_notifications/toast_uia.cc +++ b/shell/browser/notifications/win/win32_desktop_notifications/toast_uia.cc @@ -3,7 +3,10 @@ // found in the LICENSE file. #include "shell/browser/notifications/win/win32_desktop_notifications/toast_uia.h" + #include + +#include "base/check_op.h" #include "shell/browser/notifications/win/win32_desktop_notifications/common.h" #pragma comment(lib, "uiautomationcore.lib") diff --git a/shell/browser/relauncher_win.cc b/shell/browser/relauncher_win.cc index b0cc2e03b6e9b..cd3e703de3bfc 100644 --- a/shell/browser/relauncher_win.cc +++ b/shell/browser/relauncher_win.cc @@ -6,6 +6,7 @@ #include +#include "base/logging.h" #include "base/process/launch.h" #include "base/strings/stringprintf.h" #include "base/win/scoped_handle.h" diff --git a/shell/browser/ui/win/jump_list.cc b/shell/browser/ui/win/jump_list.cc index 2ef4c46f2cbe2..25b07b004d5b4 100644 --- a/shell/browser/ui/win/jump_list.cc +++ b/shell/browser/ui/win/jump_list.cc @@ -6,6 +6,7 @@ #include // for PKEY_* constants +#include "base/logging.h" #include "base/win/scoped_co_mem.h" #include "base/win/scoped_propvariant.h" #include "base/win/win_util.h" diff --git a/shell/browser/ui/win/notify_icon.cc b/shell/browser/ui/win/notify_icon.cc index 3c3c17cf35636..bf7800f035995 100644 --- a/shell/browser/ui/win/notify_icon.cc +++ b/shell/browser/ui/win/notify_icon.cc @@ -7,6 +7,7 @@ #include #include +#include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/win/windows_version.h" diff --git a/shell/browser/ui/win/notify_icon_host.cc b/shell/browser/ui/win/notify_icon_host.cc index 73de060fc395f..a7286509c87c2 100644 --- a/shell/browser/ui/win/notify_icon_host.cc +++ b/shell/browser/ui/win/notify_icon_host.cc @@ -8,6 +8,7 @@ #include #include "base/bind.h" +#include "base/logging.h" #include "base/stl_util.h" #include "base/win/win_util.h" #include "base/win/wrapped_window_proc.h" diff --git a/shell/common/application_info_win.cc b/shell/common/application_info_win.cc index ef2aa0c9eb419..e34f88d4b06c1 100644 --- a/shell/common/application_info_win.cc +++ b/shell/common/application_info_win.cc @@ -13,6 +13,7 @@ #include #include "base/file_version_info.h" +#include "base/notreached.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" From d8b2ec85f7b707bdeb6c0a712ebfe51fb7910cd6 Mon Sep 17 00:00:00 2001 From: Deepak Mohan Date: Thu, 2 Jul 2020 15:37:51 -0700 Subject: [PATCH 51/79] fix build on windows --- shell/utility/electron_content_utility_client.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/utility/electron_content_utility_client.h b/shell/utility/electron_content_utility_client.h index d111cfcbb59e3..621a7c1eb1d23 100644 --- a/shell/utility/electron_content_utility_client.h +++ b/shell/utility/electron_content_utility_client.h @@ -15,7 +15,7 @@ #include "printing/buildflags/buildflags.h" namespace printing { -class PrintHandler; +class PrintingHandler; } namespace electron { From 3d45d7b78c0f1492aba0ccf626b10c9f47736c5a Mon Sep 17 00:00:00 2001 From: Deepak Mohan Date: Thu, 2 Jul 2020 15:38:02 -0700 Subject: [PATCH 52/79] Check for GDI exhaustion if window creation fails https://chromium-review.googlesource.com/c/chromium/src/+/2244124 --- shell/browser/api/electron_api_power_monitor_win.cc | 3 ++- shell/browser/api/electron_api_system_preferences_win.cc | 3 ++- shell/browser/ui/win/notify_icon_host.cc | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/shell/browser/api/electron_api_power_monitor_win.cc b/shell/browser/api/electron_api_power_monitor_win.cc index 5ffbfc962fa01..97c1cca216832 100644 --- a/shell/browser/api/electron_api_power_monitor_win.cc +++ b/shell/browser/api/electron_api_power_monitor_win.cc @@ -7,6 +7,7 @@ #include #include +#include "base/win/windows_types.h" #include "base/win/wrapped_window_proc.h" #include "ui/base/win/shell.h" #include "ui/gfx/win/hwnd_util.h" @@ -34,7 +35,7 @@ void PowerMonitor::InitPlatformSpecificMonitors() { // session lock and unlock events. window_ = CreateWindow(MAKEINTATOM(atom_), 0, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, instance_, 0); - gfx::CheckWindowCreated(window_); + gfx::CheckWindowCreated(window_, ::GetLastError()); gfx::SetWindowUserData(window_, this); // Tel windows we want to be notified with session events diff --git a/shell/browser/api/electron_api_system_preferences_win.cc b/shell/browser/api/electron_api_system_preferences_win.cc index 23f8f33fd239f..b106bd43c4a22 100644 --- a/shell/browser/api/electron_api_system_preferences_win.cc +++ b/shell/browser/api/electron_api_system_preferences_win.cc @@ -10,6 +10,7 @@ #include "shell/browser/api/electron_api_system_preferences.h" #include "base/win/core_winrt_util.h" +#include "base/win/windows_types.h" #include "base/win/wrapped_window_proc.h" #include "shell/common/color_util.h" #include "ui/base/win/shell.h" @@ -209,7 +210,7 @@ void SystemPreferences::InitializeWindow() { // receive broadcast messages like "WM_DWMCOLORIZATIONCOLORCHANGED". window_ = CreateWindow(MAKEINTATOM(atom_), 0, WS_POPUP, 0, 0, 0, 0, 0, 0, instance_, 0); - gfx::CheckWindowCreated(window_); + gfx::CheckWindowCreated(window_, ::GetLastError()); gfx::SetWindowUserData(window_, this); } diff --git a/shell/browser/ui/win/notify_icon_host.cc b/shell/browser/ui/win/notify_icon_host.cc index a7286509c87c2..54ced5d7ac763 100644 --- a/shell/browser/ui/win/notify_icon_host.cc +++ b/shell/browser/ui/win/notify_icon_host.cc @@ -11,6 +11,7 @@ #include "base/logging.h" #include "base/stl_util.h" #include "base/win/win_util.h" +#include "base/win/windows_types.h" #include "base/win/wrapped_window_proc.h" #include "shell/browser/ui/win/notify_icon.h" #include "ui/events/event_constants.h" @@ -69,7 +70,7 @@ NotifyIconHost::NotifyIconHost() { // "TaskbarCreated". window_ = CreateWindow(MAKEINTATOM(atom_), 0, WS_POPUP, 0, 0, 0, 0, 0, 0, instance_, 0); - gfx::CheckWindowCreated(window_); + gfx::CheckWindowCreated(window_, ::GetLastError()); gfx::SetWindowUserData(window_, this); } From 55581a50d717dfd2dc91fae9b165cf40902dc4f2 Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Fri, 3 Jul 2020 06:01:04 -0700 Subject: [PATCH 53/79] chore: bump chromium in DEPS to 2c9b2a73be4ef9ec22d8b6da8e174cb80753f125 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 8e969abbc4ced..3333df617739d 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - 'a837d4c4230ace4f10b2768728f4044b7995dfa5', + '2c9b2a73be4ef9ec22d8b6da8e174cb80753f125', 'node_version': 'v12.18.1', 'nan_version': From 01abab276ce5741ef4c51b95521a3015edab8696 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Fri, 3 Jul 2020 17:48:37 -0700 Subject: [PATCH 54/79] chore: update patches --- patches/chromium/add_didinstallconditionalfeatures.patch | 4 ++-- patches/chromium/blink_local_frame.patch | 2 +- patches/chromium/blink_world_context.patch | 2 +- patches/chromium/can_create_window.patch | 2 +- ...e_electron_resources_not_chrome_for_spellchecker.patch | 4 ++-- patches/chromium/disable_color_correct_rendering.patch | 4 ++-- ...abling_blink_scheduler_throttling_per_renderview.patch | 6 +++--- patches/chromium/frame_host_manager.patch | 8 ++++---- .../revert_remove_contentrendererclient_shouldfork.patch | 6 +++--- patches/chromium/worker_context_will_destroy.patch | 8 ++++---- patches/v8/build_gn.patch | 6 +++--- .../v8/do_not_export_private_v8_symbols_on_windows.patch | 2 +- patches/v8/expose_mksnapshot.patch | 4 ++-- 13 files changed, 29 insertions(+), 29 deletions(-) diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index 21680bf66a0f5..2a3f46a6c576e 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -23,10 +23,10 @@ index 4e195f960d7b9bf50f6784ce380a84a10867914f..dbf85ffe8504bdbab1c4c29f085e5307 int32_t world_id) {} virtual void DidClearWindowObject() {} diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 9a2dcfcd552a1e8caab8f720d559dbc7a2867b7d..7a33f8a3baa6fc2e6a11490c23ec778556b59719 100644 +index d16bee3c72be38520ef4bd611b5224d64d86d7de..0d3e1b362ae3a30d87e93cafb846bf7e7e7cdc87 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4716,6 +4716,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, +@@ -4807,6 +4807,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, observer.DidCreateScriptContext(context, world_id); } diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch index b5b689611e1ed..d182c998148a5 100644 --- a/patches/chromium/blink_local_frame.patch +++ b/patches/chromium/blink_local_frame.patch @@ -14,7 +14,7 @@ when there is code doing that. This patch reverts the change to fix the crash in Electron. diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc -index 603a8f9862adfe6d8e015b34c2bb7e267f718a7b..8597c67f6c8f0d663654f7858901707d8e700867 100644 +index 3676f88459be1d78a6113b6ebd2954ef5f35059d..adf096460fc8fe000e24cba681b5edb05d168a65 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc @@ -539,10 +539,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { diff --git a/patches/chromium/blink_world_context.patch b/patches/chromium/blink_world_context.patch index 92ad8e0487c9c..d2be10e2d4428 100644 --- a/patches/chromium/blink_world_context.patch +++ b/patches/chromium/blink_world_context.patch @@ -20,7 +20,7 @@ index 198a934c8d9613eb612e6a8cb94d04e27a4dd021..abae04fec8e99d89a548020d50f3d8ab // Executes script in the context of the current page and returns the value // that the script evaluated to with callback. Script execution can be 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 5262720d87036af0b1f64cc42a810288436934d1..3295d0ec6904693060fe91729173f70433e2adb9 100644 +index 9c408af7829361852fdf16e66b3c2aa30cd086a2..fbe05a3512440d9f23ce34765eee103921f47a10 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 @@ -972,6 +972,13 @@ v8::Local WebLocalFrameImpl::GlobalProxy() const { diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index 9279e48fce695..8435b331a8a5d 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -9,7 +9,7 @@ potentially prevent a window from being created. TODO(loc): this patch is currently broken. diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc -index 2b58ad65bf2d87fcbaf889c32a2d5efa86abff4a..29bc91a5f9fcddf246399afdeafdf307a36ea617 100644 +index a52b92cad9aa7a2fe1b9dcdb26431c6e0798c367..00318db91e09397a82b384f6de8a14d179f702f3 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc @@ -4791,6 +4791,7 @@ void RenderFrameHostImpl::CreateNewWindow( diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch index e715b33531eb3..edf4b1f260645 100644 --- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch +++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch @@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from Electrons grit header instead of Chromes diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 68f7b98d4aad50db116cfd1789a4517c45dae610..3a9e5db308fa6601b5e8d8aaf7e4ce9f6ec89b5b 100644 +index fd71f270a6d779b77df009b25527dd1145461087..011e543c0dd616745c8c32303935a8095da42182 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -5534,6 +5534,7 @@ static_library("browser") { +@@ -5532,6 +5532,7 @@ static_library("browser") { deps += [ "//components/spellcheck/browser", "//components/spellcheck/common", diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch index cb3d3741f2551..04a3f6c284569 100644 --- a/patches/chromium/disable_color_correct_rendering.patch +++ b/patches/chromium/disable_color_correct_rendering.patch @@ -20,10 +20,10 @@ to deal with color spaces. That is being tracked at https://crbug.com/634542 and https://crbug.com/711107. diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc -index eeab47ebc93b9a75775faee87037049541f71dd6..54c3d886a18d25f02e37686dca123d9256a5af34 100644 +index f8e2c6cabeb1c04cf1c460f8698aebd1ed551780..e0f636e86e1afc5b7272df16a19147e298b1095d 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc -@@ -1862,6 +1862,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw( +@@ -1863,6 +1863,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw( gfx::ColorSpace LayerTreeHostImpl::GetRasterColorSpace( gfx::ContentColorUsage content_color_usage) const { diff --git a/patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch index f5289994fd258..96a4e63175662 100644 --- a/patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch +++ b/patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch @@ -111,10 +111,10 @@ index baa1cec07522a23221b146165a638d3f679f9817..50f0c46c8fcbb4ee8ebb316f859f84d0 // Visibility ----------------------------------------------------------- diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc -index 27adaed62fe204202b4716cd573165b7456dbd29..56434ba48eb3af50ea965e24338dd70780952f19 100644 +index ee2a4ab93dc4e774709cedfe7840c15d326a627f..9be53e2e26044062dd2b0df9b20c9f039b600515 100644 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -3368,6 +3368,13 @@ PageScheduler* WebViewImpl::Scheduler() const { +@@ -3369,6 +3369,13 @@ PageScheduler* WebViewImpl::Scheduler() const { return GetPage()->GetPageScheduler(); } @@ -128,7 +128,7 @@ index 27adaed62fe204202b4716cd573165b7456dbd29..56434ba48eb3af50ea965e24338dd707 void WebViewImpl::SetVisibilityState( mojom::blink::PageVisibilityState visibility_state, bool is_initial_state) { -@@ -3378,7 +3385,8 @@ void WebViewImpl::SetVisibilityState( +@@ -3379,7 +3386,8 @@ void WebViewImpl::SetVisibilityState( } GetPage()->SetVisibilityState(visibility_state, is_initial_state); GetPage()->GetPageScheduler()->SetPageVisible( diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index 89470914124b3..108e68a085050 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -42,10 +42,10 @@ index 6b03c07316eaab83a50afc123fc9f17b1c1dfa3b..e821571731e4e1a93f873477c7410de7 // another SiteInstance for the same site. void RegisterSiteInstance(SiteInstanceImpl* site_instance); diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc -index f279669b0ef94c178ac6950748ddeb551a5c41e0..92926d8cb46f1643881b92b8b027811f38b923de 100644 +index 3292b11834007d061b14fb84f1191b635672ab4f..0b62a799ed77404f18a66108400a5a8e14c60136 100644 --- a/content/browser/frame_host/navigation_request.cc +++ b/content/browser/frame_host/navigation_request.cc -@@ -1415,6 +1415,21 @@ void NavigationRequest::BeginNavigation() { +@@ -1411,6 +1411,21 @@ void NavigationRequest::BeginNavigation() { // it immediately. EnterChildTraceEvent("ResponseStarted", this); @@ -67,7 +67,7 @@ index f279669b0ef94c178ac6950748ddeb551a5c41e0..92926d8cb46f1643881b92b8b027811f // Select an appropriate RenderFrameHost. render_frame_host_ = frame_tree_node_->render_manager()->GetFrameHostForNavigation(this); -@@ -4823,6 +4838,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { +@@ -4812,6 +4827,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { {WILL_START_REQUEST, { WILL_REDIRECT_REQUEST, WILL_PROCESS_RESPONSE, @@ -75,7 +75,7 @@ index f279669b0ef94c178ac6950748ddeb551a5c41e0..92926d8cb46f1643881b92b8b027811f READY_TO_COMMIT, DID_COMMIT, CANCELING, -@@ -4836,10 +4852,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { +@@ -4825,10 +4841,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { WILL_FAIL_REQUEST, }}, {WILL_PROCESS_RESPONSE, { diff --git a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch index 95fc36f6067c6..49614f7561290 100644 --- a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch +++ b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch @@ -9,7 +9,7 @@ for every navigation to keep Node.js working properly. Once Native Modules in th are required to be NAPI or context aware (Electron v11), this patch can be removed. diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc -index 08d7b045b83d6dfc50fc8e48e8c1e2c81b390e20..78e18e18a122e870337467c5593ae4d0f74fa94e 100644 +index c37c8d441cacd853b1e8572fb806f72004e2bcb8..de3e62cbdd1f69d89e31bb4d737dbbc0cfb6036d 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -1312,6 +1312,25 @@ bool ChromeContentRendererClient::AllowPopup() { @@ -92,10 +92,10 @@ index d57edc0cea54b9d78700c3b9acdcfcc5f17341dd..e56aae188d7d8f46a4438b8e99f7e9b7 // |url|. If the function returns a valid |new_url|, the request must be // updated to use it. The |force_ignore_site_for_cookies| output parameter diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 7a33f8a3baa6fc2e6a11490c23ec778556b59719..2f65b8cfbf479842c0671675e5e05586e92f0d0c 100644 +index 0d3e1b362ae3a30d87e93cafb846bf7e7e7cdc87..06418ef7322b36c371eff1bacf712f6848f9f452 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -5459,6 +5459,23 @@ void RenderFrameImpl::BeginNavigation( +@@ -5550,6 +5550,23 @@ void RenderFrameImpl::BeginNavigation( // we can do a per-frame check here rather than a process-wide check. bool should_fork = HasWebUIScheme(url) || HasWebUIScheme(old_url) || (enabled_bindings_ & kWebUIBindingsPolicyMask); diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch index 5fcc5cf6bf529..f2825f667b6fd 100644 --- a/patches/chromium/worker_context_will_destroy.patch +++ b/patches/chromium/worker_context_will_destroy.patch @@ -26,10 +26,10 @@ index f6d2f50e8d6b4a5df796f2d4478ccd3048101532..d57edc0cea54b9d78700c3b9acdcfcc5 // 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 d6ca67dfd5e41a0c0b7744fae9ba505bb0c8bc19..d1e60e62e22b545c6fcb7b23740553e943be6a6f 100644 +index 8125049571b659c6e97a5c9f74c83b066fe6a065..cdaebe4bd0e56ab4c85c42db22472cf51e6804f5 100644 --- a/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc -@@ -864,6 +864,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { +@@ -847,6 +847,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread(); } @@ -43,10 +43,10 @@ index d6ca67dfd5e41a0c0b7744fae9ba505bb0c8bc19..d1e60e62e22b545c6fcb7b23740553e9 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 abffee3fcfa09275b24480da78b6f8fdfd5fda34..f793fcedce766171c6ac300f055d643711f8191e 100644 +index e0445de9d3a322dca1088cf4c6dfe501f09f6dee..223d52732f2fa2774dbbeae5059b378e50528afd 100644 --- a/content/renderer/renderer_blink_platform_impl.h +++ b/content/renderer/renderer_blink_platform_impl.h -@@ -189,6 +189,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { +@@ -188,6 +188,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { void DidStartWorkerThread() override; void WillStopWorkerThread() override; void WorkerContextCreated(const v8::Local& worker) override; diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch index 6c60169e2b1d8..b71da05732a7d 100644 --- a/patches/v8/build_gn.patch +++ b/patches/v8/build_gn.patch @@ -9,7 +9,7 @@ necessary for native modules to load. Also, some fixes relating to mksnapshot on ARM. diff --git a/BUILD.gn b/BUILD.gn -index ba52654401d98f34e2ca0de83139460292a52add..6b038b17ef772a66fcebad094218fdc47dfa6931 100644 +index 62007a242f78e41da7bd306dc8e40648b30838b9..4947fdf848686e8ad64fbcee12a64fe316a44c31 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -368,7 +368,7 @@ config("internal_config") { @@ -21,7 +21,7 @@ index ba52654401d98f34e2ca0de83139460292a52add..6b038b17ef772a66fcebad094218fdc4 defines += [ "BUILDING_V8_SHARED" ] } } -@@ -4325,7 +4325,7 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -4326,7 +4326,7 @@ if (current_toolchain == v8_generator_toolchain) { "src/interpreter/bytecodes.h", ] @@ -30,7 +30,7 @@ index ba52654401d98f34e2ca0de83139460292a52add..6b038b17ef772a66fcebad094218fdc4 deps = [ ":v8_libbase", -@@ -4358,6 +4358,8 @@ if (current_toolchain == v8_snapshot_toolchain) { +@@ -4359,6 +4359,8 @@ if (current_toolchain == v8_snapshot_toolchain) { configs = [ ":internal_config" ] diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch index b62b205c1ddca..505271ee428ea 100644 --- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch +++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch @@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not contain any standard C++ library exports (e.g. `std::ostringstream`). diff --git a/BUILD.gn b/BUILD.gn -index 9af9b50623a15cad7a66d13d874a88ef34428099..126faa3c579b2b962347333ec0cabf0d903191ab 100644 +index f3cc195e974b3b8185057c1bca373da04990b0fe..a301c4b17e96e702177b38f925425f4caec52da9 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -368,6 +368,10 @@ config("internal_config") { diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch index 20194418c5f9b..16fd396002c85 100644 --- a/patches/v8/expose_mksnapshot.patch +++ b/patches/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 6b038b17ef772a66fcebad094218fdc47dfa6931..9af9b50623a15cad7a66d13d874a88ef34428099 100644 +index 4947fdf848686e8ad64fbcee12a64fe316a44c31..f3cc195e974b3b8185057c1bca373da04990b0fe 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -4336,7 +4336,6 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -4337,7 +4337,6 @@ if (current_toolchain == v8_generator_toolchain) { if (current_toolchain == v8_snapshot_toolchain) { v8_executable("mksnapshot") { From d59326a1273def065b671190983b95264adfbc88 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Fri, 3 Jul 2020 21:04:23 -0700 Subject: [PATCH 55/79] Network Service: Move DeleteCookiePredicate into public folder https://chromium-review.googlesource.com/c/chromium/src/+/2264186 --- shell/browser/special_storage_policy.cc | 4 ++-- shell/browser/special_storage_policy.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/shell/browser/special_storage_policy.cc b/shell/browser/special_storage_policy.cc index 266999b4c4c50..37ab036c7969a 100644 --- a/shell/browser/special_storage_policy.cc +++ b/shell/browser/special_storage_policy.cc @@ -37,9 +37,9 @@ bool SpecialStoragePolicy::HasSessionOnlyOrigins() { return false; } -network::SessionCleanupCookieStore::DeleteCookiePredicate +network::DeleteCookiePredicate SpecialStoragePolicy::CreateDeleteCookieOnExitPredicate() { - return network::SessionCleanupCookieStore::DeleteCookiePredicate(); + return network::DeleteCookiePredicate(); } } // namespace electron diff --git a/shell/browser/special_storage_policy.h b/shell/browser/special_storage_policy.h index 0209361de1348..2dd9ff30cbb12 100644 --- a/shell/browser/special_storage_policy.h +++ b/shell/browser/special_storage_policy.h @@ -20,8 +20,7 @@ class SpecialStoragePolicy : public storage::SpecialStoragePolicy { bool HasIsolatedStorage(const GURL& origin) override; bool IsStorageSessionOnly(const GURL& origin) override; bool HasSessionOnlyOrigins() override; - network::SessionCleanupCookieStore::DeleteCookiePredicate - CreateDeleteCookieOnExitPredicate() override; + network::DeleteCookiePredicate CreateDeleteCookieOnExitPredicate() override; protected: ~SpecialStoragePolicy() override; From ac9139be798dd6f7db26664cd11649340dc8c3e8 Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Sat, 4 Jul 2020 06:00:47 -0700 Subject: [PATCH 56/79] chore: bump chromium in DEPS to fa2606299bcc02c362528d26b5dcf8c8a0db0735 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 3333df617739d..36bcd70b94f66 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - '2c9b2a73be4ef9ec22d8b6da8e174cb80753f125', + 'fa2606299bcc02c362528d26b5dcf8c8a0db0735', 'node_version': 'v12.18.1', 'nan_version': From b34d907ad7a84bc516caeec12a03ecf3aaa0c257 Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Sun, 5 Jul 2020 06:00:41 -0700 Subject: [PATCH 57/79] chore: bump chromium in DEPS to d9c235d1227204dbae3708daae851573a3566b94 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 36bcd70b94f66..8443b793ed45c 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - 'fa2606299bcc02c362528d26b5dcf8c8a0db0735', + 'd9c235d1227204dbae3708daae851573a3566b94', 'node_version': 'v12.18.1', 'nan_version': From 505314fe07453a1557dfa638c81153ba890a41eb Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Mon, 6 Jul 2020 06:00:55 -0700 Subject: [PATCH 58/79] chore: bump chromium in DEPS to 2f82c284243c035f49a747fd1ead6c44b4b31093 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 8443b793ed45c..e66cee7816380 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - 'd9c235d1227204dbae3708daae851573a3566b94', + '2f82c284243c035f49a747fd1ead6c44b4b31093', 'node_version': 'v12.18.1', 'nan_version': From 80ade6425832cd1cac3143a6d4d3a7cde60ff652 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Mon, 6 Jul 2020 08:30:39 -0700 Subject: [PATCH 59/79] chore: update patches --- .../add_didinstallconditionalfeatures.patch | 12 ++++---- patches/chromium/can_create_window.patch | 6 ++-- ...esources_not_chrome_for_spellchecker.patch | 4 +-- patches/chromium/dcheck.patch | 2 +- .../disable_color_correct_rendering.patch | 28 +++++++++---------- .../disable_compositor_recycling.patch | 2 +- patches/chromium/disable_hidden.patch | 2 +- ..._scheduler_throttling_per_renderview.patch | 2 +- patches/chromium/frame_host_manager.patch | 10 +++---- .../mas_disable_remote_accessibility.patch | 2 +- ...r_changes_to_the_webcontentsobserver.patch | 2 +- ...ove_contentrendererclient_shouldfork.patch | 4 +-- patches/chromium/scroll_bounce_flag.patch | 4 +-- .../worker_context_will_destroy.patch | 12 ++++---- patches/v8/build_gn.patch | 6 ++-- ...export_private_v8_symbols_on_windows.patch | 2 +- patches/v8/expose_mksnapshot.patch | 4 +-- 17 files changed, 52 insertions(+), 52 deletions(-) diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index 2a3f46a6c576e..9c83ede65efff 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -23,10 +23,10 @@ index 4e195f960d7b9bf50f6784ce380a84a10867914f..dbf85ffe8504bdbab1c4c29f085e5307 int32_t world_id) {} virtual void DidClearWindowObject() {} diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index d16bee3c72be38520ef4bd611b5224d64d86d7de..0d3e1b362ae3a30d87e93cafb846bf7e7e7cdc87 100644 +index 84e217f947a2fdfd7eddccacbe8b89ffeb60feee..cd44f325a8538923796e0211848086c1a5387df7 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4807,6 +4807,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, +@@ -4809,6 +4809,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, observer.DidCreateScriptContext(context, world_id); } @@ -40,10 +40,10 @@ index d16bee3c72be38520ef4bd611b5224d64d86d7de..0d3e1b362ae3a30d87e93cafb846bf7e int world_id) { for (auto& observer : observers_) diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h -index 78365c699b6ebd94a33c3cd59bcecd00de71739c..49ec071f8aab732aa9dd28271adf8ccb9920d8e1 100644 +index 6eb6b480b7b2a392d074e308ff2d5cc15b065362..2561811e6c9ee2bc9c1e95d712dd5a1458365395 100644 --- a/content/renderer/render_frame_impl.h +++ b/content/renderer/render_frame_impl.h -@@ -714,6 +714,8 @@ class CONTENT_EXPORT RenderFrameImpl +@@ -716,6 +716,8 @@ class CONTENT_EXPORT RenderFrameImpl bool ShouldTrackUseCounter(const blink::WebURL& url) override; void DidCreateScriptContext(v8::Local context, int world_id) override; @@ -53,10 +53,10 @@ index 78365c699b6ebd94a33c3cd59bcecd00de71739c..49ec071f8aab732aa9dd28271adf8ccb int world_id) override; void DidChangeScrollOffset() override; diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h -index fc03157647020be347aad4aa472a053c05b120d9..96684e567c16f12774eae67f08b2f4c3d8c23da3 100644 +index b5bdc8cf2e637010d18ec7d6f0334292964249c3..f4dd737d60da52c119527a7322a0db3757d7c03b 100644 --- a/third_party/blink/public/web/web_local_frame_client.h +++ b/third_party/blink/public/web/web_local_frame_client.h -@@ -546,6 +546,9 @@ class BLINK_EXPORT WebLocalFrameClient { +@@ -547,6 +547,9 @@ class BLINK_EXPORT WebLocalFrameClient { virtual void DidCreateScriptContext(v8::Local, int32_t world_id) {} diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index 8435b331a8a5d..60dd8e1a2f24d 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -9,10 +9,10 @@ potentially prevent a window from being created. TODO(loc): this patch is currently broken. diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc -index a52b92cad9aa7a2fe1b9dcdb26431c6e0798c367..00318db91e09397a82b384f6de8a14d179f702f3 100644 +index f3776faab74be00291af86e28b2730fbf29eeaaf..a17696d2b8e1c4daaf238983341e5a01e30d3149 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc -@@ -4791,6 +4791,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -4789,6 +4789,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, @@ -158,7 +158,7 @@ index c6a990f873066fec1ac7ce5e088ecd02d2142e71..272b613f658ef4bfa3869cbd17d342ce // 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 ac490ef585ba1d103a80314d80e84cf8d10ad3b7..9f090d636f5a516607280ddfc71d5630dd16afa2 100644 +index 9687f90b512a2cb63d17d088bc1444240a587818..a2ac61847eb6083a39f7d7934d15d71687e2f48c 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 @@ -386,6 +386,8 @@ bool WebTestContentBrowserClient::CanCreateWindow( diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch index edf4b1f260645..a7df3cc2fe0f2 100644 --- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch +++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch @@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from Electrons grit header instead of Chromes diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index fd71f270a6d779b77df009b25527dd1145461087..011e543c0dd616745c8c32303935a8095da42182 100644 +index b60dd2d35af1d1b40ec35e10801183018271b944..c68715c5d7a8901ac7c61b9fead0e83b9f757735 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -5532,6 +5532,7 @@ static_library("browser") { +@@ -5535,6 +5535,7 @@ static_library("browser") { deps += [ "//components/spellcheck/browser", "//components/spellcheck/common", diff --git a/patches/chromium/dcheck.patch b/patches/chromium/dcheck.patch index 16952860ead59..531ccab9967e9 100644 --- a/patches/chromium/dcheck.patch +++ b/patches/chromium/dcheck.patch @@ -17,7 +17,7 @@ only one or two specific checks fail. Then it's better to simply comment out the failing checks and allow the rest of the target to have them enabled. diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc -index cc12496fa0110adb06fb65b9d8afc4829f380200..f7ae3f782d6bdf94fba386c0d05f57f8364dba19 100644 +index 4d6d8e2e3ce2a169227a977f7b2ce8412b1f809e..fe3555acb698a795d48889ac95f1ae97987dccb0 100644 --- a/content/browser/frame_host/navigation_controller_impl.cc +++ b/content/browser/frame_host/navigation_controller_impl.cc @@ -1267,8 +1267,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation( diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch index 04a3f6c284569..d5737fe3aa1f7 100644 --- a/patches/chromium/disable_color_correct_rendering.patch +++ b/patches/chromium/disable_color_correct_rendering.patch @@ -250,20 +250,6 @@ index e5a82f46cd58b0da9959930ee85303e4a1530425..753b926fbe0c6a3ef2b2e244d7f80f4f network::switches::kExplicitlyAllowedPorts, service_manager::switches::kDisableInProcessStackTraces, service_manager::switches::kDisableSeccompFilterSandbox, -diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc -index 32d3c35466fc8210615cac02e12576903ce0abcc..34facef5e15d482e552f01612ad974471f9dc30c 100644 ---- a/content/renderer/render_widget.cc -+++ b/content/renderer/render_widget.cc -@@ -1902,6 +1902,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings( - settings.main_frame_before_activation_enabled = - cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation); - -+ settings.enable_color_correct_rendering = -+ !cmd.HasSwitch(switches::kDisableColorCorrectRendering); -+ - // Checkerimaging is not supported for synchronous single-threaded mode, which - // is what the renderer uses if its not threaded. - settings.enable_checker_imaging = diff --git a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc index 3dc0fb19b33daf14cbf8550cbb58e3e146830f26..da34be87f36c6e50286d0ef24cade53156f0a688 100644 --- a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc @@ -308,6 +294,20 @@ index 3dc0fb19b33daf14cbf8550cbb58e3e146830f26..da34be87f36c6e50286d0ef24cade531 return CanvasColorSpaceToGfxColorSpace(color_space_); } +diff --git a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc +index 43f047ee98c482cde3e1ea503623ead0b0a78215..a2f391f66f59a6522da77ce32b0735c8f3cc90f5 100644 +--- a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc ++++ b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc +@@ -176,6 +176,9 @@ cc::LayerTreeSettings GenerateLayerTreeSettings( + settings.main_frame_before_activation_enabled = + cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation); + ++ settings.enable_color_correct_rendering = ++ !cmd.HasSwitch(cc::switches::kDisableColorCorrectRendering); ++ + // Checkerimaging is not supported for synchronous single-threaded mode, which + // is what the renderer uses if its not threaded. + settings.enable_checker_imaging = diff --git a/ui/gfx/mac/io_surface.cc b/ui/gfx/mac/io_surface.cc index 2674784dca1ed12b2f5afc7b728e0c6e8cd6ca4a..93a9652b71d86441e15b87aafd7a6b1a13f45830 100644 --- a/ui/gfx/mac/io_surface.cc diff --git a/patches/chromium/disable_compositor_recycling.patch b/patches/chromium/disable_compositor_recycling.patch index 39536e69cffd3..f0f8c2b20b5da 100644 --- a/patches/chromium/disable_compositor_recycling.patch +++ b/patches/chromium/disable_compositor_recycling.patch @@ -6,7 +6,7 @@ Subject: fix: disabling compositor recycling Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron. 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 a595a18a7f5805bcfee9c2ffad1bf37411ea8d38..97be5122d2df9c8b95f3c59907528dde1d3003a6 100644 +index af8188e695f4e0750e00424c8f5dc490e329f245..7a36d453c7d357ddfe6fe39377cc1fbd8b19fb2d 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -478,7 +478,11 @@ void RenderWidgetHostViewMac::WasOccluded() { diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch index 199842a1998d8..d09b23162eb53 100644 --- a/patches/chromium/disable_hidden.patch +++ b/patches/chromium/disable_hidden.patch @@ -6,7 +6,7 @@ Subject: disable_hidden.patch Electron uses this to disable background throttling for hidden windows. diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc -index 23bdec473c0a7f8e487b104034e46545c7462784..44db58950f9c334aaea8a8fb1b076a53bbb53c97 100644 +index a864563445eebddb86dc6e5020fdd5e6ca4b7f4b..57b44076b0f387aa080963cceb57d678c151becb 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -667,6 +667,9 @@ void RenderWidgetHostImpl::WasHidden() { diff --git a/patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch index 96a4e63175662..2b9a438f77a06 100644 --- a/patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch +++ b/patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch @@ -6,7 +6,7 @@ Subject: feat: allow disabling blink scheduler throttling per RenderView This allows us to disable throttling for hidden windows. diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc -index e82b5722776f8053eb56db7b4b88dfd81c234d6c..b8c169c51d1cfb4099496de0ac0cd8945f415526 100644 +index ac344bb71b434861b4b800e5a36622f073e500b6..53806f887ee62b4c08a1b542c0e3aa4e65a812dd 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -512,6 +512,10 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) { diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index 108e68a085050..a53e693303766 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -42,10 +42,10 @@ index 6b03c07316eaab83a50afc123fc9f17b1c1dfa3b..e821571731e4e1a93f873477c7410de7 // another SiteInstance for the same site. void RegisterSiteInstance(SiteInstanceImpl* site_instance); diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc -index 3292b11834007d061b14fb84f1191b635672ab4f..0b62a799ed77404f18a66108400a5a8e14c60136 100644 +index 4dceb1598b911d2dc5a9b0ff4cdef617d98fe8a5..3359f68de7edf2dfb1935e6f7e7a2b7f017c55c5 100644 --- a/content/browser/frame_host/navigation_request.cc +++ b/content/browser/frame_host/navigation_request.cc -@@ -1411,6 +1411,21 @@ void NavigationRequest::BeginNavigation() { +@@ -1401,6 +1401,21 @@ void NavigationRequest::BeginNavigation() { // it immediately. EnterChildTraceEvent("ResponseStarted", this); @@ -67,7 +67,7 @@ index 3292b11834007d061b14fb84f1191b635672ab4f..0b62a799ed77404f18a66108400a5a8e // Select an appropriate RenderFrameHost. render_frame_host_ = frame_tree_node_->render_manager()->GetFrameHostForNavigation(this); -@@ -4812,6 +4827,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { +@@ -4799,6 +4814,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { {WILL_START_REQUEST, { WILL_REDIRECT_REQUEST, WILL_PROCESS_RESPONSE, @@ -75,7 +75,7 @@ index 3292b11834007d061b14fb84f1191b635672ab4f..0b62a799ed77404f18a66108400a5a8e READY_TO_COMMIT, DID_COMMIT, CANCELING, -@@ -4825,10 +4841,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { +@@ -4812,10 +4828,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { WILL_FAIL_REQUEST, }}, {WILL_PROCESS_RESPONSE, { @@ -91,7 +91,7 @@ index 3292b11834007d061b14fb84f1191b635672ab4f..0b62a799ed77404f18a66108400a5a8e NOT_STARTED, DID_COMMIT, diff --git a/content/browser/frame_host/navigation_request.h b/content/browser/frame_host/navigation_request.h -index 6941326796bb7e7b056ae0f83345edb2e4cb0479..8e8e1e6d994809159cf0433a4feeec85e68814f2 100644 +index b3853fd23d7b8a2179c1c2c4931fc0a87fca2d5c..240df49b1e7ea8a20034d05991f28cdab27a143c 100644 --- a/content/browser/frame_host/navigation_request.h +++ b/content/browser/frame_host/navigation_request.h @@ -142,6 +142,10 @@ class CONTENT_EXPORT NavigationRequest diff --git a/patches/chromium/mas_disable_remote_accessibility.patch b/patches/chromium/mas_disable_remote_accessibility.patch index eaee6a03dc313..2a75d30a977da 100644 --- a/patches/chromium/mas_disable_remote_accessibility.patch +++ b/patches/chromium/mas_disable_remote_accessibility.patch @@ -117,7 +117,7 @@ index d5610b3ff1a834b16115647c3530618887f2155b..2643eda13762d5605f42ce7c98133bf6 // Used to force the NSApplication's focused accessibility element to be the // content::BrowserAccessibilityCocoa accessibility tree when the NSView for 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 ef9d62e3031eddf3c346075a000c014665ddb1b0..a595a18a7f5805bcfee9c2ffad1bf37411ea8d38 100644 +index bca6e5fe1cb20ffba29fee5b5ec6856392fe3579..af8188e695f4e0750e00424c8f5dc490e329f245 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -233,8 +233,10 @@ RenderWidgetHostViewMac::~RenderWidgetHostViewMac() { diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch index a62d3f4981366..cc16f5bd88680 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -30,7 +30,7 @@ index 1feca3a3d2d13278a8c11038177caa661cbab22c..1ca75dc4b5228077f6658919b36004bc // RenderWidgetHost on the main frame, and false otherwise. virtual bool IsWidgetForMainFrame(RenderWidgetHostImpl*); diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc -index 44db58950f9c334aaea8a8fb1b076a53bbb53c97..74dcc48deeeaccf3b0e10fed894d29b322e40004 100644 +index 57b44076b0f387aa080963cceb57d678c151becb..db34c9c30a6501cf73c767bfd375f67a472b9fd8 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -1665,6 +1665,8 @@ void RenderWidgetHostImpl::SetCursor(const WebCursor& cursor) { diff --git a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch index 49614f7561290..56c165d685a18 100644 --- a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch +++ b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch @@ -92,10 +92,10 @@ index d57edc0cea54b9d78700c3b9acdcfcc5f17341dd..e56aae188d7d8f46a4438b8e99f7e9b7 // |url|. If the function returns a valid |new_url|, the request must be // updated to use it. The |force_ignore_site_for_cookies| output parameter diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 0d3e1b362ae3a30d87e93cafb846bf7e7e7cdc87..06418ef7322b36c371eff1bacf712f6848f9f452 100644 +index cd44f325a8538923796e0211848086c1a5387df7..e2ad803fa28e1a36e3e92eeb6c87f379edc6f4ad 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -5550,6 +5550,23 @@ void RenderFrameImpl::BeginNavigation( +@@ -5552,6 +5552,23 @@ void RenderFrameImpl::BeginNavigation( // we can do a per-frame check here rather than a process-wide check. bool should_fork = HasWebUIScheme(url) || HasWebUIScheme(old_url) || (enabled_bindings_ & kWebUIBindingsPolicyMask); diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch index 018bf2fa8838a..a019fb4515b01 100644 --- a/patches/chromium/scroll_bounce_flag.patch +++ b/patches/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 b15d29f05c80a6e6883cf2b5cad75ea8ca1c316a..0e3cfdca756351956b35554b8429dba0ca78516d 100644 +index f3b4253ab1c47f4c7bddad478ca9d9fd81081758..74f2daa84685057fcaa7d050c089a028a503e9f0 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -1359,7 +1359,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() { +@@ -1323,7 +1323,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() { } bool RenderThreadImpl::IsElasticOverscrollEnabled() { diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch index f2825f667b6fd..6dfc4f57d5f9e 100644 --- a/patches/chromium/worker_context_will_destroy.patch +++ b/patches/chromium/worker_context_will_destroy.patch @@ -26,10 +26,10 @@ index f6d2f50e8d6b4a5df796f2d4478ccd3048101532..d57edc0cea54b9d78700c3b9acdcfcc5 // 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 8125049571b659c6e97a5c9f74c83b066fe6a065..cdaebe4bd0e56ab4c85c42db22472cf51e6804f5 100644 +index eed85d02c39156e7de8d5973ae8546e0e62e9c47..52654538aaa433bea4ee36a93063c1f5102af46e 100644 --- a/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc -@@ -847,6 +847,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { +@@ -867,6 +867,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread(); } @@ -43,10 +43,10 @@ index 8125049571b659c6e97a5c9f74c83b066fe6a065..cdaebe4bd0e56ab4c85c42db22472cf5 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 e0445de9d3a322dca1088cf4c6dfe501f09f6dee..223d52732f2fa2774dbbeae5059b378e50528afd 100644 +index cd86eeaf6a01af98b7fb8681d49928cb1ecd1ba6..9bdd57b43cd7342568d9b32f2042f3aa1451e345 100644 --- a/content/renderer/renderer_blink_platform_impl.h +++ b/content/renderer/renderer_blink_platform_impl.h -@@ -188,6 +188,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { +@@ -192,6 +192,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { void DidStartWorkerThread() override; void WillStopWorkerThread() override; void WorkerContextCreated(const v8::Local& worker) override; @@ -55,10 +55,10 @@ index e0445de9d3a322dca1088cf4c6dfe501f09f6dee..223d52732f2fa2774dbbeae5059b378e const blink::WebString& header_name) override; diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h -index a2646329bf28c065c9910efbe5a3309d8a5d8e37..c79bcf9a04d7a0ce16a14ea0440067b4d0402c96 100644 +index 9351a302916a2cbeecf3a6a934aee0431127008c..754634fd4935cdf38168361f1491cf3aedaf8cdb 100644 --- a/third_party/blink/public/platform/platform.h +++ b/third_party/blink/public/platform/platform.h -@@ -623,6 +623,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -638,6 +638,7 @@ class BLINK_PLATFORM_EXPORT Platform { virtual void DidStartWorkerThread() {} virtual void WillStopWorkerThread() {} virtual void WorkerContextCreated(const v8::Local& worker) {} diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch index b71da05732a7d..cb6b533a110a2 100644 --- a/patches/v8/build_gn.patch +++ b/patches/v8/build_gn.patch @@ -9,7 +9,7 @@ necessary for native modules to load. Also, some fixes relating to mksnapshot on ARM. diff --git a/BUILD.gn b/BUILD.gn -index 62007a242f78e41da7bd306dc8e40648b30838b9..4947fdf848686e8ad64fbcee12a64fe316a44c31 100644 +index 1627676872ed1dec2c5162e2c299736c4815d659..1b4d22c93d96dd941f6133f0718eab626fa29e43 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -368,7 +368,7 @@ config("internal_config") { @@ -21,7 +21,7 @@ index 62007a242f78e41da7bd306dc8e40648b30838b9..4947fdf848686e8ad64fbcee12a64fe3 defines += [ "BUILDING_V8_SHARED" ] } } -@@ -4326,7 +4326,7 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -4328,7 +4328,7 @@ if (current_toolchain == v8_generator_toolchain) { "src/interpreter/bytecodes.h", ] @@ -30,7 +30,7 @@ index 62007a242f78e41da7bd306dc8e40648b30838b9..4947fdf848686e8ad64fbcee12a64fe3 deps = [ ":v8_libbase", -@@ -4359,6 +4359,8 @@ if (current_toolchain == v8_snapshot_toolchain) { +@@ -4361,6 +4361,8 @@ if (current_toolchain == v8_snapshot_toolchain) { configs = [ ":internal_config" ] diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch index 505271ee428ea..9eda5c5f2b59a 100644 --- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch +++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch @@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not contain any standard C++ library exports (e.g. `std::ostringstream`). diff --git a/BUILD.gn b/BUILD.gn -index f3cc195e974b3b8185057c1bca373da04990b0fe..a301c4b17e96e702177b38f925425f4caec52da9 100644 +index 8227e014946c0df2a46ce0c891260b01b1051b23..cfb97c1fb04a0a26994778116c4e2692dd081d1f 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -368,6 +368,10 @@ config("internal_config") { diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch index 16fd396002c85..0365cc8c74449 100644 --- a/patches/v8/expose_mksnapshot.patch +++ b/patches/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 4947fdf848686e8ad64fbcee12a64fe316a44c31..f3cc195e974b3b8185057c1bca373da04990b0fe 100644 +index 1b4d22c93d96dd941f6133f0718eab626fa29e43..8227e014946c0df2a46ce0c891260b01b1051b23 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -4337,7 +4337,6 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -4339,7 +4339,6 @@ if (current_toolchain == v8_generator_toolchain) { if (current_toolchain == v8_snapshot_toolchain) { v8_executable("mksnapshot") { From cc2a45fd4f59c9ab116a74efcc3e46522c7b2dcc Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Mon, 6 Jul 2020 09:58:42 -0700 Subject: [PATCH 60/79] Move creating the LayerTreeSettings into blink. https://chromium-review.googlesource.com/c/chromium/src/+/2267720 --- .../chromium/disable_color_correct_rendering.patch | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch index d5737fe3aa1f7..bc34edb39a96c 100644 --- a/patches/chromium/disable_color_correct_rendering.patch +++ b/patches/chromium/disable_color_correct_rendering.patch @@ -295,15 +295,23 @@ index 3dc0fb19b33daf14cbf8550cbb58e3e146830f26..da34be87f36c6e50286d0ef24cade531 } diff --git a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc -index 43f047ee98c482cde3e1ea503623ead0b0a78215..a2f391f66f59a6522da77ce32b0735c8f3cc90f5 100644 +index 43f047ee98c482cde3e1ea503623ead0b0a78215..254fd8490e1d9b59c6b056066bcbb9c779e6b6ff 100644 --- a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc +++ b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc -@@ -176,6 +176,9 @@ cc::LayerTreeSettings GenerateLayerTreeSettings( +@@ -23,6 +23,7 @@ + #include "third_party/blink/renderer/platform/runtime_enabled_features.h" + #include "ui/base/ui_base_features.h" + #include "ui/base/ui_base_switches.h" ++#include "ui/gfx/switches.h" + #include "ui/native_theme/native_theme_features.h" + #include "ui/native_theme/overlay_scrollbar_constants_aura.h" + +@@ -176,6 +177,9 @@ cc::LayerTreeSettings GenerateLayerTreeSettings( settings.main_frame_before_activation_enabled = cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation); + settings.enable_color_correct_rendering = -+ !cmd.HasSwitch(cc::switches::kDisableColorCorrectRendering); ++ !cmd.HasSwitch(::switches::kDisableColorCorrectRendering); + // Checkerimaging is not supported for synchronous single-threaded mode, which // is what the renderer uses if its not threaded. From 0f7e48cd0a31c1c88e5b78b13b0127b70e713377 Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Tue, 7 Jul 2020 06:01:17 -0700 Subject: [PATCH 61/79] chore: bump chromium in DEPS to 914112f1d9af9e4974059dc403da62699a55550f --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index e66cee7816380..c511dfbcffaa7 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - '2f82c284243c035f49a747fd1ead6c44b4b31093', + '914112f1d9af9e4974059dc403da62699a55550f', 'node_version': 'v12.18.1', 'nan_version': From 6db5825815ee6abea3c959f023e8c58f29ff9162 Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Tue, 7 Jul 2020 13:20:15 +0000 Subject: [PATCH 62/79] update patches --- .../add_didinstallconditionalfeatures.patch | 6 +++--- patches/chromium/blink_local_frame.patch | 6 +++--- patches/chromium/can_create_window.patch | 8 ++++---- ...n_resources_not_chrome_for_spellchecker.patch | 4 ++-- patches/chromium/dcheck.patch | 6 +++--- .../disable_color_correct_rendering.patch | 16 ++++++++-------- patches/chromium/frame_host_manager.patch | 2 +- patches/chromium/notification_provenance.patch | 4 ++-- ...rsor_changes_to_the_webcontentsobserver.patch | 4 ++-- ...remove_contentrendererclient_shouldfork.patch | 4 ++-- patches/chromium/scroll_bounce_flag.patch | 4 ++-- .../support_mixed_sandbox_with_zygote.patch | 10 +++++----- 12 files changed, 37 insertions(+), 37 deletions(-) diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index 9c83ede65efff..986ba316cb94b 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -23,10 +23,10 @@ index 4e195f960d7b9bf50f6784ce380a84a10867914f..dbf85ffe8504bdbab1c4c29f085e5307 int32_t world_id) {} virtual void DidClearWindowObject() {} diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 84e217f947a2fdfd7eddccacbe8b89ffeb60feee..cd44f325a8538923796e0211848086c1a5387df7 100644 +index ace1e38791738b6f4086dcbb134ada2dbbd57793..a025d8295cfb719f19ac65c5f00179cb72bd5841 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4809,6 +4809,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, +@@ -4741,6 +4741,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, observer.DidCreateScriptContext(context, world_id); } @@ -40,7 +40,7 @@ index 84e217f947a2fdfd7eddccacbe8b89ffeb60feee..cd44f325a8538923796e0211848086c1 int world_id) { for (auto& observer : observers_) diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h -index 6eb6b480b7b2a392d074e308ff2d5cc15b065362..2561811e6c9ee2bc9c1e95d712dd5a1458365395 100644 +index fbe1ae23b5b4e292f204155937635a97c7a56bd3..70282750517436dbbeb4ff0ebdecae88210e7006 100644 --- a/content/renderer/render_frame_impl.h +++ b/content/renderer/render_frame_impl.h @@ -716,6 +716,8 @@ class CONTENT_EXPORT RenderFrameImpl diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch index d182c998148a5..1f6717d0ee08b 100644 --- a/patches/chromium/blink_local_frame.patch +++ b/patches/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 3676f88459be1d78a6113b6ebd2954ef5f35059d..adf096460fc8fe000e24cba681b5edb05d168a65 100644 +index 518a5c0f4ce806b1fad3c944c6a10eea1c44b12d..658d0e33d7f89ec61fc213c0b5590b67915b29c1 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -539,10 +539,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { +@@ -546,10 +546,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { } CHECK(!view_ || !view_->IsAttached()); @@ -28,7 +28,7 @@ index 3676f88459be1d78a6113b6ebd2954ef5f35059d..adf096460fc8fe000e24cba681b5edb0 if (!Client()) return; -@@ -560,6 +556,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) { +@@ -567,6 +563,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/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index 60dd8e1a2f24d..0ba1e5a371f9f 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -9,10 +9,10 @@ potentially prevent a window from being created. TODO(loc): this patch is currently broken. diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc -index f3776faab74be00291af86e28b2730fbf29eeaaf..a17696d2b8e1c4daaf238983341e5a01e30d3149 100644 +index 532769df11e537bda63d8006fcc2ea5b1c6d6ea1..74c8907ad5779004bc0c698a183673e06e0272de 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc -@@ -4789,6 +4789,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -4786,6 +4786,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, @@ -206,10 +206,10 @@ index 4f735ad0d97eaac9a57dad137e479f8a7ec33a36..0a3c5821962c85609b64b3625fa6b8d6 } // namespace blink diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc -index e00ab34b1f114b0ecca066e01ed3a657977b411c..f198975f504aa086596a9a4f63841fe01aee78e8 100644 +index 1d4fa3bca5c1148b26f8d2ca83a1856b0c6be57b..a7fa532971f85e9e4d31a63f9426fd3a6397c645 100644 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc -@@ -1970,6 +1970,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, +@@ -1976,6 +1976,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, } WebWindowFeatures window_features = GetWindowFeaturesFromString(features); diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch index a7df3cc2fe0f2..56e55a7dcc2e6 100644 --- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch +++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch @@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from Electrons grit header instead of Chromes diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index b60dd2d35af1d1b40ec35e10801183018271b944..c68715c5d7a8901ac7c61b9fead0e83b9f757735 100644 +index 6bc111681e20019613f190a595bc6422c3f4e92c..78f234f2c7deede31aeabe931f5ff852355656b0 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -5535,6 +5535,7 @@ static_library("browser") { +@@ -5542,6 +5542,7 @@ static_library("browser") { deps += [ "//components/spellcheck/browser", "//components/spellcheck/common", diff --git a/patches/chromium/dcheck.patch b/patches/chromium/dcheck.patch index 531ccab9967e9..ff41dec10b40f 100644 --- a/patches/chromium/dcheck.patch +++ b/patches/chromium/dcheck.patch @@ -17,10 +17,10 @@ only one or two specific checks fail. Then it's better to simply comment out the failing checks and allow the rest of the target to have them enabled. diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc -index 4d6d8e2e3ce2a169227a977f7b2ce8412b1f809e..fe3555acb698a795d48889ac95f1ae97987dccb0 100644 +index 5342160256f5ab36330974368dad970c3943b9eb..63b4583fe7993a7c6c2400f8d4ff100d13f0afd2 100644 --- a/content/browser/frame_host/navigation_controller_impl.cc +++ b/content/browser/frame_host/navigation_controller_impl.cc -@@ -1267,8 +1267,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation( +@@ -1271,8 +1271,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation( return NAVIGATION_TYPE_NEW_SUBFRAME; } @@ -33,7 +33,7 @@ index 4d6d8e2e3ce2a169227a977f7b2ce8412b1f809e..fe3555acb698a795d48889ac95f1ae97 if (rfh->GetParent()) { // All manual subframes would be did_create_new_entry and handled above, so -@@ -1524,7 +1526,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage( +@@ -1528,7 +1530,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage( new_entry->GetFavicon() = GetLastCommittedEntry()->GetFavicon(); } diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch index bc34edb39a96c..56146ee4c3bbb 100644 --- a/patches/chromium/disable_color_correct_rendering.patch +++ b/patches/chromium/disable_color_correct_rendering.patch @@ -20,10 +20,10 @@ to deal with color spaces. That is being tracked at https://crbug.com/634542 and https://crbug.com/711107. diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc -index f8e2c6cabeb1c04cf1c460f8698aebd1ed551780..e0f636e86e1afc5b7272df16a19147e298b1095d 100644 +index 8fa1a1ce6a069423cd51bf27c8144cb2ae00e894..40ff36096a9de23e2c616142e74c741b4b1db67a 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc -@@ -1863,6 +1863,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw( +@@ -1857,6 +1857,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw( gfx::ColorSpace LayerTreeHostImpl::GetRasterColorSpace( gfx::ContentColorUsage content_color_usage) const { @@ -35,10 +35,10 @@ index f8e2c6cabeb1c04cf1c460f8698aebd1ed551780..e0f636e86e1afc5b7272df16a19147e2 if (settings_.prefer_raster_in_srgb && diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h -index 446d46764c5d001df665fea8737a95b4243f8ac8..c9a0244a0027d8918960e6441b4a49af0b7e71af 100644 +index 4bb6d8a0364098a2c2634c78eadd701a78ddb91b..68ffba79e39198242a5ff3cc963944affe035679 100644 --- a/cc/trees/layer_tree_settings.h +++ b/cc/trees/layer_tree_settings.h -@@ -100,6 +100,8 @@ class CC_EXPORT LayerTreeSettings { +@@ -99,6 +99,8 @@ class CC_EXPORT LayerTreeSettings { bool use_rgba_4444 = false; bool unpremultiply_and_dither_low_bit_depth_tiles = false; @@ -81,7 +81,7 @@ index f28c3218baa08e7ae885567e0ede1d8108f8a373..a5f4a4a10a776fc92a5e9fbc9593563d !command_line->HasSwitch(switches::kUIDisablePartialSwap); #if defined(OS_MACOSX) diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc -index 591e5c4e6f7291412a5f05c244d6256a4b4fd57d..2af556050b7fe4ce7404d0c5ce6f2328a1e863fd 100644 +index 3d7bffe61ee8d695df41ffd1ed3fdaff8155f8bf..89bacd9fc24d82da38990f68f7b9f022ab8e0bfe 100644 --- a/components/viz/service/display/gl_renderer.cc +++ b/components/viz/service/display/gl_renderer.cc @@ -89,6 +89,9 @@ @@ -231,7 +231,7 @@ index 9f9d3422ad128fe3bfc305baa57971bd03e1b676..02747c0d4d7f0bb7ba034f35bcce86a9 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 e5a82f46cd58b0da9959930ee85303e4a1530425..753b926fbe0c6a3ef2b2e244d7f80f4f4574bc5c 100644 +index 634c318db970f5c80699217f5f99467f91747455..238b543a4df8dfdf5e35e5a5707a43caca55679c 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -227,6 +227,7 @@ @@ -242,7 +242,7 @@ index e5a82f46cd58b0da9959930ee85303e4a1530425..753b926fbe0c6a3ef2b2e244d7f80f4f #include "ui/gl/gl_switches.h" #include "ui/native_theme/native_theme_features.h" #include "url/origin.h" -@@ -3283,6 +3284,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( +@@ -3279,6 +3280,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[] = { @@ -295,7 +295,7 @@ index 3dc0fb19b33daf14cbf8550cbb58e3e146830f26..da34be87f36c6e50286d0ef24cade531 } diff --git a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc -index 43f047ee98c482cde3e1ea503623ead0b0a78215..254fd8490e1d9b59c6b056066bcbb9c779e6b6ff 100644 +index 41430c3f85c0335066d51dfbb08465083adf92ab..6eec040e661258bb37ea0c4edacf1c4239706084 100644 --- a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc +++ b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc @@ -23,6 +23,7 @@ diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index a53e693303766..bc577cc9b5007 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -106,7 +106,7 @@ index b3853fd23d7b8a2179c1c2c4931fc0a87fca2d5c..240df49b1e7ea8a20034d05991f28cda READY_TO_COMMIT, diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc -index 0016807829602fc175cffe1c42760f5aa75f0232..7b29974edcb5c05ebb43b782c25f9e8312c47aba 100644 +index 1062c667963d1da6b5b91aec1b49b539f943703e..b5ebff7779b69e13034c61f552cb2d598569eb0a 100644 --- a/content/browser/frame_host/render_frame_host_manager.cc +++ b/content/browser/frame_host/render_frame_host_manager.cc @@ -2304,6 +2304,16 @@ bool RenderFrameHostManager::InitRenderView( diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch index 26b7279d6f477..8f8f17a538466 100644 --- a/patches/chromium/notification_provenance.patch +++ b/patches/chromium/notification_provenance.patch @@ -108,10 +108,10 @@ index 4bf25bf1fa69f7d3869369172d375e2e489e62a1..f80ef2cecc8b111dc54e109646573a59 mojo::PendingReceiver receiver); diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc -index b3cee953abdb4f8d6991dedaa43b4f8267f44f9d..a2fc5326f7ecc3d0bd57587f78d0e3231c5a49ac 100644 +index b5f267082efecaec7a6aed37c386440e9451bd62..d864fa6d948e591b9e3cd6e79ed0ff35ae34932b 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -2148,7 +2148,7 @@ void RenderProcessHostImpl::CreateNotificationService( +@@ -2144,7 +2144,7 @@ void RenderProcessHostImpl::CreateNotificationService( mojo::PendingReceiver receiver) { DCHECK_CURRENTLY_ON(BrowserThread::UI); storage_partition_impl_->GetPlatformNotificationContext()->CreateService( diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch index cc16f5bd88680..bbf12bd87117a 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -71,7 +71,7 @@ index ef837fbb9dd65f84a2c43b5d8ec5b559e7ae2da6..1df6791b74b12377ae74ace5e9b8972c bool AddDomainInfoToRapporSample(rappor::Sample* sample) override; bool IsShowingContextMenuOnPage() const override; diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h -index 0cab1ba9e1efa9695fb0a12d71b6e960356460a6..fa831aaf51ba4bc20e68d0541eb657444ef37ab5 100644 +index 0f63f2ede488d931b95b523fc505aa307bc95088..639ec61d05ee1f739304ddcca04a982daca2f558 100644 --- a/content/public/browser/web_contents_observer.h +++ b/content/public/browser/web_contents_observer.h @@ -14,6 +14,7 @@ @@ -82,7 +82,7 @@ index 0cab1ba9e1efa9695fb0a12d71b6e960356460a6..fa831aaf51ba4bc20e68d0541eb65744 #include "content/public/browser/allow_service_worker_result.h" #include "content/public/browser/cookie_access_details.h" #include "content/public/browser/navigation_controller.h" -@@ -365,6 +366,9 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener { +@@ -372,6 +373,9 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener { // Invoked every time the WebContents changes visibility. virtual void OnVisibilityChanged(Visibility visibility) {} diff --git a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch index 56c165d685a18..c5fed9124d6f1 100644 --- a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch +++ b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch @@ -92,10 +92,10 @@ index d57edc0cea54b9d78700c3b9acdcfcc5f17341dd..e56aae188d7d8f46a4438b8e99f7e9b7 // |url|. If the function returns a valid |new_url|, the request must be // updated to use it. The |force_ignore_site_for_cookies| output parameter diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index cd44f325a8538923796e0211848086c1a5387df7..e2ad803fa28e1a36e3e92eeb6c87f379edc6f4ad 100644 +index a025d8295cfb719f19ac65c5f00179cb72bd5841..aefded0fa0f019645d2370eb5f41d996d542c993 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -5552,6 +5552,23 @@ void RenderFrameImpl::BeginNavigation( +@@ -5484,6 +5484,23 @@ void RenderFrameImpl::BeginNavigation( // we can do a per-frame check here rather than a process-wide check. bool should_fork = HasWebUIScheme(url) || HasWebUIScheme(old_url) || (enabled_bindings_ & kWebUIBindingsPolicyMask); diff --git a/patches/chromium/scroll_bounce_flag.patch b/patches/chromium/scroll_bounce_flag.patch index a019fb4515b01..291d8094362df 100644 --- a/patches/chromium/scroll_bounce_flag.patch +++ b/patches/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 f3b4253ab1c47f4c7bddad478ca9d9fd81081758..74f2daa84685057fcaa7d050c089a028a503e9f0 100644 +index 6337b36babbd727073a89e81a1040943a60bbc0f..7f499f0434dc8b22b013d7353e42850a071c95fc 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -1323,7 +1323,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() { +@@ -1304,7 +1304,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() { } bool RenderThreadImpl::IsElasticOverscrollEnabled() { diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch index b7ddfb7d03b16..36696500a0907 100644 --- a/patches/chromium/support_mixed_sandbox_with_zygote.patch +++ b/patches/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 a2fc5326f7ecc3d0bd57587f78d0e3231c5a49ac..e5a82f46cd58b0da9959930ee85303e4a1530425 100644 +index d864fa6d948e591b9e3cd6e79ed0ff35ae34932b..634c318db970f5c80699217f5f99467f91747455 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc -@@ -414,6 +414,11 @@ class RendererSandboxedProcessLauncherDelegate +@@ -413,6 +413,11 @@ class RendererSandboxedProcessLauncherDelegate { } @@ -37,7 +37,7 @@ index a2fc5326f7ecc3d0bd57587f78d0e3231c5a49ac..e5a82f46cd58b0da9959930ee85303e4 ~RendererSandboxedProcessLauncherDelegate() override {} #if defined(OS_WIN) -@@ -435,6 +440,9 @@ class RendererSandboxedProcessLauncherDelegate +@@ -434,6 +439,9 @@ class RendererSandboxedProcessLauncherDelegate #if BUILDFLAG(USE_ZYGOTE_HANDLE) ZygoteHandle GetZygote() override { @@ -47,7 +47,7 @@ index a2fc5326f7ecc3d0bd57587f78d0e3231c5a49ac..e5a82f46cd58b0da9959930ee85303e4 const base::CommandLine& browser_command_line = *base::CommandLine::ForCurrentProcess(); base::CommandLine::StringType renderer_prefix = -@@ -449,10 +457,13 @@ class RendererSandboxedProcessLauncherDelegate +@@ -448,10 +456,13 @@ class RendererSandboxedProcessLauncherDelegate return service_manager::SandboxType::kRenderer; } @@ -62,7 +62,7 @@ index a2fc5326f7ecc3d0bd57587f78d0e3231c5a49ac..e5a82f46cd58b0da9959930ee85303e4 }; const char kSessionStorageHolderKey[] = "kSessionStorageHolderKey"; -@@ -1859,11 +1870,18 @@ bool RenderProcessHostImpl::Init() { +@@ -1858,11 +1869,18 @@ bool RenderProcessHostImpl::Init() { cmd_line->PrependWrapper(renderer_prefix); AppendRendererCommandLine(cmd_line.get()); From 68447ba08a3d7795b726986700be9483055b6773 Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Wed, 8 Jul 2020 06:00:38 -0700 Subject: [PATCH 63/79] chore: bump chromium in DEPS to e0bc1ffae6393fc543a2da94c88167df75859b36 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index c511dfbcffaa7..fbe95535ec777 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - '914112f1d9af9e4974059dc403da62699a55550f', + 'e0bc1ffae6393fc543a2da94c88167df75859b36', 'node_version': 'v12.18.1', 'nan_version': From 004e29ad334c41cf9a653a195da820db9443e7ea Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 8 Jul 2020 12:29:50 -0700 Subject: [PATCH 64/79] refactor: match upstream print preview handling (#24452) --- docs/api/web-contents.md | 9 +- lib/browser/api/web-contents.js | 11 ++- patches/chromium/.patches | 1 - ...review_disabled_when_printing_to_pdf.patch | 23 ----- .../printing/print_preview_message_handler.cc | 91 +++++++++++++++++-- .../printing/print_preview_message_handler.h | 16 ++++ spec-main/api-web-contents-spec.ts | 17 +++- 7 files changed, 131 insertions(+), 37 deletions(-) delete mode 100644 patches/chromium/fix_account_for_print_preview_disabled_when_printing_to_pdf.patch diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md index aa3607885e453..ac325dbb230e9 100644 --- a/docs/api/web-contents.md +++ b/docs/api/web-contents.md @@ -1371,6 +1371,8 @@ An example of `webContents.printToPDF`: ```javascript const { BrowserWindow } = require('electron') const fs = require('fs') +const path = require('path') +const os = require('os') let win = new BrowserWindow({ width: 800, height: 600 }) win.loadURL('http://github.com') @@ -1378,12 +1380,13 @@ win.loadURL('http://github.com') win.webContents.on('did-finish-load', () => { // Use default printing options win.webContents.printToPDF({}).then(data => { - fs.writeFile('/tmp/print.pdf', data, (error) => { + const pdfPath = path.join(os.homedir(), 'Desktop', 'temp.pdf') + fs.writeFile(pdfPath, data, (error) => { if (error) throw error - console.log('Write PDF successfully.') + console.log(`Wrote PDF successfully to ${pdfPath}`) }) }).catch(error => { - console.log(error) + console.log(`Failed to write PDF to ${pdfPath}: `, error) }) }) ``` diff --git a/lib/browser/api/web-contents.js b/lib/browser/api/web-contents.js index 553bd10ed74e2..69601fdb4de20 100644 --- a/lib/browser/api/web-contents.js +++ b/lib/browser/api/web-contents.js @@ -215,7 +215,9 @@ WebContents.prototype.executeJavaScriptInIsolatedWorld = async function (code, h }; // Translate the options of printToPDF. -WebContents.prototype.printToPDF = function (options) { + +let pendingPromise; +WebContents.prototype.printToPDF = async function (options) { const printSettings = { ...defaultPrintingSetting, requestID: getNextId() @@ -341,7 +343,12 @@ WebContents.prototype.printToPDF = function (options) { // PrinterType enum from //printing/print_job_constants.h printSettings.printerType = 2; if (this._printToPDF) { - return this._printToPDF(printSettings); + if (pendingPromise) { + pendingPromise = pendingPromise.then(() => this._printToPDF(printSettings)); + } else { + pendingPromise = this._printToPDF(printSettings); + } + return pendingPromise; } else { const error = new Error('Printing feature is disabled'); return Promise.reject(error); diff --git a/patches/chromium/.patches b/patches/chromium/.patches index 111b33f0abef7..1af1b3b3818b1 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -83,7 +83,6 @@ delay_lock_the_protocol_scheme_registry.patch gpu_notify_when_dxdiag_request_fails.patch feat_allow_embedders_to_add_observers_on_created_hunspell.patch feat_add_onclose_to_messageport.patch -fix_account_for_print_preview_disabled_when_printing_to_pdf.patch web_contents.patch ui_gtk_public_header.patch refactor_expose_cursor_changes_to_the_webcontentsobserver.patch diff --git a/patches/chromium/fix_account_for_print_preview_disabled_when_printing_to_pdf.patch b/patches/chromium/fix_account_for_print_preview_disabled_when_printing_to_pdf.patch deleted file mode 100644 index f887c91fef258..0000000000000 --- a/patches/chromium/fix_account_for_print_preview_disabled_when_printing_to_pdf.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Andy Locascio -Date: Thu, 2 Apr 2020 15:05:00 -0700 -Subject: fix: account for print preview disabled when printing to pdf - -Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2068936 - -Avoid an optimization introduced in the above CL. In my limited -understanding, it seems like we slightly misuse the print preview API -and this is fallout from using it in a way the code doesn't expect. - -diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc -index fc39f8874402904021e804a5b7fc754709f25353..40c80983f0d2d45058ee49a3542825d3fa822a8b 100644 ---- a/components/printing/renderer/print_render_frame_helper.cc -+++ b/components/printing/renderer/print_render_frame_helper.cc -@@ -1491,6 +1491,7 @@ PrintRenderFrameHelper::CreatePreviewDocument() { - const std::vector& pages = print_pages_params_->pages; - - bool require_document_metafile = -+ !g_is_preview_enabled || - print_renderer_ || - print_params.printed_doc_type != mojom::SkiaDocumentType::kMSKP; - if (!print_preview_context_.CreatePreviewDocument( diff --git a/shell/browser/printing/print_preview_message_handler.cc b/shell/browser/printing/print_preview_message_handler.cc index a756bdd021350..c9abccf0c373f 100644 --- a/shell/browser/printing/print_preview_message_handler.cc +++ b/shell/browser/printing/print_preview_message_handler.cc @@ -67,6 +67,9 @@ bool PrintPreviewMessageHandler::OnMessageReceived( render_frame_host) IPC_MESSAGE_HANDLER(PrintHostMsg_MetafileReadyForPrinting, OnMetafileReadyForPrinting) + IPC_MESSAGE_HANDLER(PrintHostMsg_DidPreviewPage, OnDidPreviewPage) + IPC_MESSAGE_HANDLER(PrintHostMsg_DidPrepareDocumentForPreview, + OnDidPrepareForDocumentToPdf) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; @@ -79,13 +82,14 @@ void PrintPreviewMessageHandler::OnMetafileReadyForPrinting( // Always try to stop the worker. StopWorker(params.document_cookie); - const base::ReadOnlySharedMemoryRegion& metafile = - params.content->metafile_data_region; - if (!metafile.IsValid() || params.expected_pages_count <= 0) { + if (params.expected_pages_count == 0) { RejectPromise(ids.request_id); return; } + const base::ReadOnlySharedMemoryRegion& metafile = + params.content->metafile_data_region; + if (printing::IsOopifEnabled()) { auto* client = printing::PrintCompositeClient::FromWebContents(web_contents()); @@ -94,8 +98,9 @@ void PrintPreviewMessageHandler::OnMetafileReadyForPrinting( auto callback = base::BindOnce( &PrintPreviewMessageHandler::OnCompositeDocumentToPdfDone, weak_ptr_factory_.GetWeakPtr(), ids); - client->DoCompositeDocumentToPdf( - params.document_cookie, render_frame_host, *(params.content), + + client->DoCompleteDocumentToPdf( + params.document_cookie, params.expected_pages_count, mojo::WrapCallbackWithDefaultInvokeIfNotRun( std::move(callback), printing::mojom::PrintCompositor::Status::kCompositingFailure, @@ -107,6 +112,37 @@ void PrintPreviewMessageHandler::OnMetafileReadyForPrinting( } } +void PrintPreviewMessageHandler::OnPrepareForDocumentToPdfDone( + const PrintHostMsg_PreviewIds& ids, + printing::mojom::PrintCompositor::Status status) { + DCHECK_CURRENTLY_ON(BrowserThread::UI); + if (status != printing::mojom::PrintCompositor::Status::kSuccess) { + LOG(ERROR) << "Preparing document for pdf failed with error " << status; + } +} + +void PrintPreviewMessageHandler::OnDidPrepareForDocumentToPdf( + content::RenderFrameHost* render_frame_host, + int document_cookie, + const PrintHostMsg_PreviewIds& ids) { + if (printing::IsOopifEnabled()) { + auto* client = + printing::PrintCompositeClient::FromWebContents(web_contents()); + DCHECK(client); + + if (client->GetIsDocumentConcurrentlyComposited(document_cookie)) + return; + + client->DoPrepareForDocumentToPdf( + document_cookie, render_frame_host, + mojo::WrapCallbackWithDefaultInvokeIfNotRun( + base::BindOnce( + &PrintPreviewMessageHandler::OnPrepareForDocumentToPdfDone, + weak_ptr_factory_.GetWeakPtr(), ids), + printing::mojom::PrintCompositor::Status::kCompositingFailure)); + } +} + void PrintPreviewMessageHandler::OnCompositeDocumentToPdfDone( const PrintHostMsg_PreviewIds& ids, printing::mojom::PrintCompositor::Status status, @@ -114,7 +150,7 @@ void PrintPreviewMessageHandler::OnCompositeDocumentToPdfDone( DCHECK_CURRENTLY_ON(BrowserThread::UI); if (status != printing::mojom::PrintCompositor::Status::kSuccess) { - DLOG(ERROR) << "Compositing pdf failed with error " << status; + LOG(ERROR) << "Compositing pdf failed with error " << status; RejectPromise(ids.request_id); return; } @@ -124,6 +160,49 @@ void PrintPreviewMessageHandler::OnCompositeDocumentToPdfDone( base::RefCountedSharedMemoryMapping::CreateFromWholeRegion(region)); } +void PrintPreviewMessageHandler::OnCompositePdfPageDone( + int page_number, + int document_cookie, + const PrintHostMsg_PreviewIds& ids, + printing::mojom::PrintCompositor::Status status, + base::ReadOnlySharedMemoryRegion region) { + DCHECK_CURRENTLY_ON(BrowserThread::UI); + if (status != printing::mojom::PrintCompositor::Status::kSuccess) { + LOG(ERROR) << "Compositing pdf failed on page: " << page_number + << " with error: " << status; + } +} + +void PrintPreviewMessageHandler::OnDidPreviewPage( + content::RenderFrameHost* render_frame_host, + const printing::mojom::DidPreviewPageParams& params, + const PrintHostMsg_PreviewIds& ids) { + int page_number = params.page_number; + const printing::mojom::DidPrintContentParams& content = *params.content; + + if (page_number < printing::FIRST_PAGE_INDEX || + !content.metafile_data_region.IsValid()) { + RejectPromise(ids.request_id); + return; + } + + if (printing::IsOopifEnabled()) { + auto* client = + printing::PrintCompositeClient::FromWebContents(web_contents()); + DCHECK(client); + + // Use utility process to convert skia metafile to pdf. + client->DoCompositePageToPdf( + params.document_cookie, render_frame_host, content, + mojo::WrapCallbackWithDefaultInvokeIfNotRun( + base::BindOnce(&PrintPreviewMessageHandler::OnCompositePdfPageDone, + weak_ptr_factory_.GetWeakPtr(), page_number, + params.document_cookie, ids), + printing::mojom::PrintCompositor::Status::kCompositingFailure, + base::ReadOnlySharedMemoryRegion())); + } +} + void PrintPreviewMessageHandler::PrintPreviewFailed(int32_t document_cookie, int32_t request_id) { StopWorker(document_cookie); diff --git a/shell/browser/printing/print_preview_message_handler.h b/shell/browser/printing/print_preview_message_handler.h index d0305438afc48..aa62a51198603 100644 --- a/shell/browser/printing/print_preview_message_handler.h +++ b/shell/browser/printing/print_preview_message_handler.h @@ -18,6 +18,8 @@ #include "shell/common/gin_helper/promise.h" #include "v8/include/v8.h" +struct PrintHostMsg_DidPreviewDocument_Params; +struct PrintHostMsg_DidPreviewPage_Params; struct PrintHostMsg_PreviewIds; namespace content { @@ -55,6 +57,20 @@ class PrintPreviewMessageHandler const PrintHostMsg_PreviewIds& ids, printing::mojom::PrintCompositor::Status status, base::ReadOnlySharedMemoryRegion region); + void OnPrepareForDocumentToPdfDone( + const PrintHostMsg_PreviewIds& ids, + printing::mojom::PrintCompositor::Status status); + void OnDidPrepareForDocumentToPdf(content::RenderFrameHost* render_frame_host, + int document_cookie, + const PrintHostMsg_PreviewIds& ids); + void OnCompositePdfPageDone(int page_number, + int document_cookie, + const PrintHostMsg_PreviewIds& ids, + printing::mojom::PrintCompositor::Status status, + base::ReadOnlySharedMemoryRegion region); + void OnDidPreviewPage(content::RenderFrameHost* render_frame_host, + const printing::mojom::DidPreviewPageParams& params, + const PrintHostMsg_PreviewIds& ids); // printing::mojo::PrintPreviewUI: void SetOptionsFromDocument( diff --git a/spec-main/api-web-contents-spec.ts b/spec-main/api-web-contents-spec.ts index d5e33ad519765..994db4ca495d8 100644 --- a/spec-main/api-web-contents-spec.ts +++ b/spec-main/api-web-contents-spec.ts @@ -1662,16 +1662,29 @@ describe('webContents module', () => { expect(width).to.be.greaterThan(height); }); - it('does not crash when called multiple times', async () => { + it('does not crash when called multiple times in parallel', async () => { const promises = []; - for (let i = 0; i < 2; i++) { + for (let i = 0; i < 3; i++) { promises.push(w.webContents.printToPDF({})); } + const results = await Promise.all(promises); for (const data of results) { expect(data).to.be.an.instanceof(Buffer).that.is.not.empty(); } }); + + it('does not crash when called multiple times in sequence', async () => { + const results = []; + for (let i = 0; i < 3; i++) { + const result = await w.webContents.printToPDF({}); + results.push(result); + } + + for (const data of results) { + expect(data).to.be.an.instanceof(Buffer).that.is.not.empty(); + } + }); }); describe('PictureInPicture video', () => { From 69e77267ea63d9d26ad2daebda61ebee0e40bd5d Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Wed, 8 Jul 2020 16:45:48 -0700 Subject: [PATCH 65/79] update patches --- .../add_didinstallconditionalfeatures.patch | 2 +- patches/chromium/blink_local_frame.patch | 6 ++--- patches/chromium/blink_world_context.patch | 2 +- patches/chromium/can_create_window.patch | 24 +++++++++---------- ...esources_not_chrome_for_spellchecker.patch | 4 ++-- .../disable_color_correct_rendering.patch | 12 +++++----- patches/chromium/disable_hidden.patch | 2 +- ...ns_through_the_web_contents_delegate.patch | 4 ++-- patches/chromium/frame_host_manager.patch | 24 +++++++++---------- .../gin_enable_disable_v8_platform.patch | 2 +- ...gpu_notify_when_dxdiag_request_fails.patch | 2 +- .../mas_disable_remote_accessibility.patch | 2 +- patches/chromium/mas_no_private_api.patch | 8 +++---- patches/chromium/no_cache_storage_check.patch | 2 +- patches/chromium/pepper_plugin_support.patch | 14 +++++------ patches/chromium/proxy_config_monitor.patch | 12 +++++----- ...r_changes_to_the_webcontentsobserver.patch | 8 +++---- .../render_widget_host_view_base.patch | 8 +++---- ...ove_contentrendererclient_shouldfork.patch | 10 ++++---- patches/chromium/web_contents.patch | 8 +++---- .../worker_context_will_destroy.patch | 12 +++++----- 21 files changed, 84 insertions(+), 84 deletions(-) diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index 986ba316cb94b..6bd9ec2fc8b96 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -67,7 +67,7 @@ index b5bdc8cf2e637010d18ec7d6f0334292964249c3..f4dd737d60da52c119527a7322a0db37 virtual void WillReleaseScriptContext(v8::Local, int32_t world_id) {} diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc -index 2c0252c1342e62a142558c4ec48829404b0428b4..c145ed92de9fab565bb10ee0f2d92c8c4560b8fd 100644 +index 17ebe5efb8b0bfcf17eda69fe4373b61b213af72..b7296a900c04006812d5f01b05c46a223fb40dc2 100644 --- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc +++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc @@ -201,6 +201,7 @@ void LocalWindowProxy::Initialize() { diff --git a/patches/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch index 1f6717d0ee08b..99a36c7965a48 100644 --- a/patches/chromium/blink_local_frame.patch +++ b/patches/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 518a5c0f4ce806b1fad3c944c6a10eea1c44b12d..658d0e33d7f89ec61fc213c0b5590b67915b29c1 100644 +index a6c8dc9732da47c5fd043ace2a4964a3b8569155..faee2226e2539ce12f5192e87b227e1177dc6bda 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -546,10 +546,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { +@@ -547,10 +547,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { } CHECK(!view_ || !view_->IsAttached()); @@ -28,7 +28,7 @@ index 518a5c0f4ce806b1fad3c944c6a10eea1c44b12d..658d0e33d7f89ec61fc213c0b5590b67 if (!Client()) return; -@@ -567,6 +563,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) { +@@ -568,6 +564,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/chromium/blink_world_context.patch b/patches/chromium/blink_world_context.patch index d2be10e2d4428..462b0a1c2ac00 100644 --- a/patches/chromium/blink_world_context.patch +++ b/patches/chromium/blink_world_context.patch @@ -20,7 +20,7 @@ index 198a934c8d9613eb612e6a8cb94d04e27a4dd021..abae04fec8e99d89a548020d50f3d8ab // Executes script in the context of the current page and returns the value // that the script evaluated to with callback. Script execution can be 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 9c408af7829361852fdf16e66b3c2aa30cd086a2..fbe05a3512440d9f23ce34765eee103921f47a10 100644 +index bd26bf9dc60718d3f2ebd39734d3d425280f310c..db491f3c3393e53f12a2671bcdbf1a6a487ef9db 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 @@ -972,6 +972,13 @@ v8::Local WebLocalFrameImpl::GlobalProxy() const { diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index 0ba1e5a371f9f..5a00e686d6cd1 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -9,10 +9,10 @@ potentially prevent a window from being created. TODO(loc): this patch is currently broken. diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc -index 532769df11e537bda63d8006fcc2ea5b1c6d6ea1..74c8907ad5779004bc0c698a183673e06e0272de 100644 +index d184a9b9163b1b90850b172438d459b78b28c7e5..e9dff478bf0c5cecca243339c4ce7975c4273182 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc -@@ -4786,6 +4786,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -4810,6 +4810,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, @@ -21,10 +21,10 @@ index 532769df11e537bda63d8006fcc2ea5b1c6d6ea1..74c8907ad5779004bc0c698a183673e0 &no_javascript_access); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index cf4d0c48945ecced5ecd9ef03a4f2b5eff844511..391b3d240c132ae321562f0d7850c44d1e950650 100644 +index 790018ad702a6bc05d595d7f8e8922e3a481b179..8ab19c78d33ba03163d880497c3f65fe64638faa 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3082,9 +3082,9 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow( +@@ -3090,9 +3090,9 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow( } if (delegate_) { @@ -53,10 +53,10 @@ index 3081409cd29a3e42847c4ed18f7bf7b2d095f503..02e615a569db5fe9535c6e3b470699f8 // 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 30a55af2e36aae217c5a67d52f7ce72546c63e47..8195149b963de0dcf7af993a3c43e53fb20d1df1 100644 +index 70ab5e7c002a75b473e13faaf547dc256b209a72..55749d439c66b9cd09962b658c5379b1328a63fc 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc -@@ -533,6 +533,8 @@ bool ContentBrowserClient::CanCreateWindow( +@@ -532,6 +532,8 @@ bool ContentBrowserClient::CanCreateWindow( const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -66,10 +66,10 @@ index 30a55af2e36aae217c5a67d52f7ce72546c63e47..8195149b963de0dcf7af993a3c43e53f 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 58367f4e696b29df1cab2336229bc408d3ba63e6..9184695ea198b0e1b41c9bb456317ca2f5bc8886 100644 +index e89dd60798d2baceab1632124036e79cb8e020e1..77a91b4afafe16c1fbf3c88b3b62e7b5bec8187a 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -147,6 +147,7 @@ class NetworkService; +@@ -148,6 +148,7 @@ class NetworkService; class TrustedURLLoaderHeaderClient; } // namespace mojom struct ResourceRequest; @@ -77,7 +77,7 @@ index 58367f4e696b29df1cab2336229bc408d3ba63e6..9184695ea198b0e1b41c9bb456317ca2 } // namespace network namespace sandbox { -@@ -853,6 +854,8 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -855,6 +856,8 @@ class CONTENT_EXPORT ContentBrowserClient { const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -109,7 +109,7 @@ index b30f242d2b61b10f68f016bc1e93419b520d3b06..bfbad0007797d9c3fff78fae121aa254 const OpenURLParams& params) { return nullptr; diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h -index 39c834d95000ce5c189d810970fc85032c9509d2..8101442f9ad81fe84d9f0e8f302184349f522541 100644 +index 6e40ca10064fa4c4bd93df8f32dca63656716524..80f0c9562e78d558a870ad5a166dc417f49858b6 100644 --- a/content/public/browser/web_contents_delegate.h +++ b/content/public/browser/web_contents_delegate.h @@ -17,6 +17,7 @@ @@ -206,10 +206,10 @@ index 4f735ad0d97eaac9a57dad137e479f8a7ec33a36..0a3c5821962c85609b64b3625fa6b8d6 } // namespace blink diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc -index 1d4fa3bca5c1148b26f8d2ca83a1856b0c6be57b..a7fa532971f85e9e4d31a63f9426fd3a6397c645 100644 +index 37a925e0602ebc3d3685a745ec0fd4cd63c5d390..6f3dfe84715e11049ed271363ded3ce096ec63d4 100644 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc -@@ -1976,6 +1976,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, +@@ -1969,6 +1969,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, } WebWindowFeatures window_features = GetWindowFeaturesFromString(features); diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch index 56e55a7dcc2e6..fada81feba1b7 100644 --- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch +++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch @@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from Electrons grit header instead of Chromes diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 6bc111681e20019613f190a595bc6422c3f4e92c..78f234f2c7deede31aeabe931f5ff852355656b0 100644 +index 36021fd0d015b0ef1d8f5ddf1376e274cee786f6..6292bb2f210f3ce01da1841cb42934986167a9c1 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -5542,6 +5542,7 @@ static_library("browser") { +@@ -5539,6 +5539,7 @@ static_library("browser") { deps += [ "//components/spellcheck/browser", "//components/spellcheck/common", diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch index 56146ee4c3bbb..2d69484882e31 100644 --- a/patches/chromium/disable_color_correct_rendering.patch +++ b/patches/chromium/disable_color_correct_rendering.patch @@ -20,7 +20,7 @@ to deal with color spaces. That is being tracked at https://crbug.com/634542 and https://crbug.com/711107. diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc -index 8fa1a1ce6a069423cd51bf27c8144cb2ae00e894..40ff36096a9de23e2c616142e74c741b4b1db67a 100644 +index 3749862849ac066066236ca21be756bd6ce9a5c6..aa0e6ce8179150a4f830266b3fa4f960258ea2a4 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc @@ -1857,6 +1857,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw( @@ -48,7 +48,7 @@ index 4bb6d8a0364098a2c2634c78eadd701a78ddb91b..68ffba79e39198242a5ff3cc963944af // 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 8bde4796ebcf40f7f10c62f4005eabb84af9de04..913ab005e582b3d1ab0df8f88ac1df6245fce34e 100644 +index 773a1c9fe580d406fe841087b79ecda5a67e1951..33935b240adc265457649d46073e2ddd4f626e32 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 { @@ -60,7 +60,7 @@ index 8bde4796ebcf40f7f10c62f4005eabb84af9de04..913ab005e582b3d1ab0df8f88ac1df62 bool force_antialiasing = false; bool force_blending_with_shaders = false; diff --git a/components/viz/host/renderer_settings_creation.cc b/components/viz/host/renderer_settings_creation.cc -index f28c3218baa08e7ae885567e0ede1d8108f8a373..a5f4a4a10a776fc92a5e9fbc9593563d548ccbc8 100644 +index 263e8d9ad8dba0c690645d412567586246a38b9d..8f2f53867b15bc895aa105ed7ec59586abfa8c2f 100644 --- a/components/viz/host/renderer_settings_creation.cc +++ b/components/viz/host/renderer_settings_creation.cc @@ -14,6 +14,7 @@ @@ -81,7 +81,7 @@ index f28c3218baa08e7ae885567e0ede1d8108f8a373..a5f4a4a10a776fc92a5e9fbc9593563d !command_line->HasSwitch(switches::kUIDisablePartialSwap); #if defined(OS_MACOSX) diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc -index 3d7bffe61ee8d695df41ffd1ed3fdaff8155f8bf..89bacd9fc24d82da38990f68f7b9f022ab8e0bfe 100644 +index ff4ccbbc0e24ea624f421e1a6e7d5b817106a292..269a4ac2f580f9d8858db84fe7d91c79d2cd4c50 100644 --- a/components/viz/service/display/gl_renderer.cc +++ b/components/viz/service/display/gl_renderer.cc @@ -89,6 +89,9 @@ @@ -219,10 +219,10 @@ index 3d7bffe61ee8d695df41ffd1ed3fdaff8155f8bf..89bacd9fc24d82da38990f68f7b9f022 + +#undef PATCH_CS diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc -index 9f9d3422ad128fe3bfc305baa57971bd03e1b676..02747c0d4d7f0bb7ba034f35bcce86a91774bb36 100644 +index 9bb2839b9736afa6c3b22c38d46f9df07031a241..5b5873c6abcafb24beb74a13dfeeed868197f455 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc -@@ -215,6 +215,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus( +@@ -220,6 +220,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus( // Command-line switches to propagate to the GPU process. static const char* const kSwitchNames[] = { diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch index d09b23162eb53..c5c48493d94da 100644 --- a/patches/chromium/disable_hidden.patch +++ b/patches/chromium/disable_hidden.patch @@ -34,7 +34,7 @@ index 5f3f2feec8c787ff1e086bf256ef9353732037af..a127ec54042ef869f0e19ba6b86b86d4 const base::TimeDelta& delay) { new_content_rendering_delay_ = delay; diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc -index 5f793a992ee8265d17030311c41cb4ef0a6f760a..106165971c3047b85f173c0c2fb33923998f3886 100644 +index 2155c6a82f3ad4174528917f78552b0e0a1252f0..4bc890eb9e345aa1e641a01394a32d80c1c4aa20 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -621,7 +621,7 @@ void RenderWidgetHostViewAura::HideImpl() { diff --git a/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch b/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch index 8fe7093544343..0cc7568485086 100644 --- a/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch +++ b/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch @@ -13,10 +13,10 @@ This patch can be removed once app.allowRendererProcessReuse is forced to true as then Chromiums assumptions around processes become correct. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 391b3d240c132ae321562f0d7850c44d1e950650..0e634f0e9dac18a7e62092da73ac15c246edac67 100644 +index 8ab19c78d33ba03163d880497c3f65fe64638faa..c3795473782aca8100372a356b8e33045e47d1ef 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -2492,11 +2492,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) { +@@ -2500,11 +2500,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) { WebContentsImpl* outermost = GetOutermostWebContents(); if (event.button == blink::WebPointerProperties::Button::kBack && outermost->controller_.CanGoBack()) { diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index bc577cc9b5007..450e7a9a2fa25 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -42,10 +42,10 @@ index 6b03c07316eaab83a50afc123fc9f17b1c1dfa3b..e821571731e4e1a93f873477c7410de7 // another SiteInstance for the same site. void RegisterSiteInstance(SiteInstanceImpl* site_instance); diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc -index 4dceb1598b911d2dc5a9b0ff4cdef617d98fe8a5..3359f68de7edf2dfb1935e6f7e7a2b7f017c55c5 100644 +index 755761d2a193e81f1467e0b05b7475e387974e15..b8a0517da6b5798ee794bdcd2a25809951d3296f 100644 --- a/content/browser/frame_host/navigation_request.cc +++ b/content/browser/frame_host/navigation_request.cc -@@ -1401,6 +1401,21 @@ void NavigationRequest::BeginNavigation() { +@@ -1393,6 +1393,21 @@ void NavigationRequest::BeginNavigation() { // it immediately. EnterChildTraceEvent("ResponseStarted", this); @@ -67,7 +67,7 @@ index 4dceb1598b911d2dc5a9b0ff4cdef617d98fe8a5..3359f68de7edf2dfb1935e6f7e7a2b7f // Select an appropriate RenderFrameHost. render_frame_host_ = frame_tree_node_->render_manager()->GetFrameHostForNavigation(this); -@@ -4799,6 +4814,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { +@@ -4791,6 +4806,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { {WILL_START_REQUEST, { WILL_REDIRECT_REQUEST, WILL_PROCESS_RESPONSE, @@ -75,7 +75,7 @@ index 4dceb1598b911d2dc5a9b0ff4cdef617d98fe8a5..3359f68de7edf2dfb1935e6f7e7a2b7f READY_TO_COMMIT, DID_COMMIT, CANCELING, -@@ -4812,10 +4828,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { +@@ -4804,10 +4820,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { WILL_FAIL_REQUEST, }}, {WILL_PROCESS_RESPONSE, { @@ -106,10 +106,10 @@ index b3853fd23d7b8a2179c1c2c4931fc0a87fca2d5c..240df49b1e7ea8a20034d05991f28cda READY_TO_COMMIT, diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc -index 1062c667963d1da6b5b91aec1b49b539f943703e..b5ebff7779b69e13034c61f552cb2d598569eb0a 100644 +index bfa5b20841df528caa2740e64af0c8a931e4a47d..193eec6bef9f8845f1c2127f9be190aa7a0de996 100644 --- a/content/browser/frame_host/render_frame_host_manager.cc +++ b/content/browser/frame_host/render_frame_host_manager.cc -@@ -2304,6 +2304,16 @@ bool RenderFrameHostManager::InitRenderView( +@@ -2305,6 +2305,16 @@ bool RenderFrameHostManager::InitRenderView( scoped_refptr RenderFrameHostManager::GetSiteInstanceForNavigationRequest( NavigationRequest* request) { @@ -126,7 +126,7 @@ index 1062c667963d1da6b5b91aec1b49b539f943703e..b5ebff7779b69e13034c61f552cb2d59 SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance(); // All children of MHTML documents must be MHTML documents. They all live in -@@ -2323,10 +2333,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( +@@ -2324,10 +2334,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( // // TODO(clamy): We should also consider as a candidate SiteInstance the // speculative SiteInstance that was computed on redirects. @@ -191,7 +191,7 @@ index 1062c667963d1da6b5b91aec1b49b539f943703e..b5ebff7779b69e13034c61f552cb2d59 // Account for renderer-initiated reload as well. // Needed as a workaround for https://crbug.com/1045524, remove it when it is -@@ -2356,6 +2416,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( +@@ -2357,6 +2417,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( request->ResetStateForSiteInstanceChange(); } @@ -229,10 +229,10 @@ index 571e6381f2456450a07b64c3a84d1f15f4cbbefa..cb342a6c4915c4b2cc7fe0c1b3c7219f size_t GetRelatedActiveContentsCount() override; bool RequiresDedicatedProcess() override; diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc -index 8195149b963de0dcf7af993a3c43e53fb20d1df1..1cfea0d996fa90b2b1e6d28224a5841453fc1174 100644 +index 55749d439c66b9cd09962b658c5379b1328a63fc..2bcc154c1bc77a414598f164a1b593ff0230f3a1 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc -@@ -63,6 +63,21 @@ +@@ -62,6 +62,21 @@ namespace content { @@ -255,10 +255,10 @@ index 8195149b963de0dcf7af993a3c43e53fb20d1df1..1cfea0d996fa90b2b1e6d28224a58414 const MainFunctionParams& parameters) { return nullptr; diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 9184695ea198b0e1b41c9bb456317ca2f5bc8886..265b2eee1aaef82850656aed8a6a7be92cc562f6 100644 +index 77a91b4afafe16c1fbf3c88b3b62e7b5bec8187a..8994a527390dac0a5b16f6ac1a3e0e658dd1bb9c 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -244,8 +244,45 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -245,8 +245,45 @@ class CONTENT_EXPORT ContentBrowserClient { using IsClipboardPasteAllowedCallback = base::OnceCallback; diff --git a/patches/chromium/gin_enable_disable_v8_platform.patch b/patches/chromium/gin_enable_disable_v8_platform.patch index 42bbcda36ae0a..a08f9d609e843 100644 --- a/patches/chromium/gin_enable_disable_v8_platform.patch +++ b/patches/chromium/gin_enable_disable_v8_platform.patch @@ -38,7 +38,7 @@ index f23af2d9738f3aa76e3a49301e1c3216ee4a64b4..ede178acabc63c3c33d6ce93efd5632b v8::Isolate* isolate() { return isolate_; } diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc -index 517283e2f1886408ee5ad935e3bafecb9728ca94..e7224adc9f4def27a370bcca8effd7bccc01ab02 100644 +index 630814e5af46abc3d035a8ec12a83016a94fc323..00e24954441630d45ba42759755ee432c3e80cde 100644 --- a/gin/v8_initializer.cc +++ b/gin/v8_initializer.cc @@ -191,12 +191,14 @@ enum LoadV8FileResult { diff --git a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch index e41bf81654325..8b115c081dc6d 100644 --- a/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch +++ b/patches/chromium/gpu_notify_when_dxdiag_request_fails.patch @@ -40,7 +40,7 @@ index 8af48d23b020779c1714fc7ca70966e8d33f7252..5dfa29db15467f8fc55f86a2a225380c // Update the GPU feature info. This updates the blacklist and enabled status // of GPU rasterization. In the future this will be used for more features. diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc -index dd4a3e4ab502005fdd7216e45ec109c1a3311536..3063ff2a22bef9138e1494542571a4385ac35427 100644 +index 169f1722764a49d31e06f39f7275ba80bd56df79..343561e72ad5c0f07c08a790707b51c6e2e1067a 100644 --- a/content/browser/gpu/gpu_data_manager_impl_private.cc +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc @@ -1063,6 +1063,11 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() { diff --git a/patches/chromium/mas_disable_remote_accessibility.patch b/patches/chromium/mas_disable_remote_accessibility.patch index 2a75d30a977da..a596a3c9aa9ae 100644 --- a/patches/chromium/mas_disable_remote_accessibility.patch +++ b/patches/chromium/mas_disable_remote_accessibility.patch @@ -170,7 +170,7 @@ index bca6e5fe1cb20ffba29fee5b5ec6856392fe3579..af8188e695f4e0750e00424c8f5dc490 /////////////////////////////////////////////////////////////////////////////// diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn -index b24839ba70e23b8f04a3ed226af1536516f440c7..d97329dbdc3ab2771b1504c094619b260fd8e54e 100644 +index d1aa0aaf5a949683e37a26ada1b1f178d9d82721..6dc85fa624d49e0222f7d25c2602dc6e4b2a2b56 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn @@ -309,6 +309,13 @@ jumbo_component("base") { diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch index 688c7a9a3dfa6..b18b6ba90be85 100644 --- a/patches/chromium/mas_no_private_api.patch +++ b/patches/chromium/mas_no_private_api.patch @@ -120,7 +120,7 @@ index d1d406e383d80cf7bc233c87d383084f130f73d5..f56a191cb01fbcf91f60abc312ee5277 // 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 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe91289c3e 100644 +index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d91772acc7d9d 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm @@ -208,6 +208,7 @@ NSString* const @@ -302,7 +302,7 @@ index 17293aef7e5e2bc9165808b91ea54ff6c75cd067..2c6e8bf696a8b7100045465e938ecabe [[[NSMutableAttributedString alloc] initWithString:base::SysUTF16ToNSString(innerText)] autorelease]; +#ifndef MAS_BUILD - if (!_owner->IsTextOnlyObject()) { + if (!_owner->IsText()) { AXPlatformRange ax_range(_owner->CreatePositionAt(0), _owner->CreatePositionAt(int{innerText.length()})); AddMisspelledTextAttributes(ax_range, attributedInnerText); @@ -444,7 +444,7 @@ index b29b68be6fa6b0329ed03c2d9011690c5e6f83c5..3a8aca70701534d19cdf1655da188114 void BluetoothAdapterMac::RemovePairingDelegateInternal( diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn -index 5acdb011a1f232569b43ba2f08a21f44b3c40151..9fca5b2e8c714308a404750cc9fc64dcaffa91cc 100644 +index bf4b736b05f38fb7022d0d15860d88672bd6def5..f49bb226163d74759c8f02a29abfc3e1ed17bf9f 100644 --- a/media/audio/BUILD.gn +++ b/media/audio/BUILD.gn @@ -171,6 +171,12 @@ source_set("audio") { @@ -457,7 +457,7 @@ index 5acdb011a1f232569b43ba2f08a21f44b3c40151..9fca5b2e8c714308a404750cc9fc64dc + "mac/coreaudio_dispatch_override.h", + ] + } - libs += [ + frameworks = [ "AudioToolbox.framework", "AudioUnit.framework", diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc diff --git a/patches/chromium/no_cache_storage_check.patch b/patches/chromium/no_cache_storage_check.patch index 964beaff4f5d7..41f489b78e770 100644 --- a/patches/chromium/no_cache_storage_check.patch +++ b/patches/chromium/no_cache_storage_check.patch @@ -7,7 +7,7 @@ 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 9a8a69324bb7cfe30452fba859e501f8d5a11556..0d66b53850d5fefdb169b3d081cdd67a13131baa 100644 +index 004dcefd381ba97cd828c924b1d1051c61ee82df..0c03ef16704bda1c37bdf2aeb6e8e38aff367197 100644 --- a/content/browser/cache_storage/legacy/legacy_cache_storage.cc +++ b/content/browser/cache_storage/legacy/legacy_cache_storage.cc @@ -106,7 +106,7 @@ class LegacyCacheStorage::CacheLoader { diff --git a/patches/chromium/pepper_plugin_support.patch b/patches/chromium/pepper_plugin_support.patch index 4bfa1a224c296..26a1b3868e0eb 100644 --- a/patches/chromium/pepper_plugin_support.patch +++ b/patches/chromium/pepper_plugin_support.patch @@ -68,7 +68,7 @@ index 82fa5b7026e62cfe69700f30fcc84731fc30afe8..f4ad9fbc72a5cb27ed22ab014ccb2fcb + return PP_OK; } diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc -index 839b95e6a27e1296bae5e1bc98d5aedd7b2c3041..677b65e44440825d7fbba18f736ff970a8da3559 100644 +index 084feb824e8383c0813691cd877e8fde3f6b095f..9c8158c92a6f780652afdccc588a56cfde3ee8cf 100644 --- a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc +++ b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc @@ -7,9 +7,11 @@ @@ -83,7 +83,7 @@ index 839b95e6a27e1296bae5e1bc98d5aedd7b2c3041..677b65e44440825d7fbba18f736ff970 #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_ppapi_host.h" #include "content/public/browser/browser_task_traits.h" -@@ -40,6 +42,7 @@ using content::RenderProcessHost; +@@ -39,6 +41,7 @@ using content::RenderProcessHost; namespace { @@ -91,7 +91,7 @@ index 839b95e6a27e1296bae5e1bc98d5aedd7b2c3041..677b65e44440825d7fbba18f736ff970 // Get the CookieSettings on the UI thread for the given render process ID. scoped_refptr GetCookieSettings( int render_process_id) { -@@ -53,6 +56,7 @@ scoped_refptr GetCookieSettings( +@@ -52,6 +55,7 @@ scoped_refptr GetCookieSettings( } return nullptr; } @@ -99,7 +99,7 @@ index 839b95e6a27e1296bae5e1bc98d5aedd7b2c3041..677b65e44440825d7fbba18f736ff970 void BindWakeLockProviderOnUIThread( mojo::PendingReceiver receiver) { -@@ -66,7 +70,9 @@ PepperFlashBrowserHost::PepperFlashBrowserHost(BrowserPpapiHost* host, +@@ -65,7 +69,9 @@ PepperFlashBrowserHost::PepperFlashBrowserHost(BrowserPpapiHost* host, PP_Instance instance, PP_Resource resource) : ResourceHost(host->GetPpapiHost(), instance, resource), @@ -109,7 +109,7 @@ index 839b95e6a27e1296bae5e1bc98d5aedd7b2c3041..677b65e44440825d7fbba18f736ff970 delay_timer_(FROM_HERE, base::TimeDelta::FromSeconds(45), this, -@@ -119,6 +125,7 @@ int32_t PepperFlashBrowserHost::OnGetLocalTimeZoneOffset( +@@ -118,6 +124,7 @@ int32_t PepperFlashBrowserHost::OnGetLocalTimeZoneOffset( int32_t PepperFlashBrowserHost::OnGetLocalDataRestrictions( ppapi::host::HostMessageContext* context) { @@ -117,7 +117,7 @@ index 839b95e6a27e1296bae5e1bc98d5aedd7b2c3041..677b65e44440825d7fbba18f736ff970 // Getting the Flash LSO settings requires using the CookieSettings which // belong to the profile which lives on the UI thread. We lazily initialize // |cookie_settings_| by grabbing the reference from the UI thread and then -@@ -138,9 +145,11 @@ int32_t PepperFlashBrowserHost::OnGetLocalDataRestrictions( +@@ -137,9 +144,11 @@ int32_t PepperFlashBrowserHost::OnGetLocalDataRestrictions( context->MakeReplyMessageContext(), document_url, plugin_url)); } @@ -130,7 +130,7 @@ index 839b95e6a27e1296bae5e1bc98d5aedd7b2c3041..677b65e44440825d7fbba18f736ff970 void PepperFlashBrowserHost::GetLocalDataRestrictions( ppapi::host::ReplyMessageContext reply_context, const GURL& document_url, -@@ -169,6 +178,7 @@ void PepperFlashBrowserHost::GetLocalDataRestrictions( +@@ -168,6 +177,7 @@ void PepperFlashBrowserHost::GetLocalDataRestrictions( PpapiPluginMsg_Flash_GetLocalDataRestrictionsReply( static_cast(restrictions))); } diff --git a/patches/chromium/proxy_config_monitor.patch b/patches/chromium/proxy_config_monitor.patch index c681b36229112..455c64f2cb7a2 100644 --- a/patches/chromium/proxy_config_monitor.patch +++ b/patches/chromium/proxy_config_monitor.patch @@ -6,7 +6,7 @@ Subject: proxy_config_monitor.patch Allow monitoring proxy config changes for a pref service. diff --git a/chrome/browser/net/proxy_config_monitor.cc b/chrome/browser/net/proxy_config_monitor.cc -index 342db7adee575cc49a38bbdfcf1bbfcc0e30cf57..fc8e6b49d96534546dfa97846c2be79cff8a96e5 100644 +index dc1ffcfb6230aec8b54351132e8f22194e0f6b41..5391b20409b55b9ab3e30d8f4f20f011454da91d 100644 --- a/chrome/browser/net/proxy_config_monitor.cc +++ b/chrome/browser/net/proxy_config_monitor.cc @@ -10,7 +10,9 @@ @@ -18,8 +18,8 @@ index 342db7adee575cc49a38bbdfcf1bbfcc0e30cf57..fc8e6b49d96534546dfa97846c2be79c +#endif #include "components/proxy_config/pref_proxy_config_tracker_impl.h" #include "content/public/browser/browser_thread.h" - #include "mojo/public/cpp/bindings/associated_interface_ptr.h" -@@ -21,12 +23,13 @@ + #include "mojo/public/cpp/bindings/pending_remote.h" +@@ -20,12 +22,13 @@ #include "chrome/browser/chromeos/profiles/profile_helper.h" #endif // defined(OS_CHROMEOS) @@ -34,7 +34,7 @@ index 342db7adee575cc49a38bbdfcf1bbfcc0e30cf57..fc8e6b49d96534546dfa97846c2be79c ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK(profile); -@@ -56,6 +59,7 @@ ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) { +@@ -55,6 +58,7 @@ ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) { proxy_config_service_->AddObserver(this); } @@ -42,7 +42,7 @@ index 342db7adee575cc49a38bbdfcf1bbfcc0e30cf57..fc8e6b49d96534546dfa97846c2be79c ProxyConfigMonitor::ProxyConfigMonitor(PrefService* local_state) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) || -@@ -134,9 +138,11 @@ void ProxyConfigMonitor::OnLazyProxyConfigPoll() { +@@ -133,9 +137,11 @@ void ProxyConfigMonitor::OnLazyProxyConfigPoll() { void ProxyConfigMonitor::OnPACScriptError(int32_t line_number, const std::string& details) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -54,7 +54,7 @@ index 342db7adee575cc49a38bbdfcf1bbfcc0e30cf57..fc8e6b49d96534546dfa97846c2be79c } void ProxyConfigMonitor::OnRequestMaybeFailedDueToProxySettings( -@@ -150,9 +156,10 @@ void ProxyConfigMonitor::OnRequestMaybeFailedDueToProxySettings( +@@ -149,9 +155,10 @@ void ProxyConfigMonitor::OnRequestMaybeFailedDueToProxySettings( // controlled. return; } diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch index bbf12bd87117a..f071fefe90ab2 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -43,10 +43,10 @@ index 57b44076b0f387aa080963cceb57d678c151becb..db34c9c30a6501cf73c767bfd375f67a void RenderWidgetHostImpl::OnCursorVisibilityStateChanged(bool is_visible) { diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 8a0eef81bb1a82bd27e97c45f0fdd212722bc458..21e60fdd61019b00e94a32ea0b75516c2d2185a3 100644 +index 2a47877c3ac37d1585eb57ff87c29386496d77f3..40326c7c7a3ff4959e0c387220b4f395df20b4f2 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3583,6 +3583,11 @@ bool WebContentsImpl::OnUpdateDragCursor() { +@@ -3591,6 +3591,11 @@ bool WebContentsImpl::OnUpdateDragCursor() { browser_plugin_embedder_->OnUpdateDragCursor(); } @@ -59,10 +59,10 @@ index 8a0eef81bb1a82bd27e97c45f0fdd212722bc458..21e60fdd61019b00e94a32ea0b75516c RenderWidgetHostImpl* render_widget_host) { return render_widget_host == GetMainFrame()->GetRenderWidgetHost(); diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h -index ef837fbb9dd65f84a2c43b5d8ec5b559e7ae2da6..1df6791b74b12377ae74ace5e9b8972cc6a42f67 100644 +index 9085f45f98468a72219331110e76ed64f489f231..79a1865be5aeac781bbe821a42c86834e82a551f 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h -@@ -920,6 +920,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, +@@ -921,6 +921,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, void SendScreenRects() override; TextInputManager* GetTextInputManager() override; bool OnUpdateDragCursor() override; diff --git a/patches/chromium/render_widget_host_view_base.patch b/patches/chromium/render_widget_host_view_base.patch index 21208f04c2b97..203e1983bdbbf 100644 --- a/patches/chromium/render_widget_host_view_base.patch +++ b/patches/chromium/render_widget_host_view_base.patch @@ -24,7 +24,7 @@ index 85b265f70047f90ebb8a4a2ef2487adc62f0ade9..b41d39c8ced77266955e301af19dcac9 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 d6363c75664bba49370db01fb96dd24ca9bdfff9..187adf4c7e2f15536a6081a141678f3a395c7613 100644 +index 8188ba42eb88ea8faf3fa3d03a3018e966880bf6..2d710bb3f712b5d93ea95e93be34f91e9b730387 100644 --- a/content/browser/renderer_host/render_widget_host_view_base.h +++ b/content/browser/renderer_host/render_widget_host_view_base.h @@ -25,9 +25,11 @@ @@ -39,7 +39,7 @@ index d6363c75664bba49370db01fb96dd24ca9bdfff9..187adf4c7e2f15536a6081a141678f3a #include "content/public/browser/render_widget_host_view.h" #include "content/public/common/screen_info.h" #include "content/public/common/widget_type.h" -@@ -66,9 +68,11 @@ class CursorManager; +@@ -67,9 +69,11 @@ class CursorManager; class MouseWheelPhaseHandler; class RenderWidgetHostImpl; class RenderWidgetHostViewBaseObserver; @@ -51,7 +51,7 @@ index d6363c75664bba49370db01fb96dd24ca9bdfff9..187adf4c7e2f15536a6081a141678f3a class WebCursor; class DelegatedFrameHost; struct DisplayFeature; -@@ -126,6 +130,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase +@@ -127,6 +131,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase bool show_reason_unoccluded, bool show_reason_bfcache_restore) final; @@ -61,7 +61,7 @@ index d6363c75664bba49370db01fb96dd24ca9bdfff9..187adf4c7e2f15536a6081a141678f3a // This only needs to be overridden by RenderWidgetHostViewBase subclasses // that handle content embedded within other RenderWidgetHostViews. gfx::PointF TransformPointToRootCoordSpaceF( -@@ -310,6 +317,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase +@@ -311,6 +318,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase virtual void ProcessGestureEvent(const blink::WebGestureEvent& event, const ui::LatencyInfo& latency); diff --git a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch index c5fed9124d6f1..39516c2d1d737 100644 --- a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch +++ b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch @@ -9,7 +9,7 @@ for every navigation to keep Node.js working properly. Once Native Modules in th are required to be NAPI or context aware (Electron v11), this patch can be removed. diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc -index c37c8d441cacd853b1e8572fb806f72004e2bcb8..de3e62cbdd1f69d89e31bb4d737dbbc0cfb6036d 100644 +index e21bb23491f1261788b77fb8fa33e8afa0f60d3f..310ba0f4c7407bb1bdead4d451c5a53e85e6c440 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -1312,6 +1312,25 @@ bool ChromeContentRendererClient::AllowPopup() { @@ -39,7 +39,7 @@ index c37c8d441cacd853b1e8572fb806f72004e2bcb8..de3e62cbdd1f69d89e31bb4d737dbbc0 WebLocalFrame* frame, ui::PageTransition transition_type, diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h -index ea214daadf1e5613ab2e402f5d3783b150c41ede..31513568737c0cb9639451b74b0172825f6e8fc4 100644 +index 066a1a0690c013ffdb8ee043f8489e250ac430f0..4a2f67ba8e0aab4c46413e2f1268af9495038139 100644 --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h @@ -127,6 +127,11 @@ class ChromeContentRendererClient @@ -55,7 +55,7 @@ index ea214daadf1e5613ab2e402f5d3783b150c41ede..31513568737c0cb9639451b74b017282 ui::PageTransition transition_type, const blink::WebURL& url, diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc -index 064d0a433dbe67cd24b92b78fab2f294ce5d320a..e38490b3cbfc62ed29ff93452814a9e65cd8bca6 100644 +index 6c7478594f980e3518fea2afc53d941b0f6c6a34..3b514f084ed16fc924f6a2909bd51056e5c58f6d 100644 --- a/content/public/renderer/content_renderer_client.cc +++ b/content/public/renderer/content_renderer_client.cc @@ -114,6 +114,14 @@ bool ContentRendererClient::HandleNavigation( @@ -74,10 +74,10 @@ index 064d0a433dbe67cd24b92b78fab2f294ce5d320a..e38490b3cbfc62ed29ff93452814a9e6 blink::WebLocalFrame* frame, ui::PageTransition transition_type, diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h -index d57edc0cea54b9d78700c3b9acdcfcc5f17341dd..e56aae188d7d8f46a4438b8e99f7e9b714c5875a 100644 +index cc6101c82e659bbc5a8568c166d5a56fae0c8d64..8309bb7f3f284b0930c13a7e75a7f9de64fedb73 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h -@@ -228,6 +228,13 @@ class CONTENT_EXPORT ContentRendererClient { +@@ -227,6 +227,13 @@ class CONTENT_EXPORT ContentRendererClient { bool is_redirect); #endif diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch index fe7c88e47024c..79b5622b3adc9 100644 --- a/patches/chromium/web_contents.patch +++ b/patches/chromium/web_contents.patch @@ -9,10 +9,10 @@ is needed for OSR. Originally landed in https://github.com/electron/libchromiumcontent/pull/226. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 0e634f0e9dac18a7e62092da73ac15c246edac67..8a0eef81bb1a82bd27e97c45f0fdd212722bc458 100644 +index c3795473782aca8100372a356b8e33045e47d1ef..2a47877c3ac37d1585eb57ff87c29386496d77f3 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -2225,6 +2225,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -2233,6 +2233,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { std::string unique_name; frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name); @@ -25,7 +25,7 @@ index 0e634f0e9dac18a7e62092da73ac15c246edac67..8a0eef81bb1a82bd27e97c45f0fdd212 WebContentsViewDelegate* delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -2235,6 +2241,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -2243,6 +2249,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { view_.reset(CreateWebContentsView(this, delegate, &render_view_host_delegate_view_)); } @@ -34,7 +34,7 @@ index 0e634f0e9dac18a7e62092da73ac15c246edac67..8a0eef81bb1a82bd27e97c45f0fdd212 CHECK(view_.get()); diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h -index 059ceced6c63ed1a91d8afc7cd6d7a95e07c2467..1ad9b01e67c0210c4c1f054a136b3cc72585b627 100644 +index 411145b6e24b0017a67ec6d97b6ebd0d1c54c9f3..a2dff8b0cad2ee423f5365ff62f93ac5fccfaa93 100644 --- a/content/public/browser/web_contents.h +++ b/content/public/browser/web_contents.h @@ -82,8 +82,11 @@ class BrowserContext; diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch index 6dfc4f57d5f9e..450ecbc585017 100644 --- a/patches/chromium/worker_context_will_destroy.patch +++ b/patches/chromium/worker_context_will_destroy.patch @@ -10,10 +10,10 @@ An attempt to upstream this was made, but rejected: https://chromium-review.googlesource.com/c/chromium/src/+/1954347 diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h -index f6d2f50e8d6b4a5df796f2d4478ccd3048101532..d57edc0cea54b9d78700c3b9acdcfcc5f17341dd 100644 +index 5b0784c844bd9dd448c4e660d85902f930851b72..cc6101c82e659bbc5a8568c166d5a56fae0c8d64 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h -@@ -397,6 +397,11 @@ class CONTENT_EXPORT ContentRendererClient { +@@ -398,6 +398,11 @@ class CONTENT_EXPORT ContentRendererClient { virtual void DidInitializeWorkerContextOnWorkerThread( v8::Local context) {} @@ -26,7 +26,7 @@ index f6d2f50e8d6b4a5df796f2d4478ccd3048101532..d57edc0cea54b9d78700c3b9acdcfcc5 // 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 eed85d02c39156e7de8d5973ae8546e0e62e9c47..52654538aaa433bea4ee36a93063c1f5102af46e 100644 +index 72ab6440ef56017e4aca765644c33c1fa7a48e22..f257401cfd97372d3bdc0a7bb5863627a2d88c0c 100644 --- a/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc @@ -867,6 +867,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { @@ -43,7 +43,7 @@ index eed85d02c39156e7de8d5973ae8546e0e62e9c47..52654538aaa433bea4ee36a93063c1f5 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 cd86eeaf6a01af98b7fb8681d49928cb1ecd1ba6..9bdd57b43cd7342568d9b32f2042f3aa1451e345 100644 +index 83d6f879da9db74bd1cd14761f38e1c81feb7ed2..263641805d91b1ba131eaba4fd07774f6f8ea38d 100644 --- a/content/renderer/renderer_blink_platform_impl.h +++ b/content/renderer/renderer_blink_platform_impl.h @@ -192,6 +192,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { @@ -51,9 +51,9 @@ index cd86eeaf6a01af98b7fb8681d49928cb1ecd1ba6..9bdd57b43cd7342568d9b32f2042f3aa void WillStopWorkerThread() override; void WorkerContextCreated(const v8::Local& worker) override; + void WorkerContextWillDestroy(const v8::Local& worker) override; + bool AllowScriptExtensionForServiceWorker( + const blink::WebSecurityOrigin& script_origin) override; bool IsExcludedHeaderForServiceWorkerFetchEvent( - const blink::WebString& header_name) override; - diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h index 9351a302916a2cbeecf3a6a934aee0431127008c..754634fd4935cdf38168361f1491cf3aedaf8cdb 100644 --- a/third_party/blink/public/platform/platform.h From f67cb50ac41e581b9a8eb662fc900b7f5be130b3 Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Thu, 9 Jul 2020 06:01:09 -0700 Subject: [PATCH 66/79] chore: bump chromium in DEPS to 0881423156abe084164b51ab58ce93a8bd380524 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index fe34e1235cd88..251e378217caf 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - 'e0bc1ffae6393fc543a2da94c88167df75859b36', + '0881423156abe084164b51ab58ce93a8bd380524', 'node_version': 'v12.18.2', 'nan_version': From e7875bb6ebbcf97cb525e73fc642ed4b6c547ab7 Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Thu, 9 Jul 2020 08:58:38 -0700 Subject: [PATCH 67/79] update patches --- ...client_precreatemessageloop_callback.patch | 2 +- ...leges_in_unsandboxed_child_processes.patch | 2 +- patches/chromium/can_create_window.patch | 16 ++++++------- ...esources_not_chrome_for_spellchecker.patch | 4 ++-- .../chromium/content_browser_main_loop.patch | 2 +- ...ay_lock_the_protocol_scheme_registry.patch | 2 +- .../disable_color_correct_rendering.patch | 12 +++++----- ...screen_rendering_with_viz_compositor.patch | 6 ++--- ...ns_through_the_web_contents_delegate.patch | 2 +- patches/chromium/frame_host_manager.patch | 24 +++++++++---------- .../chromium/gritsettings_resource_ids.patch | 2 +- patches/chromium/mas_no_private_api.patch | 4 ++-- .../chromium/notification_provenance.patch | 2 +- ...put_back_deleted_colors_for_autofill.patch | 10 ++++---- ...r_changes_to_the_webcontentsobserver.patch | 8 +++---- patches/chromium/resource_file_conflict.patch | 6 ++--- .../support_mixed_sandbox_with_zygote.patch | 4 ++-- ...andboxed_ppapi_processes_skip_zygote.patch | 2 +- patches/chromium/web_contents.patch | 2 +- 19 files changed, 56 insertions(+), 56 deletions(-) diff --git a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch index 21be31c66ee1d..b360de98aed3d 100644 --- a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch +++ b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch @@ -10,7 +10,7 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set. This should be upstreamed. diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc -index 82f55455fe365f54bdc3eefac8bd538af13f642d..5da552f02472299e09bc33c5ab0aa184b62953a4 100644 +index 1a2c3b6a910c24b7d124ea1b3180a3c9655580d8..e6795df82114e85cbda78ca89ca0716f963ba180 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -255,6 +255,10 @@ int GpuMain(const MainFunctionParams& parameters) { diff --git a/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch b/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch index 229727547977f..fc0e6363dd6b8 100644 --- a/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch +++ b/patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch @@ -6,7 +6,7 @@ Subject: allow new privileges in unsandboxed child processes This allows unsandboxed renderers to launch setuid processes on Linux. diff --git a/content/browser/child_process_launcher_helper_linux.cc b/content/browser/child_process_launcher_helper_linux.cc -index e63dfcf43147c7174942277b2c129675014c9e59..7121ec638809c5964d22af496559cb7f46c794ef 100644 +index c1b5d30fd927feaeb3e068adc72edafa871ae8cd..7534eef2cfe57044be038632ab040b4df1e7ef9e 100644 --- a/content/browser/child_process_launcher_helper_linux.cc +++ b/content/browser/child_process_launcher_helper_linux.cc @@ -53,6 +53,18 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread( diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index 5a00e686d6cd1..b85d16c901fd3 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -9,10 +9,10 @@ potentially prevent a window from being created. TODO(loc): this patch is currently broken. diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc -index d184a9b9163b1b90850b172438d459b78b28c7e5..e9dff478bf0c5cecca243339c4ce7975c4273182 100644 +index 802b9ce5070f881a24540576125b19d3a43145f4..b1b856a041daeeed52173d429e069e3261b1c180 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc -@@ -4810,6 +4810,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -4671,6 +4671,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, @@ -21,7 +21,7 @@ index d184a9b9163b1b90850b172438d459b78b28c7e5..e9dff478bf0c5cecca243339c4ce7975 &no_javascript_access); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 790018ad702a6bc05d595d7f8e8922e3a481b179..8ab19c78d33ba03163d880497c3f65fe64638faa 100644 +index 6e3c290f85e5b8d00ed030d0147c01c42e34c933..bb0f374cb02e4ab26934cfab5533000601ca568a 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -3090,9 +3090,9 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow( @@ -53,7 +53,7 @@ index 3081409cd29a3e42847c4ed18f7bf7b2d095f503..02e615a569db5fe9535c6e3b470699f8 // 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 70ab5e7c002a75b473e13faaf547dc256b209a72..55749d439c66b9cd09962b658c5379b1328a63fc 100644 +index 3fe77cc391f252fed4eb6df06f63bdbdbccca00e..0583f1ef5b851a6d39bac4d134d37a83e18e6f1a 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -532,6 +532,8 @@ bool ContentBrowserClient::CanCreateWindow( @@ -66,10 +66,10 @@ index 70ab5e7c002a75b473e13faaf547dc256b209a72..55749d439c66b9cd09962b658c5379b1 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 e89dd60798d2baceab1632124036e79cb8e020e1..77a91b4afafe16c1fbf3c88b3b62e7b5bec8187a 100644 +index a78117345fd36fc2bb2f97f9fcceb3aa91da4bf5..1ec9bc579a66369c9b78a8155a6f7cf5cd933f71 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -148,6 +148,7 @@ class NetworkService; +@@ -147,6 +147,7 @@ class NetworkService; class TrustedURLLoaderHeaderClient; } // namespace mojom struct ResourceRequest; @@ -77,7 +77,7 @@ index e89dd60798d2baceab1632124036e79cb8e020e1..77a91b4afafe16c1fbf3c88b3b62e7b5 } // namespace network namespace sandbox { -@@ -855,6 +856,8 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -857,6 +858,8 @@ class CONTENT_EXPORT ContentBrowserClient { const std::string& frame_name, WindowOpenDisposition disposition, const blink::mojom::WindowFeatures& features, @@ -158,7 +158,7 @@ index c6a990f873066fec1ac7ce5e088ecd02d2142e71..272b613f658ef4bfa3869cbd17d342ce // 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 9687f90b512a2cb63d17d088bc1444240a587818..a2ac61847eb6083a39f7d7934d15d71687e2f48c 100644 +index 4d4a7ab2235ad0b35cc58959a6a501003043feb4..4c333b8a356e5536703dcf067cab01e6770ef70f 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 @@ -386,6 +386,8 @@ bool WebTestContentBrowserClient::CanCreateWindow( diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch index fada81feba1b7..d9f82a5947512 100644 --- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch +++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch @@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from Electrons grit header instead of Chromes diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 36021fd0d015b0ef1d8f5ddf1376e274cee786f6..6292bb2f210f3ce01da1841cb42934986167a9c1 100644 +index a790ef04603593efd12ca15ece0d43bf9bb63554..c5c72d9891bc56c3d7ddb7a4d43ea77b1f637fee 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -5539,6 +5539,7 @@ static_library("browser") { +@@ -5543,6 +5543,7 @@ static_library("browser") { deps += [ "//components/spellcheck/browser", "//components/spellcheck/common", diff --git a/patches/chromium/content_browser_main_loop.patch b/patches/chromium/content_browser_main_loop.patch index a453b869373c8..8c0a6a5947740 100644 --- a/patches/chromium/content_browser_main_loop.patch +++ b/patches/chromium/content_browser_main_loop.patch @@ -8,7 +8,7 @@ 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 4ada8596176e8581f8e5db15f91c1cd70f41d7e9..4d600e5d34a0a7514c17c7d02bdabdc796660c9a 100644 +index a4bc105bfa088591cbd4bcf6e5db53d6f385021d..95dffe6663e276c206137705e450e8d28f443295 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -1436,7 +1436,7 @@ void BrowserMainLoop::MainMessageLoopRun() { diff --git a/patches/chromium/delay_lock_the_protocol_scheme_registry.patch b/patches/chromium/delay_lock_the_protocol_scheme_registry.patch index 18a1af60af4a6..cc34b6fda4470 100644 --- a/patches/chromium/delay_lock_the_protocol_scheme_registry.patch +++ b/patches/chromium/delay_lock_the_protocol_scheme_registry.patch @@ -19,7 +19,7 @@ https://chromium-review.googlesource.com/c/chromium/src/+/1901591, we should try re-submitting the patch. diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc -index f5e5576fd7455336481111c24b436457e235e43c..4af47c892ce5485ff18de67e1af8962cd7315406 100644 +index 8ca7ccfad7d9d8f874f7a6a0507c787492f99ecb..40a17e6f4a0ee9e7490a32d1307dd74dd0f923d6 100644 --- a/content/app/content_main_runner_impl.cc +++ b/content/app/content_main_runner_impl.cc @@ -662,7 +662,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) { diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch index 2d69484882e31..fe7199ecee57a 100644 --- a/patches/chromium/disable_color_correct_rendering.patch +++ b/patches/chromium/disable_color_correct_rendering.patch @@ -219,7 +219,7 @@ index ff4ccbbc0e24ea624f421e1a6e7d5b817106a292..269a4ac2f580f9d8858db84fe7d91c79 + +#undef PATCH_CS diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc -index 9bb2839b9736afa6c3b22c38d46f9df07031a241..5b5873c6abcafb24beb74a13dfeeed868197f455 100644 +index ac1bc8252f7c815d27f568df8fc3a8f7b08b55fe..9e58542edc52035174f4862f724ca22d32feca34 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc @@ -220,6 +220,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus( @@ -227,11 +227,11 @@ index 9bb2839b9736afa6c3b22c38d46f9df07031a241..5b5873c6abcafb24beb74a13dfeeed86 // Command-line switches to propagate to the GPU process. static const char* const kSwitchNames[] = { + switches::kDisableColorCorrectRendering, - service_manager::switches::kDisableSeccompFilterSandbox, - service_manager::switches::kGpuSandboxAllowSysVShm, - service_manager::switches::kGpuSandboxFailuresFatal, + sandbox::policy::switches::kDisableSeccompFilterSandbox, + sandbox::policy::switches::kGpuSandboxAllowSysVShm, + sandbox::policy::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 634c318db970f5c80699217f5f99467f91747455..238b543a4df8dfdf5e35e5a5707a43caca55679c 100644 +index 5cf4a3c571f94629d4ed5b7b44603d8fe7d49da1..d41d1e32a500dadd2cd3144f34dfc641303977aa 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -227,6 +227,7 @@ @@ -249,7 +249,7 @@ index 634c318db970f5c80699217f5f99467f91747455..238b543a4df8dfdf5e35e5a5707a43ca + switches::kDisableColorCorrectRendering, network::switches::kExplicitlyAllowedPorts, service_manager::switches::kDisableInProcessStackTraces, - service_manager::switches::kDisableSeccompFilterSandbox, + sandbox::policy::switches::kDisableSeccompFilterSandbox, diff --git a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc b/third_party/blink/renderer/platform/graphics/canvas_color_params.cc index 3dc0fb19b33daf14cbf8550cbb58e3e146830f26..da34be87f36c6e50286d0ef24cade53156f0a688 100644 --- a/third_party/blink/renderer/platform/graphics/canvas_color_params.cc diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch index 4ab5ff6f91bae..a81dc9ea595ad 100644 --- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch +++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch @@ -475,10 +475,10 @@ index 641a63e8c18e3e81acacb67a59b285dac44abbb1..72b74ec00402ff7b5b4853c08365eb2f compositor_data.display_client->GetBoundRemote(resize_task_runner_); diff --git a/mojo/public/cpp/bindings/sync_call_restrictions.h b/mojo/public/cpp/bindings/sync_call_restrictions.h -index 599d24e260ae85a2f71054cc64f296875b97170d..70269ce3332edd07f1760476f3592d08c3dc3130 100644 +index c9a75d59b7eb480c3e64e14bdcb9516150ec368c..7370f0b80057ce7b24560c41b70c0bab1cacffef 100644 --- a/mojo/public/cpp/bindings/sync_call_restrictions.h +++ b/mojo/public/cpp/bindings/sync_call_restrictions.h -@@ -33,6 +33,7 @@ class Compositor; +@@ -29,6 +29,7 @@ class Compositor; namespace viz { class HostFrameSinkManager; @@ -486,7 +486,7 @@ index 599d24e260ae85a2f71054cc64f296875b97170d..70269ce3332edd07f1760476f3592d08 } namespace mojo { -@@ -83,6 +84,8 @@ class COMPONENT_EXPORT(MOJO_CPP_BINDINGS) SyncCallRestrictions { +@@ -78,6 +79,8 @@ class COMPONENT_EXPORT(MOJO_CPP_BINDINGS) SyncCallRestrictions { // For destroying the GL context/surface that draw to a platform window before // the platform window is destroyed. friend class viz::HostFrameSinkManager; diff --git a/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch b/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch index 0cc7568485086..da26daebd0655 100644 --- a/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch +++ b/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch @@ -13,7 +13,7 @@ This patch can be removed once app.allowRendererProcessReuse is forced to true as then Chromiums assumptions around processes become correct. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 8ab19c78d33ba03163d880497c3f65fe64638faa..c3795473782aca8100372a356b8e33045e47d1ef 100644 +index bb0f374cb02e4ab26934cfab5533000601ca568a..7f3597287d32c44a870bc2b7242c190c57c44a3a 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -2500,11 +2500,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) { diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index 450e7a9a2fa25..3085c5d114249 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -42,10 +42,10 @@ index 6b03c07316eaab83a50afc123fc9f17b1c1dfa3b..e821571731e4e1a93f873477c7410de7 // another SiteInstance for the same site. void RegisterSiteInstance(SiteInstanceImpl* site_instance); diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc -index 755761d2a193e81f1467e0b05b7475e387974e15..b8a0517da6b5798ee794bdcd2a25809951d3296f 100644 +index 34a4bf511b08885511178d423c669f68d408d2bc..db3f744ca3b39704f9c76813b63bc1e99c1700f1 100644 --- a/content/browser/frame_host/navigation_request.cc +++ b/content/browser/frame_host/navigation_request.cc -@@ -1393,6 +1393,21 @@ void NavigationRequest::BeginNavigation() { +@@ -1458,6 +1458,21 @@ void NavigationRequest::BeginNavigation() { // it immediately. EnterChildTraceEvent("ResponseStarted", this); @@ -67,7 +67,7 @@ index 755761d2a193e81f1467e0b05b7475e387974e15..b8a0517da6b5798ee794bdcd2a258099 // Select an appropriate RenderFrameHost. render_frame_host_ = frame_tree_node_->render_manager()->GetFrameHostForNavigation(this); -@@ -4791,6 +4806,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { +@@ -4898,6 +4913,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { {WILL_START_REQUEST, { WILL_REDIRECT_REQUEST, WILL_PROCESS_RESPONSE, @@ -75,7 +75,7 @@ index 755761d2a193e81f1467e0b05b7475e387974e15..b8a0517da6b5798ee794bdcd2a258099 READY_TO_COMMIT, DID_COMMIT, CANCELING, -@@ -4804,10 +4820,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { +@@ -4911,10 +4927,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { WILL_FAIL_REQUEST, }}, {WILL_PROCESS_RESPONSE, { @@ -91,7 +91,7 @@ index 755761d2a193e81f1467e0b05b7475e387974e15..b8a0517da6b5798ee794bdcd2a258099 NOT_STARTED, DID_COMMIT, diff --git a/content/browser/frame_host/navigation_request.h b/content/browser/frame_host/navigation_request.h -index b3853fd23d7b8a2179c1c2c4931fc0a87fca2d5c..240df49b1e7ea8a20034d05991f28cdab27a143c 100644 +index 746e5a1b3fcb9b4ca954626bbf686b07a6776033..a5138a5760a11e35383ce42205645c7a54a1a28c 100644 --- a/content/browser/frame_host/navigation_request.h +++ b/content/browser/frame_host/navigation_request.h @@ -142,6 +142,10 @@ class CONTENT_EXPORT NavigationRequest @@ -106,10 +106,10 @@ index b3853fd23d7b8a2179c1c2c4931fc0a87fca2d5c..240df49b1e7ea8a20034d05991f28cda READY_TO_COMMIT, diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc -index bfa5b20841df528caa2740e64af0c8a931e4a47d..193eec6bef9f8845f1c2127f9be190aa7a0de996 100644 +index 29d08bbdfd402f0e617f121533234305fabd1ec6..d40aed731f0388b4a88d20c18dc6b7f0e700ce80 100644 --- a/content/browser/frame_host/render_frame_host_manager.cc +++ b/content/browser/frame_host/render_frame_host_manager.cc -@@ -2305,6 +2305,16 @@ bool RenderFrameHostManager::InitRenderView( +@@ -2332,6 +2332,16 @@ bool RenderFrameHostManager::InitRenderView( scoped_refptr RenderFrameHostManager::GetSiteInstanceForNavigationRequest( NavigationRequest* request) { @@ -126,7 +126,7 @@ index bfa5b20841df528caa2740e64af0c8a931e4a47d..193eec6bef9f8845f1c2127f9be190aa SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance(); // All children of MHTML documents must be MHTML documents. They all live in -@@ -2324,10 +2334,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( +@@ -2351,10 +2361,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( // // TODO(clamy): We should also consider as a candidate SiteInstance the // speculative SiteInstance that was computed on redirects. @@ -191,7 +191,7 @@ index bfa5b20841df528caa2740e64af0c8a931e4a47d..193eec6bef9f8845f1c2127f9be190aa // Account for renderer-initiated reload as well. // Needed as a workaround for https://crbug.com/1045524, remove it when it is -@@ -2357,6 +2417,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( +@@ -2384,6 +2444,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( request->ResetStateForSiteInstanceChange(); } @@ -229,7 +229,7 @@ index 571e6381f2456450a07b64c3a84d1f15f4cbbefa..cb342a6c4915c4b2cc7fe0c1b3c7219f size_t GetRelatedActiveContentsCount() override; bool RequiresDedicatedProcess() override; diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc -index 55749d439c66b9cd09962b658c5379b1328a63fc..2bcc154c1bc77a414598f164a1b593ff0230f3a1 100644 +index 0583f1ef5b851a6d39bac4d134d37a83e18e6f1a..868e9c2bfb62cf2d39321f59d720c48d4424ac8d 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc @@ -62,6 +62,21 @@ @@ -255,10 +255,10 @@ index 55749d439c66b9cd09962b658c5379b1328a63fc..2bcc154c1bc77a414598f164a1b593ff const MainFunctionParams& parameters) { return nullptr; diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 77a91b4afafe16c1fbf3c88b3b62e7b5bec8187a..8994a527390dac0a5b16f6ac1a3e0e658dd1bb9c 100644 +index 1ec9bc579a66369c9b78a8155a6f7cf5cd933f71..82718ff949a5d4e0b6c5b76162163551a79bc47e 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -245,8 +245,45 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -247,8 +247,45 @@ class CONTENT_EXPORT ContentBrowserClient { using IsClipboardPasteAllowedCallback = base::OnceCallback; diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch index e25d12774dc6b..c8623514de341 100644 --- a/patches/chromium/gritsettings_resource_ids.patch +++ b/patches/chromium/gritsettings_resource_ids.patch @@ -6,7 +6,7 @@ Subject: gritsettings_resource_ids.patch Add electron resources file to the list of resource ids generation. diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec -index fa2306ead7d2b70e41be750408e386bd452b99cc..9985c129afd87ed546baddae598881418ee502bf 100644 +index d81313ef3f6759bfab0b60b0edfaaf71b87e53f5..82875eb522c6cec3ff426d75f51243d23ce8750a 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -649,6 +649,11 @@ diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch index b18b6ba90be85..24a49b454f8a9 100644 --- a/patches/chromium/mas_no_private_api.patch +++ b/patches/chromium/mas_no_private_api.patch @@ -400,7 +400,7 @@ index 28ca1646af0b0cce40d27baec71cbe65adc334fa..bae65c1f485bc02eb9ef2ebf7018af4a } // namespace diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm -index b29b68be6fa6b0329ed03c2d9011690c5e6f83c5..3a8aca70701534d19cdf1655da18811473e42ea4 100644 +index 1ecb98346e11c14440b509ce62e12b0a426130fc..c0fab734ed37a67d5e1797bb2bd6df098acec530 100644 --- a/device/bluetooth/bluetooth_adapter_mac.mm +++ b/device/bluetooth/bluetooth_adapter_mac.mm @@ -36,6 +36,7 @@ @@ -430,7 +430,7 @@ index b29b68be6fa6b0329ed03c2d9011690c5e6f83c5..3a8aca70701534d19cdf1655da188114 should_update_name_(true), classic_discovery_manager_( BluetoothDiscoveryManagerMac::CreateClassic(this)), -@@ -304,8 +308,12 @@ base::WeakPtr BluetoothAdapterMac::GetWeakPtr() { +@@ -307,8 +311,12 @@ base::WeakPtr BluetoothAdapterMac::GetWeakPtr() { } bool BluetoothAdapterMac::SetPoweredImpl(bool powered) { diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch index 8f8f17a538466..2055283b20b57 100644 --- a/patches/chromium/notification_provenance.patch +++ b/patches/chromium/notification_provenance.patch @@ -108,7 +108,7 @@ index 4bf25bf1fa69f7d3869369172d375e2e489e62a1..f80ef2cecc8b111dc54e109646573a59 mojo::PendingReceiver receiver); diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc -index b5f267082efecaec7a6aed37c386440e9451bd62..d864fa6d948e591b9e3cd6e79ed0ff35ae34932b 100644 +index 0e0b0d7ea55dda0f68fe410a22ff51ffd4f901e7..210f216c3bd6ba4d3ef21f795f86f8c14dbb6a96 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -2144,7 +2144,7 @@ void RenderProcessHostImpl::CreateNotificationService( diff --git a/patches/chromium/put_back_deleted_colors_for_autofill.patch b/patches/chromium/put_back_deleted_colors_for_autofill.patch index 7d1dd2d5beb8b..22c12003bb138 100644 --- a/patches/chromium/put_back_deleted_colors_for_autofill.patch +++ b/patches/chromium/put_back_deleted_colors_for_autofill.patch @@ -42,7 +42,7 @@ index e4b9c5e52d6f8408f8ab5ab7c4f8b28466e04626..9c32aaaa0d88a692632a2e888250c6fd // TODO(thomasanderson): Render GtkSpinner directly. case ui::NativeTheme::kColorId_ThrobberSpinningColor: diff --git a/ui/native_theme/common_theme.cc b/ui/native_theme/common_theme.cc -index 5f04f0e527929ef1d6a169a549ff166bd5a343ae..e0cf95aace856bef5b6c4ff410439bec145fbadf 100644 +index f8b36be425a78783a7ee8fb305d64a109f6c72fc..2227c81ef5878d687c125ae993c06700e5c131ef 100644 --- a/ui/native_theme/common_theme.cc +++ b/ui/native_theme/common_theme.cc @@ -63,7 +63,8 @@ base::Optional GetHighContrastColor( @@ -70,7 +70,7 @@ index 5f04f0e527929ef1d6a169a549ff166bd5a343ae..e0cf95aace856bef5b6c4ff410439bec // FocusableBorder case NativeTheme::kColorId_FocusedBorderColor: return SkColorSetA(gfx::kGoogleBlue300, 0x4D); -@@ -556,6 +565,18 @@ SkColor GetDefaultColor(NativeTheme::ColorId color_id, +@@ -558,6 +567,18 @@ SkColor GetDefaultColor(NativeTheme::ColorId color_id, case NativeTheme::kColorId_UnfocusedBorderColor: return gfx::kGoogleGrey300; @@ -89,7 +89,7 @@ index 5f04f0e527929ef1d6a169a549ff166bd5a343ae..e0cf95aace856bef5b6c4ff410439bec // Material spinner/throbber case NativeTheme::kColorId_ThrobberSpinningColor: return gfx::kGoogleBlue600; -@@ -659,7 +680,7 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id, +@@ -661,7 +682,7 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id, } if (color_scheme == NativeTheme::ColorScheme::kDark) { @@ -99,10 +99,10 @@ index 5f04f0e527929ef1d6a169a549ff166bd5a343ae..e0cf95aace856bef5b6c4ff410439bec return color.value(); } diff --git a/ui/native_theme/native_theme_color_id.h b/ui/native_theme/native_theme_color_id.h -index ff5ae999d50d4631cef43bdbd3e5d982692f9c65..e3d69f5e3595b2f7b126cfa9e0ee57ff523f9042 100644 +index 739c28d17cae9f5150539ada37533a49c8526963..b2a0fc2fc8278936c9eda48b6056cb0ce97412b4 100644 --- a/ui/native_theme/native_theme_color_id.h +++ b/ui/native_theme/native_theme_color_id.h -@@ -144,6 +144,11 @@ +@@ -145,6 +145,11 @@ OP(kColorId_TableHeaderText), \ OP(kColorId_TableHeaderBackground), \ OP(kColorId_TableHeaderSeparator), \ diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch index f071fefe90ab2..ee0bdb8032db1 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -43,10 +43,10 @@ index 57b44076b0f387aa080963cceb57d678c151becb..db34c9c30a6501cf73c767bfd375f67a void RenderWidgetHostImpl::OnCursorVisibilityStateChanged(bool is_visible) { diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 2a47877c3ac37d1585eb57ff87c29386496d77f3..40326c7c7a3ff4959e0c387220b4f395df20b4f2 100644 +index 9740478de8ff9838ca45ede8051de073a055cf6f..746ceccef093db0d095e492ab44b2efd11bd0875 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -3591,6 +3591,11 @@ bool WebContentsImpl::OnUpdateDragCursor() { +@@ -3594,6 +3594,11 @@ bool WebContentsImpl::OnUpdateDragCursor() { browser_plugin_embedder_->OnUpdateDragCursor(); } @@ -59,10 +59,10 @@ index 2a47877c3ac37d1585eb57ff87c29386496d77f3..40326c7c7a3ff4959e0c387220b4f395 RenderWidgetHostImpl* render_widget_host) { return render_widget_host == GetMainFrame()->GetRenderWidgetHost(); diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h -index 9085f45f98468a72219331110e76ed64f489f231..79a1865be5aeac781bbe821a42c86834e82a551f 100644 +index ddbf57ac6185a83e6c43fb495079fad74ee2913a..3566f0b5533543e169e1d24a95e918e20312f1ba 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h -@@ -921,6 +921,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, +@@ -924,6 +924,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, void SendScreenRects() override; TextInputManager* GetTextInputManager() override; bool OnUpdateDragCursor() override; diff --git a/patches/chromium/resource_file_conflict.patch b/patches/chromium/resource_file_conflict.patch index 1a4bc248ce9f9..dc4a93ca398a9 100644 --- a/patches/chromium/resource_file_conflict.patch +++ b/patches/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 c34a0526bc1dac431ea7aad1346dc4508a7264d3..4672898afa6f8a71405588c86870b3307627e8c6 100644 +index 29b14b39a2fd9d31e0da38f5b634beccada7f227..f7c55be027678600341547d7159f32e3108c32ba 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -1394,7 +1394,7 @@ if (is_chrome_branded && !is_android) { +@@ -1398,7 +1398,7 @@ if (is_chrome_branded && !is_android) { } } @@ -64,7 +64,7 @@ index c34a0526bc1dac431ea7aad1346dc4508a7264d3..4672898afa6f8a71405588c86870b330 chrome_paks("packed_resources") { if (is_mac) { output_dir = "$root_gen_dir/repack" -@@ -1414,6 +1414,12 @@ if (!is_android) { +@@ -1418,6 +1418,12 @@ if (!is_android) { } } diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch index 36696500a0907..05e1e7ba3c93d 100644 --- a/patches/chromium/support_mixed_sandbox_with_zygote.patch +++ b/patches/chromium/support_mixed_sandbox_with_zygote.patch @@ -22,7 +22,7 @@ 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 d864fa6d948e591b9e3cd6e79ed0ff35ae34932b..634c318db970f5c80699217f5f99467f91747455 100644 +index 210f216c3bd6ba4d3ef21f795f86f8c14dbb6a96..5cf4a3c571f94629d4ed5b7b44603d8fe7d49da1 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -413,6 +413,11 @@ class RendererSandboxedProcessLauncherDelegate @@ -48,7 +48,7 @@ index d864fa6d948e591b9e3cd6e79ed0ff35ae34932b..634c318db970f5c80699217f5f99467f *base::CommandLine::ForCurrentProcess(); base::CommandLine::StringType renderer_prefix = @@ -448,10 +456,13 @@ class RendererSandboxedProcessLauncherDelegate - return service_manager::SandboxType::kRenderer; + return sandbox::policy::SandboxType::kRenderer; } -#if defined(OS_WIN) diff --git a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch index 7a5d0aa35ea00..2f774112813ef 100644 --- a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch +++ b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch @@ -6,7 +6,7 @@ Subject: unsandboxed_ppapi_processes_skip_zygote.patch Unsandboxed ppapi processes should skip zygote. diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc -index 09f2cabf4c3a97785eb24368762f9a221896f188..3956d540fb9122d2ec1217682a4cea5f9e014d27 100644 +index 4bb529bb574baf54f6e2e0feeb3d95cfebbc2bb2..c5bcbb2fce2ca9d9e4acc7c298b2bfe02912e410 100644 --- a/content/browser/ppapi_plugin_process_host.cc +++ b/content/browser/ppapi_plugin_process_host.cc @@ -123,6 +123,9 @@ class PpapiPluginSandboxedProcessLauncherDelegate diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch index 79b5622b3adc9..8376c067fdfb4 100644 --- a/patches/chromium/web_contents.patch +++ b/patches/chromium/web_contents.patch @@ -9,7 +9,7 @@ is needed for OSR. Originally landed in https://github.com/electron/libchromiumcontent/pull/226. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index c3795473782aca8100372a356b8e33045e47d1ef..2a47877c3ac37d1585eb57ff87c29386496d77f3 100644 +index 7f3597287d32c44a870bc2b7242c190c57c44a3a..9740478de8ff9838ca45ede8051de073a055cf6f 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -2233,6 +2233,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { From d482f1e27631c5b9222ea67f299135561962868b Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Thu, 9 Jul 2020 16:15:35 +0000 Subject: [PATCH 68/79] update patches --- patches/v8/add_realloc.patch | 2 +- patches/v8/build_gn.patch | 6 +++--- patches/v8/dcheck.patch | 4 ++-- .../v8/do_not_export_private_v8_symbols_on_windows.patch | 2 +- patches/v8/expose_mksnapshot.patch | 4 ++-- ...leanup_switch_offset_of_to_offsetof_where_possible.patch | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/patches/v8/add_realloc.patch b/patches/v8/add_realloc.patch index 2eaea742ae124..6fc6fa47e20e9 100644 --- a/patches/v8/add_realloc.patch +++ b/patches/v8/add_realloc.patch @@ -12,7 +12,7 @@ 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 13b40db28eb08e4ad602d23fcab2f56900896dd8..f27cc892846cd6de06ec5fc0e908a7884fc40d06 100644 +index ef80b6bff946cccc9dd0b735c780a45e188fe384..6ba5382f419e22fe8ce4cd95456a4771f2df04a2 100644 --- a/include/v8.h +++ b/include/v8.h @@ -5068,6 +5068,13 @@ class V8_EXPORT ArrayBuffer : public Object { diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch index cb6b533a110a2..4f3bddc5a36d3 100644 --- a/patches/v8/build_gn.patch +++ b/patches/v8/build_gn.patch @@ -9,7 +9,7 @@ necessary for native modules to load. Also, some fixes relating to mksnapshot on ARM. diff --git a/BUILD.gn b/BUILD.gn -index 1627676872ed1dec2c5162e2c299736c4815d659..1b4d22c93d96dd941f6133f0718eab626fa29e43 100644 +index cf0a2d786a25c22341d99d8653fd4dbf76a23dd6..b1a5b4635c8d1464cd11968212795bebb6665d35 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -368,7 +368,7 @@ config("internal_config") { @@ -21,7 +21,7 @@ index 1627676872ed1dec2c5162e2c299736c4815d659..1b4d22c93d96dd941f6133f0718eab62 defines += [ "BUILDING_V8_SHARED" ] } } -@@ -4328,7 +4328,7 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -4333,7 +4333,7 @@ if (current_toolchain == v8_generator_toolchain) { "src/interpreter/bytecodes.h", ] @@ -30,7 +30,7 @@ index 1627676872ed1dec2c5162e2c299736c4815d659..1b4d22c93d96dd941f6133f0718eab62 deps = [ ":v8_libbase", -@@ -4361,6 +4361,8 @@ if (current_toolchain == v8_snapshot_toolchain) { +@@ -4366,6 +4366,8 @@ if (current_toolchain == v8_snapshot_toolchain) { configs = [ ":internal_config" ] diff --git a/patches/v8/dcheck.patch b/patches/v8/dcheck.patch index eb0b5cc2d50fe..0dee0f7571102 100644 --- a/patches/v8/dcheck.patch +++ b/patches/v8/dcheck.patch @@ -19,10 +19,10 @@ index a39c4e3f10d5079406f469b76a1ea96c8b2831d8..10693ab15c5e21b40144978b37f3aa99 isolate->default_microtask_queue()->PerformCheckpoint(this); } diff --git a/src/heap/heap.cc b/src/heap/heap.cc -index aa5e3d31ff1bcbef5b4783e540cd33ea539c2d15..5f6c5ad916e19eca9bdd79bda7f9f01aaa6fe44f 100644 +index de290c47977135c2f7b89c2f1945c62e42fe2899..ac2549463e7fe2c4305e1a7120b8c7742e95789f 100644 --- a/src/heap/heap.cc +++ b/src/heap/heap.cc -@@ -5645,9 +5645,9 @@ void Heap::TearDown() { +@@ -5628,9 +5628,9 @@ void Heap::TearDown() { void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback, GCType gc_type, void* data) { DCHECK_NOT_NULL(callback); diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch index 9eda5c5f2b59a..2bce599b581dc 100644 --- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch +++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch @@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not contain any standard C++ library exports (e.g. `std::ostringstream`). diff --git a/BUILD.gn b/BUILD.gn -index 8227e014946c0df2a46ce0c891260b01b1051b23..cfb97c1fb04a0a26994778116c4e2692dd081d1f 100644 +index bc59425484718b97183262f1be6574eb5ff3668c..6783dac18a8b765b9b77ebf3bf84deb7e0d8dc7e 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -368,6 +368,10 @@ config("internal_config") { diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch index 0365cc8c74449..68acdf0e0f9de 100644 --- a/patches/v8/expose_mksnapshot.patch +++ b/patches/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 1b4d22c93d96dd941f6133f0718eab626fa29e43..8227e014946c0df2a46ce0c891260b01b1051b23 100644 +index b1a5b4635c8d1464cd11968212795bebb6665d35..bc59425484718b97183262f1be6574eb5ff3668c 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -4339,7 +4339,6 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -4344,7 +4344,6 @@ if (current_toolchain == v8_generator_toolchain) { if (current_toolchain == v8_snapshot_toolchain) { v8_executable("mksnapshot") { diff --git a/patches/v8/revert_cleanup_switch_offset_of_to_offsetof_where_possible.patch b/patches/v8/revert_cleanup_switch_offset_of_to_offsetof_where_possible.patch index 1da8bc8c34250..7dd3a28c5e1e3 100644 --- a/patches/v8/revert_cleanup_switch_offset_of_to_offsetof_where_possible.patch +++ b/patches/v8/revert_cleanup_switch_offset_of_to_offsetof_where_possible.patch @@ -6,10 +6,10 @@ Subject: Revert "[cleanup] Switch {OFFSET_OF} to {offsetof} where possible." This reverts commit d287e4bc46243841c77cf9798516ee4dcc54bf43. diff --git a/src/deoptimizer/deoptimizer.h b/src/deoptimizer/deoptimizer.h -index ee6978e6292b8b8a847ad125b3b435227107fd91..6c68ea1f96f00df51008a14d3ca7c7e672c47f0f 100644 +index 957b6d6f411332176108c7ed2c7fbce912181865..c0be0ce55ae56e052d6db0f312b33e4ab2b22dd2 100644 --- a/src/deoptimizer/deoptimizer.h +++ b/src/deoptimizer/deoptimizer.h -@@ -494,14 +494,14 @@ class Deoptimizer : public Malloced { +@@ -496,14 +496,14 @@ class Deoptimizer : public Malloced { DeoptimizeKind* type); // Code generation support. @@ -28,7 +28,7 @@ index ee6978e6292b8b8a847ad125b3b435227107fd91..6c68ea1f96f00df51008a14d3ca7c7e6 } V8_EXPORT_PRIVATE static int GetDeoptimizedCodeCount(Isolate* isolate); -@@ -738,11 +738,11 @@ class FrameDescription { +@@ -740,11 +740,11 @@ class FrameDescription { int parameter_count() { return parameter_count_; } static int registers_offset() { From 5cc80d6ecdebc60ccb65429aec01faf404da7ea8 Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Thu, 9 Jul 2020 10:41:54 -0700 Subject: [PATCH 69/79] give a type to pendingPromise --- lib/browser/api/web-contents.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/browser/api/web-contents.ts b/lib/browser/api/web-contents.ts index 01d13bb6a833a..0e30c1291aaf2 100644 --- a/lib/browser/api/web-contents.ts +++ b/lib/browser/api/web-contents.ts @@ -213,7 +213,7 @@ WebContents.prototype.executeJavaScriptInIsolatedWorld = async function (worldId // Translate the options of printToPDF. -let pendingPromise; +let pendingPromise: Promise | undefined; WebContents.prototype.printToPDF = async function (options) { const printSettings = { ...defaultPrintingSetting, From f8b08adf4a7aa9bc4d5862f75ec115ac40dcbc51 Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Thu, 9 Jul 2020 11:21:05 -0700 Subject: [PATCH 70/79] chore: bump chromium in DEPS to 11a8c1534b16d130075d378a64187360ba4e7820 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 251e378217caf..dd0bd37c7d0b5 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - '0881423156abe084164b51ab58ce93a8bd380524', + '11a8c1534b16d130075d378a64187360ba4e7820', 'node_version': 'v12.18.2', 'nan_version': From 516e04138e831cf53d4a2f3ca55fd020cc0a130d Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Thu, 9 Jul 2020 18:33:00 +0000 Subject: [PATCH 71/79] update patches --- .../add_trustedauthclient_to_urlloaderfactory.patch | 6 +++--- patches/chromium/disable_color_correct_rendering.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch b/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch index c8fe8955559e4..986a41341a5b2 100644 --- a/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch +++ b/patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch @@ -49,7 +49,7 @@ index ccac671f0e7e56c731cb9bd92bad788271419a7f..cfea0e5dbc28f1a4cdfea36372ce7f34 // the per-context allow patterns that is managed via NetworkContext // interface. This still respects the per-context block lists. diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc -index 1614fd8d734a0adfa33d22d05b4abaf042975d46..e5559d3351a928f89b08f57ed12d26091b31ce6d 100644 +index 1fa9021a62385fd5c0dadbb8a4a046cd72039915..2b0e4841d009df2f7bb310efca74d2ff79d29b36 100644 --- a/services/network/url_loader.cc +++ b/services/network/url_loader.cc @@ -471,6 +471,7 @@ URLLoader::URLLoader( @@ -72,7 +72,7 @@ index 1614fd8d734a0adfa33d22d05b4abaf042975d46..e5559d3351a928f89b08f57ed12d2609 if (want_raw_headers_) { options_ |= mojom::kURLLoadOptionSendSSLInfoWithResponse | mojom::kURLLoadOptionSendSSLInfoForCertificateError; -@@ -1057,7 +1063,7 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request, +@@ -1061,7 +1067,7 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request, // |this| may have been deleted. return; } @@ -81,7 +81,7 @@ index 1614fd8d734a0adfa33d22d05b4abaf042975d46..e5559d3351a928f89b08f57ed12d2609 OnAuthCredentials(base::nullopt); return; } -@@ -1073,11 +1079,20 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request, +@@ -1077,11 +1083,20 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request, if (url_request->response_headers()) head->headers = url_request->response_headers(); head->auth_challenge_info = auth_info; diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch index fe7199ecee57a..15fa3b5861340 100644 --- a/patches/chromium/disable_color_correct_rendering.patch +++ b/patches/chromium/disable_color_correct_rendering.patch @@ -20,7 +20,7 @@ to deal with color spaces. That is being tracked at https://crbug.com/634542 and https://crbug.com/711107. diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc -index 3749862849ac066066236ca21be756bd6ce9a5c6..aa0e6ce8179150a4f830266b3fa4f960258ea2a4 100644 +index 8357d559a9b513de8a29f965392f3a0fb8c2a80c..6d4257a1900977cd45d07011c9f34544f97808dd 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc @@ -1857,6 +1857,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw( From a7e2281e72571e37b1647226f5c3889301ee04ec Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Thu, 9 Jul 2020 12:48:38 -0700 Subject: [PATCH 72/79] 2272609: Move //services/service_manager/sandbox to //sandbox/policy. https://chromium-review.googlesource.com/c/chromium/src/+/2272609 --- patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch index 2f774112813ef..103f4663c2270 100644 --- a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch +++ b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch @@ -13,7 +13,7 @@ index 4bb529bb574baf54f6e2e0feeb3d95cfebbc2bb2..c5bcbb2fce2ca9d9e4acc7c298b2bfe0 ZygoteHandle GetZygote() override { const base::CommandLine& browser_command_line = *base::CommandLine::ForCurrentProcess(); -+ if (browser_command_line.HasSwitch(service_manager::switches::kNoSandbox)) { ++ if (browser_command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) { + return nullptr; + } base::CommandLine::StringType plugin_launcher = browser_command_line From d38a515148c21d294dbd3bd645a0877291b88f97 Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Thu, 9 Jul 2020 19:59:42 +0000 Subject: [PATCH 73/79] update patches --- patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch index 103f4663c2270..3110c8461b56e 100644 --- a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch +++ b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch @@ -6,7 +6,7 @@ Subject: unsandboxed_ppapi_processes_skip_zygote.patch Unsandboxed ppapi processes should skip zygote. diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc -index 4bb529bb574baf54f6e2e0feeb3d95cfebbc2bb2..c5bcbb2fce2ca9d9e4acc7c298b2bfe02912e410 100644 +index 4bb529bb574baf54f6e2e0feeb3d95cfebbc2bb2..ca89213458022e7d05f385a2ad6006ba926a323f 100644 --- a/content/browser/ppapi_plugin_process_host.cc +++ b/content/browser/ppapi_plugin_process_host.cc @@ -123,6 +123,9 @@ class PpapiPluginSandboxedProcessLauncherDelegate From eda4f96df38acac3699c0c45466dc9ecada52f57 Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Thu, 9 Jul 2020 13:57:19 -0700 Subject: [PATCH 74/79] fixup! 2272609: Move //services/service_manager/sandbox to //sandbox/policy. --- shell/browser/web_contents_preferences.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shell/browser/web_contents_preferences.cc b/shell/browser/web_contents_preferences.cc index 464181c9051e8..c379ee52c9858 100644 --- a/shell/browser/web_contents_preferences.cc +++ b/shell/browser/web_contents_preferences.cc @@ -20,7 +20,7 @@ #include "content/public/common/web_preferences.h" #include "electron/buildflags/buildflags.h" #include "net/base/filename_util.h" -#include "services/service_manager/sandbox/switches.h" +#include "sandbox/policy/switches.h" #include "shell/browser/native_window.h" #include "shell/browser/web_view_manager.h" #include "shell/common/gin_converters/value_converter.h" @@ -318,7 +318,7 @@ void WebContentsPreferences::AppendCommandLineSwitches( if (IsEnabled(options::kSandbox) || can_sandbox_frame) { command_line->AppendSwitch(switches::kEnableSandbox); } else if (!command_line->HasSwitch(switches::kEnableSandbox)) { - command_line->AppendSwitch(service_manager::switches::kNoSandbox); + command_line->AppendSwitch(sandbox::policy::switches::kNoSandbox); command_line->AppendSwitch(::switches::kNoZygote); } From 3822221f99c236c12e2b89ac9b297aee216795f7 Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Thu, 9 Jul 2020 14:25:28 -0700 Subject: [PATCH 75/79] fixup! 2272609: Move //services/service_manager/sandbox to //sandbox/policy. --- shell/app/electron_main_delegate.cc | 8 ++++---- shell/browser/api/electron_api_app.cc | 4 ++-- shell/utility/electron_content_utility_client.cc | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/shell/app/electron_main_delegate.cc b/shell/app/electron_main_delegate.cc index c174594750853..312774e8cca40 100644 --- a/shell/app/electron_main_delegate.cc +++ b/shell/app/electron_main_delegate.cc @@ -26,8 +26,8 @@ #include "electron/buildflags/buildflags.h" #include "extensions/common/constants.h" #include "ipc/ipc_buildflags.h" +#include "sandbox/policy/switches.h" #include "services/service_manager/embedder/switches.h" -#include "services/service_manager/sandbox/switches.h" #include "services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.h" #include "shell/app/electron_content_client.h" #include "shell/browser/electron_browser_client.h" @@ -80,7 +80,7 @@ bool IsBrowserProcess(base::CommandLine* cmd) { bool IsSandboxEnabled(base::CommandLine* command_line) { return command_line->HasSwitch(switches::kEnableSandbox) || - !command_line->HasSwitch(service_manager::switches::kNoSandbox); + !command_line->HasSwitch(sandbox::policy::switches::kNoSandbox); } // Returns true if this subprocess type needs the ResourceBundle initialized @@ -228,7 +228,7 @@ bool ElectronMainDelegate::BasicStartupComplete(int* exit_code) { base::debug::EnableInProcessStackDumping(); if (env->HasVar("ELECTRON_DISABLE_SANDBOX")) - command_line->AppendSwitch(service_manager::switches::kNoSandbox); + command_line->AppendSwitch(sandbox::policy::switches::kNoSandbox); tracing_sampler_profiler_ = tracing::TracingSamplerProfiler::CreateOnMainThread(); @@ -262,7 +262,7 @@ bool ElectronMainDelegate::BasicStartupComplete(int* exit_code) { // Check for --no-sandbox parameter when running as root. if (getuid() == 0 && IsSandboxEnabled(command_line)) LOG(FATAL) << "Running as root without --" - << service_manager::switches::kNoSandbox + << sandbox::policy::switches::kNoSandbox << " is not supported. See https://crbug.com/638180."; #endif diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc index f01d0f6d68c29..a84ac6729cd1f 100644 --- a/shell/browser/api/electron_api_app.cc +++ b/shell/browser/api/electron_api_app.cc @@ -32,7 +32,7 @@ #include "media/audio/audio_manager.h" #include "net/ssl/client_cert_identity.h" #include "net/ssl/ssl_cert_request_info.h" -#include "services/service_manager/sandbox/switches.h" +#include "sandbox/policy/switches.h" #include "shell/browser/api/electron_api_menu.h" #include "shell/browser/api/electron_api_session.h" #include "shell/browser/api/electron_api_web_contents.h" @@ -1360,7 +1360,7 @@ v8::Local App::GetGPUInfo(v8::Isolate* isolate, } static void RemoveNoSandboxSwitch(base::CommandLine* command_line) { - if (command_line->HasSwitch(service_manager::switches::kNoSandbox)) { + if (command_line->HasSwitch(sandbox::policy::switches::kNoSandbox)) { const base::CommandLine::CharType* noSandboxArg = FILE_PATH_LITERAL("--no-sandbox"); base::CommandLine::StringVector modified_command_line; diff --git a/shell/utility/electron_content_utility_client.cc b/shell/utility/electron_content_utility_client.cc index 6385428d8b6da..6e531f9d93512 100644 --- a/shell/utility/electron_content_utility_client.cc +++ b/shell/utility/electron_content_utility_client.cc @@ -11,10 +11,10 @@ #include "base/threading/sequenced_task_runner_handle.h" #include "content/public/utility/utility_thread.h" #include "mojo/public/cpp/bindings/service_factory.h" +#include "sandbox/policy/switches.h" #include "services/proxy_resolver/proxy_resolver_factory_impl.h" #include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h" #include "services/service_manager/public/cpp/service.h" -#include "services/service_manager/sandbox/switches.h" #if defined(OS_WIN) #include "chrome/services/util_win/public/mojom/util_read_icon.mojom.h" @@ -94,7 +94,7 @@ void ElectronContentUtilityClient::ExposeInterfacesToBrowser( #if defined(OS_WIN) base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); utility_process_running_elevated_ = command_line->HasSwitch( - service_manager::switches::kNoSandboxAndElevatedPrivileges); + sandbox::policy::switches::kNoSandboxAndElevatedPrivileges); #endif // If our process runs with elevated privileges, only add elevated Mojo From a25ac14ab9d832c4508c0ec58e2ff48e3eec5ced Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Thu, 9 Jul 2020 16:48:42 -0700 Subject: [PATCH 76/79] 2264511: Cookies: Update SetCanonicalCookie to return CookieAccessResult https://chromium-review.googlesource.com/c/chromium/src/+/2264511 --- shell/browser/api/electron_api_cookies.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/shell/browser/api/electron_api_cookies.cc b/shell/browser/api/electron_api_cookies.cc index 7c2efcd43c44a..1e22a36612219 100644 --- a/shell/browser/api/electron_api_cookies.cc +++ b/shell/browser/api/electron_api_cookies.cc @@ -339,12 +339,11 @@ v8::Local Cookies::Set(v8::Isolate* isolate, manager->SetCanonicalCookie( *canonical_cookie, url, options, base::BindOnce( - [](gin_helper::Promise promise, - net::CookieInclusionStatus status) { - if (status.IsInclude()) { + [](gin_helper::Promise promise, net::CookieAccessResult r) { + if (r.status.IsInclude()) { promise.Resolve(); } else { - promise.RejectWithErrorMessage(InclusionStatusToString(status)); + promise.RejectWithErrorMessage(InclusionStatusToString(r.status)); } }, std::move(promise))); From 1dce5f2fceac6f46a23b8dbe467493bfccc65ec9 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Thu, 9 Jul 2020 16:17:16 -0700 Subject: [PATCH 77/79] chore: fix setAlwaysOnTop test The window must be visible for state to be updated properly. --- spec-main/api-browser-window-spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts index 5d3f54396bc79..ad962e837ba38 100644 --- a/spec-main/api-browser-window-spec.ts +++ b/spec-main/api-browser-window-spec.ts @@ -1266,7 +1266,7 @@ describe('BrowserWindow module', () => { let w = null as unknown as BrowserWindow; beforeEach(() => { - w = new BrowserWindow({ show: false }); + w = new BrowserWindow({ show: true }); }); afterEach(async () => { From 381c995618c4eabab94e453bbcd0136ed53ea1bd Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Mon, 13 Jul 2020 10:38:26 -0400 Subject: [PATCH 78/79] Revert "Migrate modules/desktop_capture and modules/video_capture to webrtc::Mutex." https://webrtc-review.googlesource.com/c/src/+/179080 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index dd0bd37c7d0b5..d3f92a68b1b7c 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - '11a8c1534b16d130075d378a64187360ba4e7820', + '17d931b6d2190fac716f92a66c7578fa4db6501a', 'node_version': 'v12.18.2', 'nan_version': From 7af09472656e720800156aff62ce9dccc46dcb50 Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Mon, 13 Jul 2020 14:53:43 +0000 Subject: [PATCH 79/79] update patches --- .../add_didinstallconditionalfeatures.patch | 20 +++++++++---------- ...ink-worker-enable-csp-in-file-scheme.patch | 4 ++-- patches/chromium/blink_local_frame.patch | 6 +++--- patches/chromium/blink_world_context.patch | 8 ++++---- patches/chromium/can_create_window.patch | 10 +++++----- ...esources_not_chrome_for_spellchecker.patch | 4 ++-- .../disable_color_correct_rendering.patch | 6 +++--- patches/chromium/disable_hidden.patch | 10 +++++----- ...screen_rendering_with_viz_compositor.patch | 2 +- ...ns_through_the_web_contents_delegate.patch | 2 +- patches/chromium/frame_host_manager.patch | 16 +++++++-------- .../chromium/mas_disable_remote_layer.patch | 2 +- patches/chromium/mas_no_private_api.patch | 10 +++++----- .../chromium/notification_provenance.patch | 2 +- ...r_changes_to_the_webcontentsobserver.patch | 6 +++--- ...ove_contentrendererclient_shouldfork.patch | 4 ++-- .../support_mixed_sandbox_with_zygote.patch | 2 +- ...andboxed_ppapi_processes_skip_zygote.patch | 4 ++-- patches/chromium/web_contents.patch | 2 +- .../worker_context_will_destroy.patch | 4 ++-- patches/v8/add_realloc.patch | 2 +- patches/v8/build_gn.patch | 6 +++--- ...export_private_v8_symbols_on_windows.patch | 2 +- patches/v8/expose_mksnapshot.patch | 4 ++-- 24 files changed, 69 insertions(+), 69 deletions(-) diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index 6bd9ec2fc8b96..be31d77a94319 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -10,7 +10,7 @@ DidCreateScriptContext is called, not all JS APIs are available in the context, which can cause some preload scripts to trip. diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h -index 4e195f960d7b9bf50f6784ce380a84a10867914f..dbf85ffe8504bdbab1c4c29f085e5307654d42f6 100644 +index 3e059605c55d88d52cf2544d6aca3446efee5750..398229becb8fd00022b08cc6afed7d1875766e25 100644 --- a/content/public/renderer/render_frame_observer.h +++ b/content/public/renderer/render_frame_observer.h @@ -115,6 +115,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener, @@ -23,10 +23,10 @@ index 4e195f960d7b9bf50f6784ce380a84a10867914f..dbf85ffe8504bdbab1c4c29f085e5307 int32_t world_id) {} virtual void DidClearWindowObject() {} diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index ace1e38791738b6f4086dcbb134ada2dbbd57793..a025d8295cfb719f19ac65c5f00179cb72bd5841 100644 +index c9e8e396135befdd67549326daa2ef5c2339f418..1df3376ca5a8fefc926634c197a8bf043a4f3897 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4741,6 +4741,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, +@@ -4796,6 +4796,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, observer.DidCreateScriptContext(context, world_id); } @@ -40,10 +40,10 @@ index ace1e38791738b6f4086dcbb134ada2dbbd57793..a025d8295cfb719f19ac65c5f00179cb int world_id) { for (auto& observer : observers_) diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h -index fbe1ae23b5b4e292f204155937635a97c7a56bd3..70282750517436dbbeb4ff0ebdecae88210e7006 100644 +index eeac74bc62d6c276d31f714e5a1a024c9ec02838..cf6cfe870b63d675e16fc0e8b80914e19c796ae6 100644 --- a/content/renderer/render_frame_impl.h +++ b/content/renderer/render_frame_impl.h -@@ -716,6 +716,8 @@ class CONTENT_EXPORT RenderFrameImpl +@@ -738,6 +738,8 @@ class CONTENT_EXPORT RenderFrameImpl bool ShouldTrackUseCounter(const blink::WebURL& url) override; void DidCreateScriptContext(v8::Local context, int world_id) override; @@ -53,10 +53,10 @@ index fbe1ae23b5b4e292f204155937635a97c7a56bd3..70282750517436dbbeb4ff0ebdecae88 int world_id) override; void DidChangeScrollOffset() override; diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h -index b5bdc8cf2e637010d18ec7d6f0334292964249c3..f4dd737d60da52c119527a7322a0db3757d7c03b 100644 +index 54a40d9a90d1dbb13d8234494ab53893ca339ee4..aee9160cba302b394594debfbc8dd0e400efbb46 100644 --- a/third_party/blink/public/web/web_local_frame_client.h +++ b/third_party/blink/public/web/web_local_frame_client.h -@@ -547,6 +547,9 @@ class BLINK_EXPORT WebLocalFrameClient { +@@ -546,6 +546,9 @@ class BLINK_EXPORT WebLocalFrameClient { virtual void DidCreateScriptContext(v8::Local, int32_t world_id) {} @@ -79,10 +79,10 @@ index 17ebe5efb8b0bfcf17eda69fe4373b61b213af72..b7296a900c04006812d5f01b05c46a22 if (World().IsMainWorld()) { GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld(); diff --git a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc -index c42ed24c2288675f88f0e6262524687f6f02a221..a594b717c1ee060ffafd79352d47d64e6bcb0703 100644 +index c586e0f7c21060f5f6a088631b5b0b9d57fad4eb..fc0fc331ecd535422eeb15bd831d64946edff3b2 100644 --- a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc +++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc -@@ -362,6 +362,13 @@ void LocalFrameClientImpl::DidCreateScriptContext( +@@ -391,6 +391,13 @@ void LocalFrameClientImpl::DidCreateScriptContext( web_frame_->Client()->DidCreateScriptContext(context, world_id); } @@ -97,7 +97,7 @@ index c42ed24c2288675f88f0e6262524687f6f02a221..a594b717c1ee060ffafd79352d47d64e v8::Local context, int32_t world_id) { diff --git a/third_party/blink/renderer/core/exported/local_frame_client_impl.h b/third_party/blink/renderer/core/exported/local_frame_client_impl.h -index 7e95076bad8579a6b3d5d02807e3668cedb2f4ee..888d5f7fa1037ca9f71a05bfc09825cc85f7c78d 100644 +index b21e7f5ba906d13045f38f986677106d35cc1d60..024188a4365261ba47ac200d15d8c0e52eb80a90 100644 --- a/third_party/blink/renderer/core/exported/local_frame_client_impl.h +++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.h @@ -78,6 +78,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient { diff --git a/patches/chromium/blink-worker-enable-csp-in-file-scheme.patch b/patches/chromium/blink-worker-enable-csp-in-file-scheme.patch index a038ca4b3400f..6b446a4a153d2 100644 --- a/patches/chromium/blink-worker-enable-csp-in-file-scheme.patch +++ b/patches/chromium/blink-worker-enable-csp-in-file-scheme.patch @@ -6,10 +6,10 @@ Subject: blink-worker-enable-csp-in-file-scheme.patch This allows file:// URLs in workers to have a CSP. 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 c8a4f02e69491345a6353e557b6bbdc34bb2999a..982995c8bf4632a2970c90780f3c2da3f244634e 100644 +index 8dbcdb1132c74d4a459932a9634e5f15aef92a9a..71b50717ae1a10ef3009e808f813d389af873888 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 -@@ -323,7 +323,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy( +@@ -373,7 +373,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/chromium/blink_local_frame.patch b/patches/chromium/blink_local_frame.patch index 99a36c7965a48..11c6abe8c8635 100644 --- a/patches/chromium/blink_local_frame.patch +++ b/patches/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 a6c8dc9732da47c5fd043ace2a4964a3b8569155..faee2226e2539ce12f5192e87b227e1177dc6bda 100644 +index 55dfea6ac16d63cd7fc78114d430889c62d0e69a..74d2122efa86d90490b05a15858556055172ad2f 100644 --- a/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc -@@ -547,10 +547,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { +@@ -551,10 +551,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { } CHECK(!view_ || !view_->IsAttached()); @@ -28,7 +28,7 @@ index a6c8dc9732da47c5fd043ace2a4964a3b8569155..faee2226e2539ce12f5192e87b227e11 if (!Client()) return; -@@ -568,6 +564,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) { +@@ -572,6 +568,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/chromium/blink_world_context.patch b/patches/chromium/blink_world_context.patch index 462b0a1c2ac00..1dc25ed3dc233 100644 --- a/patches/chromium/blink_world_context.patch +++ b/patches/chromium/blink_world_context.patch @@ -7,7 +7,7 @@ This exposes a method for obtaining a reference to an isolated world, which is otherwise not available in the Blink API. diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h -index 198a934c8d9613eb612e6a8cb94d04e27a4dd021..abae04fec8e99d89a548020d50f3d8ab5feffa32 100644 +index 179221fbaf54f77373a3f1215d0d1ef287d0ef2b..daeafa747aa7bd0a9b673f8e0d64042eeb768a24 100644 --- a/third_party/blink/public/web/web_local_frame.h +++ b/third_party/blink/public/web/web_local_frame.h @@ -355,6 +355,8 @@ class WebLocalFrame : public WebFrame { @@ -20,10 +20,10 @@ index 198a934c8d9613eb612e6a8cb94d04e27a4dd021..abae04fec8e99d89a548020d50f3d8ab // Executes script in the context of the current page and returns the value // that the script evaluated to with callback. Script execution can be 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 bd26bf9dc60718d3f2ebd39734d3d425280f310c..db491f3c3393e53f12a2671bcdbf1a6a487ef9db 100644 +index 3b9a026151e9ec9080e2e32365990e319cbc0556..c25aa04ddd24c73c86992e5148b39da8a3c6a8d7 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 -@@ -972,6 +972,13 @@ v8::Local WebLocalFrameImpl::GlobalProxy() const { +@@ -976,6 +976,13 @@ v8::Local WebLocalFrameImpl::GlobalProxy() const { return MainWorldScriptContext()->Global(); } @@ -38,7 +38,7 @@ index bd26bf9dc60718d3f2ebd39734d3d425280f310c..db491f3c3393e53f12a2671bcdbf1a6a 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 9b2592b4859734fbd5deaea245209eee4c3c9ed3..ecc3555e14128c66288c7561d941609ff93fce13 100644 +index 380964de98121d1372bacafdc68de08e16362fac..f2f759fe7797087bfb962080539a5bc78108484d 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 @@ -166,6 +166,8 @@ class CORE_EXPORT WebLocalFrameImpl final diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index b85d16c901fd3..9763d8e531fef 100644 --- a/patches/chromium/can_create_window.patch +++ b/patches/chromium/can_create_window.patch @@ -9,10 +9,10 @@ potentially prevent a window from being created. TODO(loc): this patch is currently broken. diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc -index 802b9ce5070f881a24540576125b19d3a43145f4..b1b856a041daeeed52173d429e069e3261b1c180 100644 +index 026d72790073641c62a1d8a816d49ceef386d513..799d5c785aebb52db45861939b7f7101dfaeb996 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc -@@ -4671,6 +4671,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -4668,6 +4668,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, @@ -21,7 +21,7 @@ index 802b9ce5070f881a24540576125b19d3a43145f4..b1b856a041daeeed52173d429e069e32 &no_javascript_access); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 6e3c290f85e5b8d00ed030d0147c01c42e34c933..bb0f374cb02e4ab26934cfab5533000601ca568a 100644 +index f239aef371253e56c3f06d84e5fe1aef5e6c6976..ec2539f1256eaba4335505e2eaa068449dbd8aff 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -3090,9 +3090,9 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow( @@ -206,10 +206,10 @@ index 4f735ad0d97eaac9a57dad137e479f8a7ec33a36..0a3c5821962c85609b64b3625fa6b8d6 } // namespace blink diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc -index 37a925e0602ebc3d3685a745ec0fd4cd63c5d390..6f3dfe84715e11049ed271363ded3ce096ec63d4 100644 +index 3753f3f3a266c83f79d01eeb696cc0e3152815fe..a356dd2db092cdcbce7e53e12412562b6553040b 100644 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc -@@ -1969,6 +1969,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, +@@ -1962,6 +1962,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate, } WebWindowFeatures window_features = GetWindowFeaturesFromString(features); diff --git a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch index d9f82a5947512..5e834c31178e7 100644 --- a/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch +++ b/patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch @@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from Electrons grit header instead of Chromes diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index a790ef04603593efd12ca15ece0d43bf9bb63554..c5c72d9891bc56c3d7ddb7a4d43ea77b1f637fee 100644 +index b291ae0c0a785e6905d2b9188a3d7adc92b82d18..afcb79039dafde05096cc94973a7169cbc28e0fd 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -5543,6 +5543,7 @@ static_library("browser") { +@@ -5545,6 +5545,7 @@ static_library("browser") { deps += [ "//components/spellcheck/browser", "//components/spellcheck/common", diff --git a/patches/chromium/disable_color_correct_rendering.patch b/patches/chromium/disable_color_correct_rendering.patch index 15fa3b5861340..f523e7971e68d 100644 --- a/patches/chromium/disable_color_correct_rendering.patch +++ b/patches/chromium/disable_color_correct_rendering.patch @@ -20,7 +20,7 @@ to deal with color spaces. That is being tracked at https://crbug.com/634542 and https://crbug.com/711107. diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc -index 8357d559a9b513de8a29f965392f3a0fb8c2a80c..6d4257a1900977cd45d07011c9f34544f97808dd 100644 +index 9811ffee3f5e0a134e488c1267d662adde33e18b..1742be389a1a5d6b2cee3f17a251fbf58668f0d2 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc @@ -1857,6 +1857,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw( @@ -219,7 +219,7 @@ index ff4ccbbc0e24ea624f421e1a6e7d5b817106a292..269a4ac2f580f9d8858db84fe7d91c79 + +#undef PATCH_CS diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc -index ac1bc8252f7c815d27f568df8fc3a8f7b08b55fe..9e58542edc52035174f4862f724ca22d32feca34 100644 +index b8032917cce5224403304c5f41674533e3d59528..2e871204e8dc9bf13315ba9a1448ab7ce157180c 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc @@ -220,6 +220,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus( @@ -231,7 +231,7 @@ index ac1bc8252f7c815d27f568df8fc3a8f7b08b55fe..9e58542edc52035174f4862f724ca22d sandbox::policy::switches::kGpuSandboxAllowSysVShm, sandbox::policy::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 5cf4a3c571f94629d4ed5b7b44603d8fe7d49da1..d41d1e32a500dadd2cd3144f34dfc641303977aa 100644 +index 0cd572d4793ebe72ce576000ffbc302aa703b58c..2f6f7cd0bdab9136dd166a191c01f4e83f15de65 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -227,6 +227,7 @@ diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch index c5c48493d94da..4de455f382ee0 100644 --- a/patches/chromium/disable_hidden.patch +++ b/patches/chromium/disable_hidden.patch @@ -6,7 +6,7 @@ Subject: disable_hidden.patch Electron uses this to disable background throttling for hidden windows. diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc -index a864563445eebddb86dc6e5020fdd5e6ca4b7f4b..57b44076b0f387aa080963cceb57d678c151becb 100644 +index b4a91a68db21b516bd702c1a478351b310436bd3..c110e85b75c3e871015694686b94fde6921e8c82 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -667,6 +667,9 @@ void RenderWidgetHostImpl::WasHidden() { @@ -20,10 +20,10 @@ index a864563445eebddb86dc6e5020fdd5e6ca4b7f4b..57b44076b0f387aa080963cceb57d678 blink::mojom::PointerLockResult::kWrongDocument); diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h -index 5f3f2feec8c787ff1e086bf256ef9353732037af..a127ec54042ef869f0e19ba6b86b86d4d071304c 100644 +index c662e2463ce34734af7488dd65306a6180e4a34d..86eef6f279986cd5830a3ab50d19ff898961d478 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h -@@ -177,6 +177,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl +@@ -176,6 +176,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl // RenderWidgetHostImpl. static RenderWidgetHostImpl* From(RenderWidgetHost* rwh); @@ -34,10 +34,10 @@ index 5f3f2feec8c787ff1e086bf256ef9353732037af..a127ec54042ef869f0e19ba6b86b86d4 const base::TimeDelta& delay) { new_content_rendering_delay_ = delay; diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc -index 2155c6a82f3ad4174528917f78552b0e0a1252f0..4bc890eb9e345aa1e641a01394a32d80c1c4aa20 100644 +index b736fef38e6f27bf16e60efe9464f342b74a50e9..9f2e1974ff7b7f4970a23accde1d9285b8bf001a 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -621,7 +621,7 @@ void RenderWidgetHostViewAura::HideImpl() { +@@ -622,7 +622,7 @@ void RenderWidgetHostViewAura::HideImpl() { DCHECK(visibility_ == Visibility::HIDDEN || visibility_ == Visibility::OCCLUDED); diff --git a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch index a81dc9ea595ad..a794f269b6660 100644 --- a/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch +++ b/patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch @@ -94,7 +94,7 @@ index 1026b739d283f0fc252fa2af83a6d4cf51bc8553..fe562ab60ce98b8bb0c5080a6428deb3 private: const HWND hwnd_; diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn -index 3e4dd38b5bcdc1727f8f1a1faf8ad5aa21a5b9fb..4e7d3d4539d2190b21da9d4375ee0101243a97c7 100644 +index 31edc0dfc191b82b8f1bff5fcfd95c9cec5ea2b1..d59e0c156c5e02ac37d6aa233cf4cac836152d7c 100644 --- a/components/viz/service/BUILD.gn +++ b/components/viz/service/BUILD.gn @@ -111,6 +111,8 @@ viz_component("service") { diff --git a/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch b/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch index da26daebd0655..5bef94bf75a1d 100644 --- a/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch +++ b/patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch @@ -13,7 +13,7 @@ This patch can be removed once app.allowRendererProcessReuse is forced to true as then Chromiums assumptions around processes become correct. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index bb0f374cb02e4ab26934cfab5533000601ca568a..7f3597287d32c44a870bc2b7242c190c57c44a3a 100644 +index ec2539f1256eaba4335505e2eaa068449dbd8aff..1328f3e90dacf7e9425175151f43f33e39ecf673 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -2500,11 +2500,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) { diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index 3085c5d114249..4dd9aa1ac4553 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -42,10 +42,10 @@ index 6b03c07316eaab83a50afc123fc9f17b1c1dfa3b..e821571731e4e1a93f873477c7410de7 // another SiteInstance for the same site. void RegisterSiteInstance(SiteInstanceImpl* site_instance); diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc -index 34a4bf511b08885511178d423c669f68d408d2bc..db3f744ca3b39704f9c76813b63bc1e99c1700f1 100644 +index c21435fa113d8e4e77704464862291e8d567b974..074caeee4c500a68e6005272e39585bc4323a953 100644 --- a/content/browser/frame_host/navigation_request.cc +++ b/content/browser/frame_host/navigation_request.cc -@@ -1458,6 +1458,21 @@ void NavigationRequest::BeginNavigation() { +@@ -1455,6 +1455,21 @@ void NavigationRequest::BeginNavigation() { // it immediately. EnterChildTraceEvent("ResponseStarted", this); @@ -67,7 +67,7 @@ index 34a4bf511b08885511178d423c669f68d408d2bc..db3f744ca3b39704f9c76813b63bc1e9 // Select an appropriate RenderFrameHost. render_frame_host_ = frame_tree_node_->render_manager()->GetFrameHostForNavigation(this); -@@ -4898,6 +4913,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { +@@ -4895,6 +4910,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { {WILL_START_REQUEST, { WILL_REDIRECT_REQUEST, WILL_PROCESS_RESPONSE, @@ -75,7 +75,7 @@ index 34a4bf511b08885511178d423c669f68d408d2bc..db3f744ca3b39704f9c76813b63bc1e9 READY_TO_COMMIT, DID_COMMIT, CANCELING, -@@ -4911,10 +4927,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { +@@ -4908,10 +4924,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const { WILL_FAIL_REQUEST, }}, {WILL_PROCESS_RESPONSE, { @@ -106,10 +106,10 @@ index 746e5a1b3fcb9b4ca954626bbf686b07a6776033..a5138a5760a11e35383ce42205645c7a READY_TO_COMMIT, diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc -index 29d08bbdfd402f0e617f121533234305fabd1ec6..d40aed731f0388b4a88d20c18dc6b7f0e700ce80 100644 +index f8066e336552afc82b3177e37bd78bee978866c6..6b2226b394fdc5de32fbd8cd934f1a1bd2a220c1 100644 --- a/content/browser/frame_host/render_frame_host_manager.cc +++ b/content/browser/frame_host/render_frame_host_manager.cc -@@ -2332,6 +2332,16 @@ bool RenderFrameHostManager::InitRenderView( +@@ -2333,6 +2333,16 @@ bool RenderFrameHostManager::InitRenderView( scoped_refptr RenderFrameHostManager::GetSiteInstanceForNavigationRequest( NavigationRequest* request) { @@ -126,7 +126,7 @@ index 29d08bbdfd402f0e617f121533234305fabd1ec6..d40aed731f0388b4a88d20c18dc6b7f0 SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance(); // All children of MHTML documents must be MHTML documents. They all live in -@@ -2351,10 +2361,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( +@@ -2352,10 +2362,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( // // TODO(clamy): We should also consider as a candidate SiteInstance the // speculative SiteInstance that was computed on redirects. @@ -191,7 +191,7 @@ index 29d08bbdfd402f0e617f121533234305fabd1ec6..d40aed731f0388b4a88d20c18dc6b7f0 // Account for renderer-initiated reload as well. // Needed as a workaround for https://crbug.com/1045524, remove it when it is -@@ -2384,6 +2444,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( +@@ -2381,6 +2441,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( request->ResetStateForSiteInstanceChange(); } diff --git a/patches/chromium/mas_disable_remote_layer.patch b/patches/chromium/mas_disable_remote_layer.patch index 35f24f47c2e66..a52974e020ed5 100644 --- a/patches/chromium/mas_disable_remote_layer.patch +++ b/patches/chromium/mas_disable_remote_layer.patch @@ -41,7 +41,7 @@ index d565d2ab23d7a42e6787b58103fd40a8675b8e28..4cb9681c1f810a0cbd7f7ef04c4a7c73 gfx::Size pixel_size_; diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.mm b/gpu/ipc/service/image_transport_surface_overlay_mac.mm -index f0dd2928aefcfef71e148e4e5c1e88dd7f9b0724..3461a7839a13f5c34c78b9b13997d5d3e42977a4 100644 +index 67e0efb23c717c3194f27695215a8bd20dbbb957..cf02fab328d9fe7a6e9f53c712a7c1c871b8b304 100644 --- a/gpu/ipc/service/image_transport_surface_overlay_mac.mm +++ b/gpu/ipc/service/image_transport_surface_overlay_mac.mm @@ -51,7 +51,7 @@ ImageTransportSurfaceOverlayMacBase:: diff --git a/patches/chromium/mas_no_private_api.patch b/patches/chromium/mas_no_private_api.patch index 24a49b454f8a9..55c71a3be6e6e 100644 --- a/patches/chromium/mas_no_private_api.patch +++ b/patches/chromium/mas_no_private_api.patch @@ -348,10 +348,10 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177 return nil; } diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm -index 83d0106f0f237dea75dfafe011bf527d97240d0d..462577a0dbd0fcc1baf17acd9678317cb27503fa 100644 +index 04bbb885b29cd2038f11214d0bec40a2b691f5e1..abfdcfbe576dbddc42090818cc2bc13da4b453e9 100644 --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm -@@ -525,6 +525,7 @@ NSDictionary* BrowserAccessibilityManagerMac:: +@@ -526,6 +526,7 @@ NSDictionary* BrowserAccessibilityManagerMac:: [user_info setObject:native_focus_object forKey:NSAccessibilityTextChangeElement]; @@ -359,7 +359,7 @@ index 83d0106f0f237dea75dfafe011bf527d97240d0d..462577a0dbd0fcc1baf17acd9678317c id selected_text = [native_focus_object selectedTextMarkerRange]; if (selected_text) { NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute = -@@ -532,6 +533,7 @@ NSDictionary* BrowserAccessibilityManagerMac:: +@@ -533,6 +534,7 @@ NSDictionary* BrowserAccessibilityManagerMac:: [user_info setObject:selected_text forKey:NSAccessibilitySelectedTextMarkerRangeAttribute]; } @@ -400,7 +400,7 @@ index 28ca1646af0b0cce40d27baec71cbe65adc334fa..bae65c1f485bc02eb9ef2ebf7018af4a } // namespace diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm -index 1ecb98346e11c14440b509ce62e12b0a426130fc..c0fab734ed37a67d5e1797bb2bd6df098acec530 100644 +index 05bf0aab2ceef177ca9e2233407946efba971b8e..fdfd84d856ddbbe95d9f4e0f6e790546d5aa8e08 100644 --- a/device/bluetooth/bluetooth_adapter_mac.mm +++ b/device/bluetooth/bluetooth_adapter_mac.mm @@ -36,6 +36,7 @@ @@ -430,7 +430,7 @@ index 1ecb98346e11c14440b509ce62e12b0a426130fc..c0fab734ed37a67d5e1797bb2bd6df09 should_update_name_(true), classic_discovery_manager_( BluetoothDiscoveryManagerMac::CreateClassic(this)), -@@ -307,8 +311,12 @@ base::WeakPtr BluetoothAdapterMac::GetWeakPtr() { +@@ -306,8 +310,12 @@ base::WeakPtr BluetoothAdapterMac::GetWeakPtr() { } bool BluetoothAdapterMac::SetPoweredImpl(bool powered) { diff --git a/patches/chromium/notification_provenance.patch b/patches/chromium/notification_provenance.patch index 2055283b20b57..e31c47dcd75b8 100644 --- a/patches/chromium/notification_provenance.patch +++ b/patches/chromium/notification_provenance.patch @@ -108,7 +108,7 @@ index 4bf25bf1fa69f7d3869369172d375e2e489e62a1..f80ef2cecc8b111dc54e109646573a59 mojo::PendingReceiver receiver); diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc -index 0e0b0d7ea55dda0f68fe410a22ff51ffd4f901e7..210f216c3bd6ba4d3ef21f795f86f8c14dbb6a96 100644 +index 687698d6ff258a57e941805ef4d8fae4d36db612..f40f089582ff616ea54b7f44309e78515b5967f5 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -2144,7 +2144,7 @@ void RenderProcessHostImpl::CreateNotificationService( diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch index ee0bdb8032db1..06da3e50c8187 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -30,10 +30,10 @@ index 1feca3a3d2d13278a8c11038177caa661cbab22c..1ca75dc4b5228077f6658919b36004bc // RenderWidgetHost on the main frame, and false otherwise. virtual bool IsWidgetForMainFrame(RenderWidgetHostImpl*); diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc -index 57b44076b0f387aa080963cceb57d678c151becb..db34c9c30a6501cf73c767bfd375f67a472b9fd8 100644 +index c110e85b75c3e871015694686b94fde6921e8c82..001e077e378052cae7f067aafae6684a2bc43f26 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc -@@ -1665,6 +1665,8 @@ void RenderWidgetHostImpl::SetCursor(const WebCursor& cursor) { +@@ -1634,6 +1634,8 @@ void RenderWidgetHostImpl::SetCursor(const WebCursor& cursor) { if (!view_) return; view_->UpdateCursor(cursor); @@ -43,7 +43,7 @@ index 57b44076b0f387aa080963cceb57d678c151becb..db34c9c30a6501cf73c767bfd375f67a void RenderWidgetHostImpl::OnCursorVisibilityStateChanged(bool is_visible) { diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 9740478de8ff9838ca45ede8051de073a055cf6f..746ceccef093db0d095e492ab44b2efd11bd0875 100644 +index 56d2bb4cf5735f5e13e856c420a187e12ab7a666..7c673dbf59cc54245fa71b854c8b062f0c3a161e 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -3594,6 +3594,11 @@ bool WebContentsImpl::OnUpdateDragCursor() { diff --git a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch index 39516c2d1d737..b07c28dd51bc9 100644 --- a/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch +++ b/patches/chromium/revert_remove_contentrendererclient_shouldfork.patch @@ -92,10 +92,10 @@ index cc6101c82e659bbc5a8568c166d5a56fae0c8d64..8309bb7f3f284b0930c13a7e75a7f9de // |url|. If the function returns a valid |new_url|, the request must be // updated to use it. The |force_ignore_site_for_cookies| output parameter diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index a025d8295cfb719f19ac65c5f00179cb72bd5841..aefded0fa0f019645d2370eb5f41d996d542c993 100644 +index 1df3376ca5a8fefc926634c197a8bf043a4f3897..ad6c4fcca39d020fd2043c712a65b36346e06c82 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -5484,6 +5484,23 @@ void RenderFrameImpl::BeginNavigation( +@@ -5539,6 +5539,23 @@ void RenderFrameImpl::BeginNavigation( // we can do a per-frame check here rather than a process-wide check. bool should_fork = HasWebUIScheme(url) || HasWebUIScheme(old_url) || (enabled_bindings_ & kWebUIBindingsPolicyMask); diff --git a/patches/chromium/support_mixed_sandbox_with_zygote.patch b/patches/chromium/support_mixed_sandbox_with_zygote.patch index 05e1e7ba3c93d..927d429e253ba 100644 --- a/patches/chromium/support_mixed_sandbox_with_zygote.patch +++ b/patches/chromium/support_mixed_sandbox_with_zygote.patch @@ -22,7 +22,7 @@ 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 210f216c3bd6ba4d3ef21f795f86f8c14dbb6a96..5cf4a3c571f94629d4ed5b7b44603d8fe7d49da1 100644 +index f40f089582ff616ea54b7f44309e78515b5967f5..0cd572d4793ebe72ce576000ffbc302aa703b58c 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -413,6 +413,11 @@ class RendererSandboxedProcessLauncherDelegate diff --git a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch index 3110c8461b56e..9af3ad5e146a2 100644 --- a/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch +++ b/patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch @@ -6,10 +6,10 @@ Subject: unsandboxed_ppapi_processes_skip_zygote.patch Unsandboxed ppapi processes should skip zygote. diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc -index 4bb529bb574baf54f6e2e0feeb3d95cfebbc2bb2..ca89213458022e7d05f385a2ad6006ba926a323f 100644 +index 7846244231558f74cf5a9afdec3cd8597e0f5368..257452822d95e74a0d6da2b731bd02a2bd99b119 100644 --- a/content/browser/ppapi_plugin_process_host.cc +++ b/content/browser/ppapi_plugin_process_host.cc -@@ -123,6 +123,9 @@ class PpapiPluginSandboxedProcessLauncherDelegate +@@ -122,6 +122,9 @@ class PpapiPluginSandboxedProcessLauncherDelegate ZygoteHandle GetZygote() override { const base::CommandLine& browser_command_line = *base::CommandLine::ForCurrentProcess(); diff --git a/patches/chromium/web_contents.patch b/patches/chromium/web_contents.patch index 8376c067fdfb4..fe5c303177fff 100644 --- a/patches/chromium/web_contents.patch +++ b/patches/chromium/web_contents.patch @@ -9,7 +9,7 @@ is needed for OSR. Originally landed in https://github.com/electron/libchromiumcontent/pull/226. diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 7f3597287d32c44a870bc2b7242c190c57c44a3a..9740478de8ff9838ca45ede8051de073a055cf6f 100644 +index 1328f3e90dacf7e9425175151f43f33e39ecf673..56d2bb4cf5735f5e13e856c420a187e12ab7a666 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -2233,6 +2233,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { diff --git a/patches/chromium/worker_context_will_destroy.patch b/patches/chromium/worker_context_will_destroy.patch index 450ecbc585017..9d31dda1f1fa9 100644 --- a/patches/chromium/worker_context_will_destroy.patch +++ b/patches/chromium/worker_context_will_destroy.patch @@ -67,10 +67,10 @@ index 9351a302916a2cbeecf3a6a934aee0431127008c..754634fd4935cdf38168361f1491cf3a 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 05414c7fba07de0b461100614e396b96c0389330..7cfe2ca3b42e0378dd84816195f440b1f85ed5fc 100644 +index 8d8b0a32951496dfa53c7eb2cba2b085e4bbdceb..6ab264479c63c5ce6975d30db1d14ebbe53b48c4 100644 --- a/third_party/blink/renderer/core/workers/worker_thread.cc +++ b/third_party/blink/renderer/core/workers/worker_thread.cc -@@ -682,6 +682,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() { +@@ -694,6 +694,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() { nested_runner_->QuitNow(); } diff --git a/patches/v8/add_realloc.patch b/patches/v8/add_realloc.patch index 6fc6fa47e20e9..87f8cd207c705 100644 --- a/patches/v8/add_realloc.patch +++ b/patches/v8/add_realloc.patch @@ -12,7 +12,7 @@ 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 ef80b6bff946cccc9dd0b735c780a45e188fe384..6ba5382f419e22fe8ce4cd95456a4771f2df04a2 100644 +index ce0be64bd55112382903a2565e67ecd2a1d9c0b6..1273dc87d98a22bb9d1e824f101f3a21bf50f4c6 100644 --- a/include/v8.h +++ b/include/v8.h @@ -5068,6 +5068,13 @@ class V8_EXPORT ArrayBuffer : public Object { diff --git a/patches/v8/build_gn.patch b/patches/v8/build_gn.patch index 4f3bddc5a36d3..681f81f29ba81 100644 --- a/patches/v8/build_gn.patch +++ b/patches/v8/build_gn.patch @@ -9,7 +9,7 @@ necessary for native modules to load. Also, some fixes relating to mksnapshot on ARM. diff --git a/BUILD.gn b/BUILD.gn -index cf0a2d786a25c22341d99d8653fd4dbf76a23dd6..b1a5b4635c8d1464cd11968212795bebb6665d35 100644 +index 71049f4e9772f91e6b650a7cc0543df4e4f1f393..b01b37b9b709c29b1d837c1d937c5c76db38ad44 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -368,7 +368,7 @@ config("internal_config") { @@ -21,7 +21,7 @@ index cf0a2d786a25c22341d99d8653fd4dbf76a23dd6..b1a5b4635c8d1464cd11968212795beb defines += [ "BUILDING_V8_SHARED" ] } } -@@ -4333,7 +4333,7 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -4343,7 +4343,7 @@ if (current_toolchain == v8_generator_toolchain) { "src/interpreter/bytecodes.h", ] @@ -30,7 +30,7 @@ index cf0a2d786a25c22341d99d8653fd4dbf76a23dd6..b1a5b4635c8d1464cd11968212795beb deps = [ ":v8_libbase", -@@ -4366,6 +4366,8 @@ if (current_toolchain == v8_snapshot_toolchain) { +@@ -4376,6 +4376,8 @@ if (current_toolchain == v8_snapshot_toolchain) { configs = [ ":internal_config" ] diff --git a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch index 2bce599b581dc..787c50d95f6de 100644 --- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch +++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch @@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not contain any standard C++ library exports (e.g. `std::ostringstream`). diff --git a/BUILD.gn b/BUILD.gn -index bc59425484718b97183262f1be6574eb5ff3668c..6783dac18a8b765b9b77ebf3bf84deb7e0d8dc7e 100644 +index 831002b8b783dd945198d2a43217452d71a0d6e5..1bf65866d5ad3357c7c196d849a5621aed389758 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -368,6 +368,10 @@ config("internal_config") { diff --git a/patches/v8/expose_mksnapshot.patch b/patches/v8/expose_mksnapshot.patch index 68acdf0e0f9de..48f43be8c0233 100644 --- a/patches/v8/expose_mksnapshot.patch +++ b/patches/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 b1a5b4635c8d1464cd11968212795bebb6665d35..bc59425484718b97183262f1be6574eb5ff3668c 100644 +index b01b37b9b709c29b1d837c1d937c5c76db38ad44..831002b8b783dd945198d2a43217452d71a0d6e5 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -4344,7 +4344,6 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -4354,7 +4354,6 @@ if (current_toolchain == v8_generator_toolchain) { if (current_toolchain == v8_snapshot_toolchain) { v8_executable("mksnapshot") {