Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump chromium to 121.0.6147.0 (main) #40523

Merged
merged 51 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
50bffd7
chore: bump chromium in DEPS to 121.0.6128.0
electron-roller[bot] Nov 14, 2023
8672e5e
build: update patches
MarshallOfSound Nov 14, 2023
152a332
refactor: remove instrumentation from extensions code
MarshallOfSound Nov 14, 2023
391353e
refactor: modernization of tabs_api
MarshallOfSound Nov 14, 2023
87675f2
fix: add RecordHover and RecordDrag handlers
MarshallOfSound Nov 14, 2023
10b74e1
build: add missing pdf files
MarshallOfSound Nov 14, 2023
220eaaf
chore: bump chromium in DEPS to 121.0.6129.0
electron-roller[bot] Nov 15, 2023
74d2b29
chore: bump chromium in DEPS to 121.0.6131.0
electron-roller[bot] Nov 16, 2023
d2246af
chore: update patches
MarshallOfSound Nov 16, 2023
6ba995e
refactor: remove will_cause_resize from ExitFullscreen
MarshallOfSound Nov 16, 2023
1f96ab2
chore: add missing std converter include
MarshallOfSound Nov 16, 2023
1cbf25b
chore: Unwrap UserScriptList from unique_ptrs
MarshallOfSound Nov 17, 2023
d2be1e1
refactor: add PDF internal id into PDF stream info
MarshallOfSound Nov 17, 2023
7f67061
refactor: add metadata to view classes
MarshallOfSound Nov 17, 2023
22da982
chore: run lint --fix
MarshallOfSound Nov 17, 2023
7b3f43d
chore: update libc++ filenames
MarshallOfSound Nov 17, 2023
9098107
chore: clean up menubar
MarshallOfSound Nov 17, 2023
3d7d812
Merge main into roller/chromium/main
VerteDinde Nov 21, 2023
66e0610
chore: update patches after main merge
VerteDinde Nov 21, 2023
6f7734c
5010979: Replace base::WStringPiece usage with std::wstring_view | ht…
VerteDinde Nov 21, 2023
4082a7e
chore: bump chromium in DEPS to 121.0.6142.0
electron-roller[bot] Nov 22, 2023
e8fe3ca
chore: update patches
VerteDinde Nov 22, 2023
32477d3
4969574: Refactor NativeDesktopMediaList | https://chromium-review.go…
VerteDinde Nov 22, 2023
7f05345
5031192: [blink] Create new blink test suite that doesn't create blin…
VerteDinde Nov 22, 2023
0b02107
chore: update v8/devtools patches
VerteDinde Nov 22, 2023
c55346a
5040722: [base] Replace MakeFixedFlatTreeSorted with tag type overloa…
VerteDinde Nov 22, 2023
fba0674
5026474: Add --generate-pdf-document-outline | https://chromium-revie…
VerteDinde Nov 22, 2023
f9a5a50
5024297: Change parameter of CheckMediaAccessPermission from GURL to …
VerteDinde Nov 22, 2023
3ff95ba
5034217: [RWS] Remove CanonicalCookie::IsSameParty method | https://c…
VerteDinde Nov 22, 2023
801cc54
5037192: Rewrite usage of RenderFrame::GetRoutingID | https://chromiu…
VerteDinde Nov 22, 2023
771174e
5041802: Reland "Incorporate policy override for OOPPD feature" | htt…
VerteDinde Nov 22, 2023
db1511a
chore: bump chromium in DEPS to 121.0.6143.0
electron-roller[bot] Nov 23, 2023
9973997
chore: bump chromium in DEPS to 121.0.6145.0
electron-roller[bot] Nov 24, 2023
24c2623
chore: update chromium patches
VerteDinde Nov 25, 2023
6e3d19c
5049986: Use std::unique_ptr for MenuItemView::submenu_ member. | htt…
VerteDinde Nov 25, 2023
5ed254d
5041595: picture-in-picture: Add PictureInPictureOcclusionTracker | h…
VerteDinde Nov 25, 2023
5db61d1
chore: update all patches
VerteDinde Nov 25, 2023
578ad06
chore: bump chromium in DEPS to 121.0.6147.0
electron-roller[bot] Nov 25, 2023
1acd114
chore: update patches
patchup[bot] Nov 25, 2023
c175573
5051069: Use base::FunctionRef for BrowserPluginGuestManager. | https…
VerteDinde Nov 26, 2023
c7b18ff
5057330: [base] Remove base::Erase()/base::EraseIf() overloads for st…
VerteDinde Nov 26, 2023
2c6270b
fixup! 5041802: Reland "Incorporate policy override for OOPPD feature…
VerteDinde Nov 26, 2023
d3b86df
5017518: Remove PPAPI if NaCl is disabled | https://chromium-review.g…
VerteDinde Nov 26, 2023
2360c96
5002232: [DevTools] Console Insights: move from build flag to Feature…
VerteDinde Nov 27, 2023
0f7a5b3
4970322: [X11] Move utils into x11::Connection | https://chromium-rev…
VerteDinde Nov 27, 2023
99104c6
5048950: Let MenuModelAdapter::CreateMenu return a std::unique_ptr<>.…
VerteDinde Nov 27, 2023
3df1d7f
chore: update libcxx filenames
VerteDinde Nov 27, 2023
01b9c2d
use Context::Scope in RunScriptsAtDocument{Start,End}
nornagon Nov 27, 2023
665bfe0
4775128: content: Reuse CC instance for main frame navigations
nornagon Nov 27, 2023
fdfa889
also wrap WebWorkerObserver::ContextWillDestroy with Context::Scope
nornagon Nov 27, 2023
05bd9a3
set LIBCPP_HARDENING_MODE
nornagon Nov 28, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: update patches
  • Loading branch information
VerteDinde committed Nov 22, 2023
commit e8fe3cacbbaef95c2826a79342f05eb2db9e51cd
1 change: 0 additions & 1 deletion patches/chromium/.patches
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ fix_remove_caption-removing_style_call.patch
build_allow_electron_to_use_exec_script.patch
chore_introduce_blocking_api_for_electron.patch
chore_patch_out_partition_attribute_dcheck_for_webviews.patch
expose_v8initializer_codegenerationcheckcallbackinmainthread.patch
chore_patch_out_profile_methods_in_profile_selections_cc.patch
add_gin_converter_support_for_arraybufferview.patch
chore_defer_usb_service_getdevices_request_until_usb_service_is.patch
Expand Down
20 changes: 10 additions & 10 deletions patches/chromium/add_didinstallconditionalfeatures.patch
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ index c302f3e672cea9b73591048cf581f3e81078d5cb..eb1d1b0b59e687b996e76c205a871234
int32_t world_id) {}
virtual void DidClearWindowObject() {}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index eb2f8f78f15d2157a7d5e903988ac499cd893e17..997e271dd21431ea05de0c61b1102ba632ab6709 100644
index 9bea02ba22dc601e57406513ed02c8704bf587de..ccd3c27b7537f9c1adce9d32137d0e596be7c545 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4555,6 +4555,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
@@ -4565,6 +4565,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
observer.DidCreateScriptContext(context, world_id);
}

Expand All @@ -53,10 +53,10 @@ index 6fa0c635d1080cf2d7dbc0c7bd2c9bb5c083b986..dee1c7e60a998fd1947b4ff542872de0
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 64d8aca52be5e63c56fea2cb2a835761df11e098..6d3c66f3b08a625c4bcfffc3f2caf2d67f9ca258 100644
index ac82f8a9c14546d09e0181da93fbc361dc09dd78..94e177829c75ba3f4b33b4ca0802173e7faa1b92 100644
--- a/third_party/blink/public/web/web_local_frame_client.h
+++ b/third_party/blink/public/web/web_local_frame_client.h
@@ -620,6 +620,9 @@ class BLINK_EXPORT WebLocalFrameClient {
@@ -619,6 +619,9 @@ class BLINK_EXPORT WebLocalFrameClient {
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
int32_t world_id) {}

Expand All @@ -79,10 +79,10 @@ index e22ccf32a9e3c596e44506244f284f1c2be86762..65ff494dc7c5676fbb534c1dd1854010
if (World().IsMainWorld()) {
probe::DidCreateMainWorldContext(GetFrame());
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 c0fa11ea9ec9f35fe7ee1c36a8ea618cc0ccaea0..cd8a420bb51be71996d697b49ccf51f2bcce2c4c 100644
index e982a11fc5412a9dce2ecde8af2fdaab4b2d56e7..a2169ba91e8856667b300672ed1a64841bf9c3a6 100644
--- a/third_party/blink/renderer/core/frame/local_frame_client.h
+++ b/third_party/blink/renderer/core/frame/local_frame_client.h
@@ -320,6 +320,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
@@ -302,6 +302,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {

virtual void DidCreateScriptContext(v8::Local<v8::Context>,
int32_t world_id) = 0;
Expand All @@ -92,7 +92,7 @@ index c0fa11ea9ec9f35fe7ee1c36a8ea618cc0ccaea0..cd8a420bb51be71996d697b49ccf51f2
int32_t world_id) = 0;
virtual bool AllowScriptExtensions() = 0;
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
index 5dd3383cfddf4edc050ef5b37e98452f3476d7a9..25942059009f735a1d6b52fc9c1033d26c893306 100644
index 150f4280ec4c3829c14da8166ab2a4e9c043d551..b9dd77befa57677fa2b1f507c90cf0bedd09eafa 100644
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
@@ -283,6 +283,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
Expand All @@ -110,7 +110,7 @@ index 5dd3383cfddf4edc050ef5b37e98452f3476d7a9..25942059009f735a1d6b52fc9c1033d2
v8::Local<v8::Context> context,
int32_t world_id) {
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
index 2dd6df6727828335ca4462b470df4afd8dd29539..91ee3bf31ba43e650cacd2f781a3a8103d216570 100644
index 19b6d04a1dc5ae33fa1ede248fd580a4eb95ede6..2b238811b634f449a90ee7cf5d19c2e55343eb10 100644
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
@@ -84,6 +84,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
Expand All @@ -123,10 +123,10 @@ index 2dd6df6727828335ca4462b470df4afd8dd29539..91ee3bf31ba43e650cacd2f781a3a810
int32_t world_id) override;

diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
index 21b4346709fd5f76ac47e2e48e4d5dfc4de705a3..addf2ab83ab230cef863079d8f82453d8380dd16 100644
index 97bd9953e14088517a80b44c244f2bacf3b699bb..e67b3126f1082ecd2b6867ae01ab30d4c6ea41c5 100644
--- a/third_party/blink/renderer/core/loader/empty_clients.h
+++ b/third_party/blink/renderer/core/loader/empty_clients.h
@@ -411,6 +411,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
@@ -406,6 +406,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {

void DidCreateScriptContext(v8::Local<v8::Context>,
int32_t world_id) override {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Subject: allow disabling blink scheduler throttling per RenderView
This allows us to disable throttling for hidden windows.

diff --git a/content/browser/renderer_host/navigation_controller_impl_unittest.cc b/content/browser/renderer_host/navigation_controller_impl_unittest.cc
index 2a717d3bd712db65a613ba7a0b3a2e3cd2a895c5..7ac89a5c54b9d65c30c98e38732183cab6da8c60 100644
index ed1cd91f4ec979f5a194a110ce9fc6ae3459cd09..812534c3834094f762b81daea204c85eea89e235 100644
--- a/content/browser/renderer_host/navigation_controller_impl_unittest.cc
+++ b/content/browser/renderer_host/navigation_controller_impl_unittest.cc
@@ -164,6 +164,12 @@ class MockPageBroadcast : public blink::mojom::PageBroadcast {
@@ -163,6 +163,12 @@ class MockPageBroadcast : public blink::mojom::PageBroadcast {
(network::mojom::AttributionSupport support),
(override));

Expand All @@ -23,10 +23,10 @@ index 2a717d3bd712db65a613ba7a0b3a2e3cd2a895c5..7ac89a5c54b9d65c30c98e38732183ca
return receiver_.BindNewEndpointAndPassDedicatedRemote();
}
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index 707239fbaf8a9a391c9aaea0cd475607b6f0599a..9e9a8defdd10a1f3c31c60aaae46a21252cc94f2 100644
index 401a00dba286c3c7a45bbcdd69f32fc21eb2daf7..9f6d393c9a7c7ce8d9d1049c2259f8837ab8371e 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -725,6 +725,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
@@ -713,6 +713,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
}

Expand All @@ -39,7 +39,7 @@ index 707239fbaf8a9a391c9aaea0cd475607b6f0599a..9e9a8defdd10a1f3c31c60aaae46a212
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 2d5431caee0b44828ae35a861cda8b15b587123f..5db98459e35767aee91c9b901c10f2f59ac1456b 100644
index afd5368ffd7c7ef5db6e30b7468554d8ec07c77a..1b0c498edd71987f004bc20e9d7957cca6526edd 100644
--- a/content/browser/renderer_host/render_view_host_impl.h
+++ b/content/browser/renderer_host/render_view_host_impl.h
@@ -139,6 +139,7 @@ class CONTENT_EXPORT RenderViewHostImpl
Expand Down Expand Up @@ -80,10 +80,10 @@ index 9979c25ecd57e68331b628a518368635db5c2027..f65bfbbb663a5bb0511ffa389d3163e0
// This interface should only be implemented inside content.
friend class RenderViewHostImpl;
diff --git a/content/test/test_page_broadcast.h b/content/test/test_page_broadcast.h
index bfaa0a4c0ebdabbe16a3e50883a91e571afe011e..a519c65f6a2f8e4a07d7e6beb52d1e42c0bc8d2a 100644
index cb660e85d7ed08496483bc7b857b5f273efb94d3..2f9b3937106c1927b38bc43a641fa982044874d3 100644
--- a/content/test/test_page_broadcast.h
+++ b/content/test/test_page_broadcast.h
@@ -51,6 +51,7 @@ class TestPageBroadcast : public blink::mojom::PageBroadcast {
@@ -50,6 +50,7 @@ class TestPageBroadcast : public blink::mojom::PageBroadcast {
network::mojom::AttributionSupport support) override;
void UpdateColorProviders(
const blink::ColorProviderColorMaps& color_provider_colors) override;
Expand All @@ -92,10 +92,10 @@ index bfaa0a4c0ebdabbe16a3e50883a91e571afe011e..a519c65f6a2f8e4a07d7e6beb52d1e42
mojo::AssociatedReceiver<blink::mojom::PageBroadcast> receiver_;
};
diff --git a/third_party/blink/public/mojom/page/page.mojom b/third_party/blink/public/mojom/page/page.mojom
index 7558d0d3e793e41a3190ec4df50118f36b52ab92..eacdb1d4d6455f6d5d570b2817d55a6cb896c551 100644
index ed73a6fe6d146eac904f0aa0d88facf055df503e..4bbc792068db75739a7ceb8ad01c85f9d3bbd8f6 100644
--- a/third_party/blink/public/mojom/page/page.mojom
+++ b/third_party/blink/public/mojom/page/page.mojom
@@ -177,4 +177,7 @@ interface PageBroadcast {
@@ -173,4 +173,7 @@ interface PageBroadcast {
// 2. The ColorProvider associated with the WebContents changes as a result
// of theme changes.
UpdateColorProviders(ColorProviderColorMaps color_provider_colors);
Expand All @@ -104,7 +104,7 @@ index 7558d0d3e793e41a3190ec4df50118f36b52ab92..eacdb1d4d6455f6d5d570b2817d55a6c
+ SetSchedulerThrottling(bool allowed);
};
diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h
index c7c74f4e19f12d42f0f5cd87c11644680fd5399e..6c538199433216ed9bf3a15db90a0134233b9e86 100644
index 6219eadefa976145469ec8be2fd312af1a955c7a..fdb76579679e1f4c5f43b934d4edaa2c6e32d43a 100644
--- a/third_party/blink/public/web/web_view.h
+++ b/third_party/blink/public/web/web_view.h
@@ -378,6 +378,7 @@ class BLINK_EXPORT WebView {
Expand All @@ -116,10 +116,10 @@ index c7c74f4e19f12d42f0f5cd87c11644680fd5399e..6c538199433216ed9bf3a15db90a0134
// 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 f7cc04248ea4fa7b0582c20dc038c3ad4d7a1ed4..71e9bfec60fae8f58aa42c39f2e34aa9684c966c 100644
index e830d827831ec92ee39c52574857226b743c9534..a4a8778021694ec83ffa7ee98fb40f81edf9174d 100644
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -2396,6 +2396,10 @@ void WebViewImpl::SetPageLifecycleStateInternal(
@@ -2421,6 +2421,10 @@ void WebViewImpl::SetPageLifecycleStateInternal(
TRACE_EVENT2("navigation", "WebViewImpl::SetPageLifecycleStateInternal",
"old_state", old_state, "new_state", new_state);

Expand All @@ -130,7 +130,7 @@ index f7cc04248ea4fa7b0582c20dc038c3ad4d7a1ed4..71e9bfec60fae8f58aa42c39f2e34aa9
bool storing_in_bfcache = new_state->is_in_back_forward_cache &&
!old_state->is_in_back_forward_cache;
bool restoring_from_bfcache = !new_state->is_in_back_forward_cache &&
@@ -3893,10 +3897,23 @@ PageScheduler* WebViewImpl::Scheduler() const {
@@ -3907,10 +3911,23 @@ PageScheduler* WebViewImpl::Scheduler() const {
return GetPage()->GetPageScheduler();
}

Expand All @@ -155,7 +155,7 @@ index f7cc04248ea4fa7b0582c20dc038c3ad4d7a1ed4..71e9bfec60fae8f58aa42c39f2e34aa9
// Do not throttle if the page should be painting.
bool is_visible =
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
index eea00a3c96a07403afcf88513db9ab8392627dc2..fdcc32a5c54197c37d0b7d670e9441886fe52adc 100644
index 5a9992141dbbf6955beeb295145044a66fcaf754..42d57fd374ed307b5640dc57ed78d588e5ee5c65 100644
--- a/third_party/blink/renderer/core/exported/web_view_impl.h
+++ b/third_party/blink/renderer/core/exported/web_view_impl.h
@@ -452,6 +452,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
Expand All @@ -166,7 +166,7 @@ index eea00a3c96a07403afcf88513db9ab8392627dc2..fdcc32a5c54197c37d0b7d670e944188
void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
bool is_initial_state) override;
mojom::blink::PageVisibilityState GetVisibilityState() override;
@@ -919,6 +920,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -917,6 +918,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
// If true, we send IPC messages when |preferred_size_| changes.
bool send_preferred_size_changes_ = false;

Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/blink_local_frame.patch
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ index a1732d9bf9267e52a74350483fa946b5a0a0662b..25d36b301309ac9f8c1a4d75545fa741
// its owning reference back to our owning LocalFrame.
client_->Detached(type);
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index 4924fdad3c5ec3bd22c1fc7f510a8179bfb088bf..0f5839ebbd08bd62fc1f1d1c5bacbd5890ea6b45 100644
index 5987aaa537ea37ef6c1145b606d5aee5b5511c0a..3d564401f00f9b65ea232470602d5215caf0d94f 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -674,10 +674,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/boringssl_build_gn.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Subject: boringssl BUILD.gn
Build BoringSSL with some extra functions that nodejs needs.

diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
index c98f801de361a3c521e790011bef3962b9dfb142..ca177d630a5ad11d97d72a98efdfdc87c6962ae1 100644
index bd3979751ce110a3086625efb743362293bb0006..f888810423c8a42a9811efdff295f90b130bfee1 100644
--- a/third_party/boringssl/BUILD.gn
+++ b/third_party/boringssl/BUILD.gn
@@ -56,6 +56,21 @@ config("no_asm_config") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ categories in use are known / declared. This patch is required for us
to introduce a new Electron category for Electron-specific tracing.

diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
index c4ed2b8abb249bd85ea3ab6bd8d506e34fda1bc8..d48fb4f0ab45ed41ae087ae0aca4a542496e945a 100644
index 85e831614b7f02c6a8537b4a67968bff8ca0c6e0..2394926bacf2e02716facd5ed8458e4ebfc449a1 100644
--- a/base/trace_event/builtin_categories.h
+++ b/base/trace_event/builtin_categories.h
@@ -82,6 +82,8 @@
Expand Down
4 changes: 2 additions & 2 deletions patches/chromium/build_disable_print_content_analysis.patch
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ This patch can be removed when enable_print_content_analysis can be more
easily enabled or disabled by default with buildflags.

diff --git a/printing/buildflags/buildflags.gni b/printing/buildflags/buildflags.gni
index b3ba66120d90790257e58362cd0e44a95269a1c0..811ef8da8e0e041ce576fda8a23a445c028f0360 100644
index 9382e3ed7dab7fa8992b697759addb43ec55f622..a83508602f5bd5052086d06487e3110409f313af 100644
--- a/printing/buildflags/buildflags.gni
+++ b/printing/buildflags/buildflags.gni
@@ -49,7 +49,7 @@ declare_args() {
@@ -48,7 +48,7 @@ declare_args() {

# Enable snapshotting a page when printing for its content to be analyzed for
# sensitive content by enterprise users.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if we ever align our .pak file generation with Chrome we can remove this
patch.

diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 0594fc8f8122b5f66457c262890ea93be3a579d8..19f045d14c6072c1b0b8fb6a50bf4cafa563f7cb 100644
index cc22e9c43562086396509548a4fe7e2f0ae22f80..705b0e067d8b702a5306334ae9d68eef2c11106d 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -200,11 +200,16 @@ if (!is_android && !is_mac) {
Expand All @@ -33,10 +33,10 @@ index 0594fc8f8122b5f66457c262890ea93be3a579d8..19f045d14c6072c1b0b8fb6a50bf4caf
"//base",
"//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index c614c5c644f24d29903924178ca7e88dab1182e3..66e6712537ca1c14b33af2bba2789b3cde169e2e 100644
index 1af9601fafd76fd85989221463cfb747ac0e1a5d..84e46653b3ab00c46670708d98fc99e088d88d1f 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4819,7 +4819,7 @@ static_library("browser") {
@@ -4797,7 +4797,7 @@ static_library("browser") {

# On Windows, the hashes are embedded in //chrome:chrome_initial rather
# than here in :chrome_dll.
Expand All @@ -46,18 +46,18 @@ index c614c5c644f24d29903924178ca7e88dab1182e3..66e6712537ca1c14b33af2bba2789b3c
sources += [ "certificate_viewer_stub.cc" ]
}
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index ada11de639f0ad35e3d002a6d71be604e715a252..5b9b8bb0a23feb9a20cc47ef8eb2dad2aafca7c6 100644
index 7d103def9abd659555a31fc5c2552b2739fd5435..21b5da3d78914826f9479d15aca8741815bc96d4 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -7120,7 +7120,6 @@ test("unit_tests") {
@@ -7151,7 +7151,6 @@ test("unit_tests") {

deps += [
"//chrome:other_version",
- "//chrome:packed_resources_integrity",
"//chrome//services/util_win:unit_tests",
"//chrome/app:chrome_dll_resources",
"//chrome/app:win_unit_tests",
@@ -7141,6 +7140,10 @@ test("unit_tests") {
@@ -7172,6 +7171,10 @@ test("unit_tests") {
"//ui/resources",
]

Expand All @@ -68,15 +68,15 @@ index ada11de639f0ad35e3d002a6d71be604e715a252..5b9b8bb0a23feb9a20cc47ef8eb2dad2
ldflags = [
"/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
"/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
@@ -8149,7 +8152,6 @@ test("unit_tests") {
@@ -8188,7 +8191,6 @@ test("unit_tests") {
}

deps += [
- "//chrome:packed_resources_integrity_hash",
"//chrome/browser/apps:icon_standardizer",
"//chrome/browser/apps/app_service",
"//chrome/browser/apps/app_service:app_registry_cache_waiter",
@@ -8239,6 +8241,10 @@ test("unit_tests") {
@@ -8280,6 +8282,10 @@ test("unit_tests") {
"//ui/webui/resources/js/browser_command:mojo_bindings",
]

Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/build_gn.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ These are variables we add to the root BUILDCONFIG so that they're available
everywhere, without having to import("//electron/.../flags.gni").

diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 105e194dd1d4d4003736ce5cf963bc1290de669f..420a13c16741037cf81de817c1808603e3fe6490 100644
index 8b8cf6bc8f8a449cf70b66d37fa74f8599b9abda..31b28d852fe229e1d9cb8d71abe589d2b49e6d44 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -123,6 +123,9 @@ if (current_os == "") {
Expand Down
Loading