Skip to content

Commit 69f1731

Browse files
electron-botElectron BotckerrnornagonJohn Kleinschmidt
authored
chore: bump chromium to ec5bc1743792d64724693eb357083 (master) (electron#24984)
* chore: bump chromium in DEPS to cbdeef954dfc34e94c8ca9cf72ad326b4a121158 * chore: bump chromium in DEPS to 29723f905baeab1d4228eef2c31cdb341ebeffe0 * chore: bump chromium in DEPS to 44d6d78e852137fff58c14ed26ab1e803e5bf822 * update patches * chore: bump chromium in DEPS to 8a3a0fccb39d6b8334c9a0496c0d5056e50cdb3f * chore: update patches * refactor: fix PrintBackend::CreateInstance() calls Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2354541 * chore: bump chromium in DEPS to b9ebec3bcb1cabdd1426f367636f54cc98e0500e * chore: remove patches to code that was deleted upstream CL: https://chromium-review.googlesource.com/c/chromium/src/+/2360314 * Remove uses of kCGColorSpaceITUR_2020_PQ_EOTF/HLG CL: https://chromium-review.googlesource.com/c/chromium/src/+/2363950 just garden variety code shear * chore: update patch indices * Move ColorModel to //printing/mojom/print.mojom https://chromium-review.googlesource.com/c/chromium/src/+/2355083 sync with printing ColorModel changes: moved to mojo, different naming scheme * chore: bump chromium in DEPS to 56c4b4d2ce5ba941acd2e0fdb5100e8a48847134 * chore: bump chromium in DEPS to 130501f220b684a79dc82c17e236e63ac1f2a093 * Convert PrintHostMsg_DidGetPrintedPagesCount to Mojo https://chromium-review.googlesource.com/c/chromium/src/+/2326857 Update argument list to Print() * chore: update patch indices * DumpAccTree: convert utf16 to utf8 in PropertyFilter https://chromium-review.googlesource.com/c/chromium/src/+/2360218 * chore: bump chromium in DEPS to 3058368c6646e0dc8be6f8ea838b0343428b7998 * chore: bump chromium in DEPS to f51b4e6555364363c61438dac7afd988c8347bfc * chore: bump chromium in DEPS to 2dcc6f8fc23ac41b2499eb69dee0b4017e9d1046 * update patches * chore: bump chromium in DEPS to 2d8e98ecedc7e4905540b053bc1c87e964715be5 * update patches * 2345900: Move content::RecordContentToVisibleTimeRequest struct to mojo https://chromium-review.googlesource.com/c/chromium/src/+/2345900 * update patches * 2345900: Move content::RecordContentToVisibleTimeRequest struct to mojo https://chromium-review.googlesource.com/c/chromium/src/+/2345900 * 2367394: Remove net::LOAD_DO_NOT_SEND_COOKIES and net::LOAD_DO_NOT_SEND_AUTH_DATA. https://chromium-review.googlesource.com/c/chromium/src/+/2367394 * 2373227: [XProto] Consolidate all <X11/*> includes to //ui/gfx/x/x11.h https://chromium-review.googlesource.com/c/chromium/src/+/2373227 * fixup! 2373227: [XProto] Consolidate all <X11/*> includes to //ui/gfx/x/x11.h * chore: bump chromium in DEPS to c090e3f960520cbd2328608b97f87238c76d6143 * update patches * chore: bump chromium in DEPS to 13a25e0a755de9a14271022c595f3d2e29829e1a * chore: bump chromium in DEPS to 6adbb767b012c41efaeab0d1bdbb3eefed0977bc * chore: bump chromium in DEPS to 339ec5455c5932ef1322ea9953a6349b0732199e * chore: bump chromium in DEPS to 20291807c33f7ef4ef4f57d62075e099b027bfe6 * chore: bump chromium in DEPS to 226fbd1b8b17d4ac84fdb9548ef3a1c646878d47 * update patches * fixup disable_color_correct_rendering patch * chore: bump chromium in DEPS to 577c45979cad4359f2e206d68efd9317d3d79315 * update patches * viz: Rename RenderPass to CompositorRenderPass (and related types). https://chromium-review.googlesource.com/c/chromium/src/+/2380730 * chore: bump chromium in DEPS to 37e2ad5303f2c03a1b5d8eda65341bf2561196cd * update patches * add kOmitCookies_Electron * update patch * chore: bump chromium in DEPS to 256e42409ea63a7e71016de07818a983a97db463 * update patches * fix worker script ready hook https://chromium-review.googlesource.com/c/chromium/src/+/2335713 * Fixup printing page ranges patch * [printing] Move PrintMsg_PrintPages_Params to print.mojom https://chromium-review.googlesource.com/c/chromium/src/+/2340854 * Add MIME sniffer overloads that take base::StringPieces https://chromium-review.googlesource.com/c/chromium/src/+/2382896 * [printing] Move PrintHostMsg_PreviewIds to print.mojom https://chromium-review.googlesource.com/c/chromium/src/+/2379455 * fixup test due to new DCHECK https://chromium-review.googlesource.com/c/chromium/src/+/2333750 * stop sending cookies when useSessionCookies is false * chore: bump chromium in DEPS to dd429dbc556449951ee8160d8a4d61fd95a139d5 * update patches * chore: bump chromium in DEPS to 5202bde3f9f44c2065f5dacf27e7000dd19e4e4d * chore: bump chromium in DEPS to 099e8e07b89da65932431bb0fd51b6f7f5344c19 * chore: bump chromium in DEPS to 104e5da2a43b759732d5b94bfc750b3a9a639653 * chore: bump chromium in DEPS to a4519ce657af25834e355315fd7fefa77b13426a * update patches * Make FileURLLoaderFactory always owned by its |receivers_|. https://chromium-review.googlesource.com/c/chromium/src/+/2337411 * Make FileURLLoaderFactory always owned by its |receivers_|. https://chromium-review.googlesource.com/c/chromium/src/+/2337411 * chore: bump chromium in DEPS to 1b62e9e8c8eaf6b8e3a9c77ee67a4c1bfa6a4d6b * chore: update patches * fixup! Make FileURLLoaderFactory always owned by its |receivers_|. * chore: update patches - mac: Disable CoreServices _CSCheckFix. https://chromium-review.googlesource.com/c/chromium/src/+/2401334 - [XProto] Remove bad DCHECK in x11_error_tracker.cc https://chromium-review.googlesource.com/c/chromium/src/+/2402304 - Move content/browser/frame_host/* over to content/browser/renderer_host/ https://chromium-review.googlesource.com/c/chromium/src/+/2401303 * Refactor WebContentSettingsClient to dedupe AllowXYZ methods https://chromium-review.googlesource.com/c/chromium/src/+/2353552 * Introduce NonNetworkURLLoaderFactoryBase class. https://chromium-review.googlesource.com/c/chromium/src/+/2357559 * [XProto] Remove usage of all Xlib headers https://chromium-review.googlesource.com/c/chromium/src/+/2392140 * fixup! chore: update patches * chore: bump chromium in DEPS to c1df55fbeb8207d036a604f59e4ea4e8ee79930a * chore: update patches * Move content::WebPreferences struct to Blink https://chromium-review.googlesource.com/c/chromium/src/+/2397670 * chore: bump chromium in DEPS to 57a23ec4884fff6c2f8d9b8536131cdc9b551ec2 * Set appid on Pip windows. https://chromium-review.googlesource.com/c/chromium/src/+/2388274 * fixup! Set appid on Pip windows. * fix: add a patch to remove deprecated factory * chore: bump chromium in DEPS to 1a9ddb7ea43955877823d5c4dcbf241b64228635 * fix compilation on windows * chore: bump chromium in DEPS to 234e6c6a77f61ffad9335099d9b13892cf88fd44 * chore: update patches * chore: bump chromium in DEPS to 7631eb0a9f57a8a47d3c28e1d265961b3a4d6b2b * chore: update patches * chore: bump chromium in DEPS to f9c34cd485845b95c2d17a7f55fdf92cda9a1b3a * chore: update patches * chore: implement GetSurveyAPIKey Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2362182 * chore: replace CreateWebUIURLLoader with CreateWebUIURLLoaderFactory Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2358309 * chore: bump chromium in DEPS to 5bdbd2373da884adf41c087be1465fcc344d168c * chore: update node patches for common.gypi * chore: update patches * chore: non_network_url_loader_factory_base was moved Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2357431 * 2415752: Reland "Reland "OOR-CORS: Remove BlinkCORS supporting code outside Blink"" Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2415752 * chore: bump chromium in DEPS to b943d006a33ec5bc1743792d64724693eb357083 * fix: replace x11::None with x11::Window::None * chore: update patches * chore: update patches * fix: cast x11::Window to int * 2402123: Use end date when deleting http auth cache Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2402123 * 2320268: Migrate DragHostMsg_StartDragging to Mojo Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2320268 * 2401303: Move content/browser/frame_host/* over to content/browser/renderer_host/ https://chromium-review.googlesource.com/c/chromium/src/+/2401303 * chore: fix lint * chore: fix build * Update config.yml Co-authored-by: Electron Bot <anonymous@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: Samuel Attard <sattard@slack-corp.com>
1 parent e50d6e4 commit 69f1731

File tree

107 files changed

+955
-852
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+955
-852
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1945,7 +1945,7 @@ jobs:
19451945
checkout: false
19461946

19471947
linux-arm-testing:
1948-
<<: *machine-linux-xlarge
1948+
<<: *machine-linux-2xlarge
19491949
environment:
19501950
<<: *env-global
19511951
<<: *env-arm
@@ -2012,7 +2012,7 @@ jobs:
20122012
checkout: false
20132013

20142014
linux-arm64-testing:
2015-
<<: *machine-linux-xlarge
2015+
<<: *machine-linux-2xlarge
20162016
environment:
20172017
<<: *env-global
20182018
<<: *env-arm64

‎BUILD.gn‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,9 @@ source_set("electron_lib") {
531531
]
532532
}
533533
configs += [ ":gio_unix" ]
534-
configs += [ "//build/config/linux:x11" ]
534+
if (use_x11) {
535+
deps += [ "//ui/gfx/x" ]
536+
}
535537
defines += [
536538
# Disable warnings for g_settings_list_schemas.
537539
"GLIB_DISABLE_DEPRECATION_WARNINGS",

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ gclient_gn_args = [
1414

1515
vars = {
1616
'chromium_version':
17-
'b04584161e07d4ac110045b7647fa8a81f5f0709',
17+
'b943d006a33ec5bc1743792d64724693eb357083',
1818
'node_version':
1919
'v14.9.0',
2020
'nan_version':

‎patches/chromium/.patches‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ mas_disable_remote_layer.patch
3333
mas_disable_remote_accessibility.patch
3434
mas_disable_custom_window_frame.patch
3535
chrome_key_systems.patch
36-
allow_nested_error_trackers.patch
3736
add_didinstallconditionalfeatures.patch
3837
ssl_security_state_tab_helper.patch
3938
desktop_media_list.patch
@@ -101,3 +100,4 @@ fix_check_issecureeventinputenabled_in_constructor_before_setting.patch
101100
skip_atk_toolchain_check.patch
102101
worker_feat_add_hook_to_notify_script_ready.patch
103102
fix_properly_honor_printing_page_ranges.patch
103+
remove_deprecated_factory_parameter_for_worker_resource_loader.patch

‎patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
1010
This should be upstreamed.
1111

1212
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
13-
index ed134d1d40fb23808a4cc251be50a7fbd833b49b..5aaf2356cc2c0fec9a90f3201f1e16553c69a5e3 100644
13+
index 1bb696ec5a89fd2215e523a9e320c6d74bd79a42..c0cbe3a2920b0cb453b847be7a0dc8a167ab3f9f 100644
1414
--- a/content/gpu/gpu_main.cc
1515
+++ b/content/gpu/gpu_main.cc
16-
@@ -255,6 +255,10 @@ int GpuMain(const MainFunctionParams& parameters) {
16+
@@ -256,6 +256,10 @@ int GpuMain(const MainFunctionParams& parameters) {
1717
// to the GpuProcessHost once the GpuServiceImpl has started.
1818
viz::GpuServiceImpl::InstallPreInitializeLogHandler();
1919

@@ -24,7 +24,7 @@ index ed134d1d40fb23808a4cc251be50a7fbd833b49b..5aaf2356cc2c0fec9a90f3201f1e1655
2424
// We are experiencing what appear to be memory-stomp issues in the GPU
2525
// process. These issues seem to be impacting the task executor and listeners
2626
// registered to it. Create the task executor on the heap to guard against
27-
@@ -389,7 +393,6 @@ int GpuMain(const MainFunctionParams& parameters) {
27+
@@ -394,7 +398,6 @@ int GpuMain(const MainFunctionParams& parameters) {
2828
}
2929
#endif
3030

‎patches/chromium/add_didinstallconditionalfeatures.patch‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ DidCreateScriptContext is called, not all JS APIs are available in the
1010
context, which can cause some preload scripts to trip.
1111

1212
diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
13-
index e1bd458060e2eba703562121f134d0eede7c1986..7b9f534dbfff58c0778a2a4b0c79adb73c8fc377 100644
13+
index 8ab07f180b0e5d7baaa314cf1121c7182de7cce9..feb76f5278ba11f82c65e298d9772fc8742739a9 100644
1414
--- a/content/public/renderer/render_frame_observer.h
1515
+++ b/content/public/renderer/render_frame_observer.h
1616
@@ -115,6 +115,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
@@ -23,10 +23,10 @@ index e1bd458060e2eba703562121f134d0eede7c1986..7b9f534dbfff58c0778a2a4b0c79adb7
2323
int32_t world_id) {}
2424
virtual void DidClearWindowObject() {}
2525
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
26-
index 62f6c5fd2ca94ac36851a952b5c1be3430331d60..68d2666696de00c28d57f9745f5ca902d2c16bc9 100644
26+
index bcac6e71666b3f3a820a4311ab04e3d26d06618a..f9e97c36bca9c70af0c585b81902165c1ac6ba5d 100644
2727
--- a/content/renderer/render_frame_impl.cc
2828
+++ b/content/renderer/render_frame_impl.cc
29-
@@ -4940,6 +4940,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
29+
@@ -4996,6 +4996,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
3030
observer.DidCreateScriptContext(context, world_id);
3131
}
3232

@@ -40,10 +40,10 @@ index 62f6c5fd2ca94ac36851a952b5c1be3430331d60..68d2666696de00c28d57f9745f5ca902
4040
int world_id) {
4141
for (auto& observer : observers_)
4242
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
43-
index 0a1647b88f70b6a669e922fdc6bf3b55a3acd745..9befc7bd8fd78de9cdea25dbc860af651d87c042 100644
43+
index 905845607558ac3af57ba33a1537ebb4ff0e8e7a..8e95993cc9ae88d57b373ff194e97976154fb91d 100644
4444
--- a/content/renderer/render_frame_impl.h
4545
+++ b/content/renderer/render_frame_impl.h
46-
@@ -729,6 +729,8 @@ class CONTENT_EXPORT RenderFrameImpl
46+
@@ -717,6 +717,8 @@ class CONTENT_EXPORT RenderFrameImpl
4747
bool ShouldTrackUseCounter(const blink::WebURL& url) override;
4848
void DidCreateScriptContext(v8::Local<v8::Context> context,
4949
int world_id) override;
@@ -53,10 +53,10 @@ index 0a1647b88f70b6a669e922fdc6bf3b55a3acd745..9befc7bd8fd78de9cdea25dbc860af65
5353
int world_id) override;
5454
void DidChangeScrollOffset() override;
5555
diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
56-
index e07d735a401ac23b3516fecef5a6a6094d2d0af3..e1d1502e839822277fef42e4e43e4f771485e335 100644
56+
index eecf846eabce6429ef61f9ef333572644dcbe129..e490f7d5977f946e36a3a824ad60acc0d5629780 100644
5757
--- a/third_party/blink/public/web/web_local_frame_client.h
5858
+++ b/third_party/blink/public/web/web_local_frame_client.h
59-
@@ -532,6 +532,9 @@ class BLINK_EXPORT WebLocalFrameClient {
59+
@@ -535,6 +535,9 @@ class BLINK_EXPORT WebLocalFrameClient {
6060
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
6161
int32_t world_id) {}
6262

@@ -67,7 +67,7 @@ index e07d735a401ac23b3516fecef5a6a6094d2d0af3..e1d1502e839822277fef42e4e43e4f77
6767
virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
6868
int32_t world_id) {}
6969
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
70-
index 5467a8c10153d7e88d58d8bcbccbd1716a82870a..9311077be9fd1540e504aa1995bfb6171119d200 100644
70+
index 4f4efaadcc60ed5d60fca74b9938b472eb67295d..6ec9d80ba9c4e167c5ec474e8de6ea655e928481 100644
7171
--- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
7272
+++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
7373
@@ -203,6 +203,7 @@ void LocalWindowProxy::Initialize() {
@@ -79,7 +79,7 @@ index 5467a8c10153d7e88d58d8bcbccbd1716a82870a..9311077be9fd1540e504aa1995bfb617
7979
if (World().IsMainWorld()) {
8080
GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
8181
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
82-
index b849df64ee16f08d2370638fbe14ed364b2c0650..f38e3cfb85d5d5da9a429fd51dec0cd335a1a930 100644
82+
index b99784880e15e5b8f8dbe2ae1616d71ffd7a16d1..d6bbf992272e13e2f4f2478af66c6e4ce19e3d24 100644
8383
--- a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
8484
+++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
8585
@@ -392,6 +392,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
@@ -97,7 +97,7 @@ index b849df64ee16f08d2370638fbe14ed364b2c0650..f38e3cfb85d5d5da9a429fd51dec0cd3
9797
v8::Local<v8::Context> context,
9898
int32_t world_id) {
9999
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
100-
index dd60568c183c164bede36c69260866399b7e4b79..ab05496705b4aeeedf14af4c509a32c1d4382bb8 100644
100+
index 1a9e59e20ebfcdaac5fc3a3b4098e4ec6f9192f4..7da3cdcf3ca099e81b8ac94e87c697ad2d841e61 100644
101101
--- a/third_party/blink/renderer/core/exported/local_frame_client_impl.h
102102
+++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.h
103103
@@ -77,6 +77,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
@@ -123,10 +123,10 @@ index 831ce5ccc32676790307d49416a3a40e7e3652bc..8898a6162a759a3a4d313d8956051b62
123123
int32_t world_id) = 0;
124124
virtual bool AllowScriptExtensions() = 0;
125125
diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
126-
index c233b9b5067c7833e773926585bcb774641faf05..2d2bee9cf782851a93d1e2e021f3890893fa11f2 100644
126+
index 8080a1b3c4efe3854bd12dc4d714838a4e135689..d16d2572a37b46028dfa8d7554f97289918bf792 100644
127127
--- a/third_party/blink/renderer/core/loader/empty_clients.h
128128
+++ b/third_party/blink/renderer/core/loader/empty_clients.h
129-
@@ -331,6 +331,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
129+
@@ -325,6 +325,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
130130

131131
void DidCreateScriptContext(v8::Local<v8::Context>,
132132
int32_t world_id) override {}

‎patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ WebContents, and cancels the authentication if there's no WebContents
1010
available, which there isn't in the case of the 'net' module.
1111

1212
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
13-
index 7dc2d14d47d395e3b8046cae8788c4e04bc8e7f3..55068e71568a022bbf335147e6b35c24402d43ad 100644
13+
index b4d200164829d0d34c2511a07eb0cc3d046d6fa3..e15635d66859211ac91b5beff36beffd4dfe4807 100644
1414
--- a/services/network/public/mojom/network_context.mojom
1515
+++ b/services/network/public/mojom/network_context.mojom
1616
@@ -214,6 +214,25 @@ struct CTPolicy {
@@ -39,7 +39,7 @@ index 7dc2d14d47d395e3b8046cae8788c4e04bc8e7f3..55068e71568a022bbf335147e6b35c24
3939
interface CertVerifierClient {
4040
Verify(
4141
int32 default_error,
42-
@@ -647,6 +666,8 @@ struct URLLoaderFactoryParams {
42+
@@ -652,6 +671,8 @@ struct URLLoaderFactoryParams {
4343
// impact because of the extra process hops, so use should be minimized.
4444
pending_remote<TrustedURLLoaderHeaderClient>? header_client;
4545

@@ -49,18 +49,18 @@ index 7dc2d14d47d395e3b8046cae8788c4e04bc8e7f3..55068e71568a022bbf335147e6b35c24
4949
// the per-context allow patterns that is managed via NetworkContext
5050
// interface. This still respects the per-context block lists.
5151
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
52-
index c209506ca5f450f4611cb339f6d9876175eb713e..d4ff5100be651655140ca024fec12a7d98baa00e 100644
52+
index 5f05f9a5385f5b424b2d66a5ac19e878f09f24f4..f5ce4de54b0c71f2099753198794503c8ee10013 100644
5353
--- a/services/network/url_loader.cc
5454
+++ b/services/network/url_loader.cc
55-
@@ -473,6 +473,7 @@ URLLoader::URLLoader(
55+
@@ -483,6 +483,7 @@ URLLoader::URLLoader(
5656
base::WeakPtr<KeepaliveStatisticsRecorder> keepalive_statistics_recorder,
5757
base::WeakPtr<NetworkUsageAccumulator> network_usage_accumulator,
5858
mojom::TrustedURLLoaderHeaderClient* url_loader_header_client,
5959
+ mojom::TrustedURLLoaderAuthClient* url_loader_auth_client,
6060
mojom::OriginPolicyManager* origin_policy_manager,
6161
std::unique_ptr<TrustTokenRequestHelperFactory> trust_token_helper_factory,
6262
mojo::PendingRemote<mojom::CookieAccessObserver> cookie_observer)
63-
@@ -536,6 +537,11 @@ URLLoader::URLLoader(
63+
@@ -546,6 +547,11 @@ URLLoader::URLLoader(
6464
header_client_.set_disconnect_handler(
6565
base::BindOnce(&URLLoader::OnMojoDisconnect, base::Unretained(this)));
6666
}
@@ -72,7 +72,7 @@ index c209506ca5f450f4611cb339f6d9876175eb713e..d4ff5100be651655140ca024fec12a7d
7272
if (want_raw_headers_) {
7373
options_ |= mojom::kURLLoadOptionSendSSLInfoWithResponse |
7474
mojom::kURLLoadOptionSendSSLInfoForCertificateError;
75-
@@ -1120,7 +1126,7 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
75+
@@ -1119,7 +1125,7 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
7676
// |this| may have been deleted.
7777
return;
7878
}
@@ -81,7 +81,7 @@ index c209506ca5f450f4611cb339f6d9876175eb713e..d4ff5100be651655140ca024fec12a7d
8181
OnAuthCredentials(base::nullopt);
8282
return;
8383
}
84-
@@ -1136,11 +1142,20 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
84+
@@ -1135,11 +1141,20 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
8585
if (url_request->response_headers())
8686
head->headers = url_request->response_headers();
8787
head->auth_challenge_info = auth_info;
@@ -108,7 +108,7 @@ index c209506ca5f450f4611cb339f6d9876175eb713e..d4ff5100be651655140ca024fec12a7d
108108
auth_challenge_responder_receiver_.set_disconnect_handler(
109109
base::BindOnce(&URLLoader::DeleteSelf, base::Unretained(this)));
110110
diff --git a/services/network/url_loader.h b/services/network/url_loader.h
111-
index 51c6034e14c0ddbbf69e02f293590a810328bcbb..63b8b0a5349d0a6401cb6c71b116958d13acaf15 100644
111+
index a624b8c43f49a7db975d8deda753b18583db5d72..cce8d7e0b8847528715aca4704db5194829c5bbc 100644
112112
--- a/services/network/url_loader.h
113113
+++ b/services/network/url_loader.h
114114
@@ -118,6 +118,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
@@ -119,7 +119,7 @@ index 51c6034e14c0ddbbf69e02f293590a810328bcbb..63b8b0a5349d0a6401cb6c71b116958d
119119
mojom::OriginPolicyManager* origin_policy_manager,
120120
std::unique_ptr<TrustTokenRequestHelperFactory>
121121
trust_token_helper_factory,
122-
@@ -471,6 +472,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
122+
@@ -481,6 +482,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
123123
base::Optional<base::UnguessableToken> fetch_window_id_;
124124

125125
mojo::Remote<mojom::TrustedHeaderClient> header_client_;
@@ -148,10 +148,10 @@ index 75ae8488efa7e5acfda0b21029657b525fa95f86..5dce71ee5efc97f9f63d0b5f236dccdf
148148
std::move(cookie_observer));
149149

150150
diff --git a/services/network/url_loader_factory.h b/services/network/url_loader_factory.h
151-
index 8b29b67a5b0663778df3169e09bf818e6bbcec3f..e504fa3d41066907a3fbc41e69daac968415dfa6 100644
151+
index 182b26816da9e82d83c47c3c73ecfdcf3003b967..903a3ad083201ed85e82169698041152278697fa 100644
152152
--- a/services/network/url_loader_factory.h
153153
+++ b/services/network/url_loader_factory.h
154-
@@ -75,6 +75,7 @@ class URLLoaderFactory : public mojom::URLLoaderFactory {
154+
@@ -74,6 +74,7 @@ class URLLoaderFactory : public mojom::URLLoaderFactory {
155155
scoped_refptr<ResourceSchedulerClient> resource_scheduler_client_;
156156
mojo::Remote<mojom::TrustedURLLoaderHeaderClient> header_client_;
157157
mojo::Remote<mojom::CrossOriginEmbedderPolicyReporter> coep_reporter_;

‎patches/chromium/allow_nested_error_trackers.patch‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,18 @@ index 0c37f6e2caead2f3004f1fbdd2abe7921ef4bea7..6f46775d96153d0c6a0795a1d6085f53
4747
return items_[ValidateItemIndex(index)].minor_text;
4848
}
4949
diff --git a/ui/base/models/simple_menu_model.h b/ui/base/models/simple_menu_model.h
50-
index 5f1116ba19b8160a2fee008415b8841f056aad98..9c07e44c484a9a15b7d16d592311eb07d9b3734a 100644
50+
index 31669898f91d928bb63665d32ab9e4b114fecbf5..6c3f9734e2ee2cb3b6d5f9ed2787751709b013ed 100644
5151
--- a/ui/base/models/simple_menu_model.h
5252
+++ b/ui/base/models/simple_menu_model.h
53-
@@ -48,6 +48,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
53+
@@ -51,6 +51,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
5454
// Some command ids have labels and icons that change over time.
5555
virtual bool IsItemForCommandIdDynamic(int command_id) const;
5656
virtual base::string16 GetLabelForCommandId(int command_id) const;
5757
+ virtual base::string16 GetSecondaryLabelForCommandId(int command_id) const;
5858
// Gets the icon for the item with the specified id.
5959
virtual ImageModel GetIconForCommandId(int command_id) const;
6060

61-
@@ -151,6 +152,9 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
61+
@@ -154,6 +155,9 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
6262
// Sets the label for the item at |index|.
6363
void SetLabel(int index, const base::string16& label);
6464

@@ -68,15 +68,15 @@ index 5f1116ba19b8160a2fee008415b8841f056aad98..9c07e44c484a9a15b7d16d592311eb07
6868
// Sets the minor text for the item at |index|.
6969
void SetMinorText(int index, const base::string16& minor_text);
7070

71-
@@ -180,6 +184,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
71+
@@ -183,6 +187,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
7272
ui::MenuSeparatorType GetSeparatorTypeAt(int index) const override;
7373
int GetCommandIdAt(int index) const override;
7474
base::string16 GetLabelAt(int index) const override;
7575
+ base::string16 GetSecondaryLabelAt(int index) const override;
7676
base::string16 GetMinorTextAt(int index) const override;
7777
ImageModel GetMinorIconAt(int index) const override;
7878
bool IsItemDynamicAt(int index) const override;
79-
@@ -216,6 +221,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
79+
@@ -219,6 +224,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
8080
int command_id = 0;
8181
ItemType type = TYPE_COMMAND;
8282
base::string16 label;

‎patches/chromium/blink-worker-enable-csp-in-file-scheme.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: blink-worker-enable-csp-in-file-scheme.patch
66
This allows file:// URLs in workers to have a CSP.
77

88
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
9-
index 7acd62e8657cce14733fa9d2449f3c48ad0dc0a6..f4c6c8b6361a6ae8403b13137cc213803892db5e 100644
9+
index 0d31933076d65aae063c01514f77deec1724c159..def9d2d52f41d09ea2d5291df2749f93a0b3f9fc 100644
1010
--- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
1111
+++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
12-
@@ -369,7 +369,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy(
12+
@@ -373,7 +373,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy(
1313
// document (which is implemented in WorkerMessagingProxy, and
1414
// m_contentSecurityPolicy should be left as nullptr to inherit the policy).
1515
if (!response.CurrentRequestUrl().ProtocolIs("blob") &&

0 commit comments

Comments
 (0)