Skip to content

Commit 5513e66

Browse files
electron-roller[bot]ckerrdeepak1556mlaurencinjkleinsc
authored
chore: bump chromium to 95.0.4612.5 (main) (electron#30503)
* chore: bump chromium in DEPS to 94.0.4604.0 * build: 3-way merge of chromium patches * chore: bump chromium in DEPS to 94.0.4605.0 * build: 3-way merge of chromium patches * 3076040: Reland Remove delete_children RemoveAllChildViews arg Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3076040 * 3069287: Remove the remaining uses and delete the deprecated API Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3069287 * 2297212: Replace RemoveWithoutPathExpansion(.*, nullptr) with Value::RemoveKey() Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2297212 Also: https://chromium-review.googlesource.com/c/chromium/src/+/3060296 * 3082756: Change transport_security_persister_path param to be a path to a file. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3082756 > this CL intentionally changes the name of the parameter > in the network context parameters and the order of the constructor > parameters to ensure all callers update their code to pass a full > file path rather than a path to a directory. The 'path' in this diff is already an absolute path, coming from `CHECK(base::PathService::Get(chrome::DIR_USER_DATA, &path_));` at https://github.com/electron/electron/blob/08ff1c2cbf73c8cfe6bca7976e3eddc3626678db/shell/browser/electron_browser_context.cc#L126 * iwyu: network::mojom::HttpRawHeaderPair * fixup! 3076040: Reland Remove delete_children RemoveAllChildViews arg Missed one. * 2999884: CodeHealth: Remove DictionaryValue::GetStringWithoutPathExpansion Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2999884 (example of replacing GetStringWithoutPathExpansion() w/FindStringKey()) Also: https://chromium-review.googlesource.com/c/chromium/src/+/3060296 (removal of DictionaryValue::GetStringWithoutPathExpansion) * 3059260: Remove kSameSiteByDefaultCookies and kCookiesWithoutSameSiteMustBeSecure Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3059260 We had both of these in a 'disable_features' list. Since these feature have been removed upstream, remove them from our disable list, too. IMPORTANT: this commit should not be backported to older branches that still have these features, because doing so would un-disable them. * 2920890: Load reroute_info from download in-progress and history db back into DownloadItem. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2920890 * 3039323: [Clipboard API] Clipboard Custom Formats implementation Part 5. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3039323 * chore: bump chromium in DEPS to 94.0.4606.0 * 3084502: Add a new PrintRasterizePdfDpi policy. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3084502 * chore: update patches * chore: bump chromium in DEPS to 94.0.4606.3 * chore: bump chromium in DEPS to 95.0.4608.0 * chore: bump chromium in DEPS to 95.0.4609.0 * [DevTools] Remove report_raw_headers from network::ResourceRequest https://chromium-review.googlesource.com/c/chromium/src/+/2856099 * Remove content::WebContentsObserver::OnInterfaceRequestFromFrame https://chromium-review.googlesource.com/c/chromium/src/+/3092665 * Disable kDesktopCaptureMacV2 https://chromium-review.googlesource.com/c/chromium/src/+/3069272 * Add a new PrintRasterizePdfDpi policy. https://chromium-review.googlesource.com/c/chromium/src/+/3084502 * chore: update patches * chore: bump chromium in DEPS to 95.0.4609.3 * disable `use_lld` for macos * chore: update patches * Linux: use chrome_crashpad_handler instead of crashpad_handler https://chromium-review.googlesource.com/c/chromium/src/+/3054290 * chore: fix lint * Revert "[DevTools] Remove report_raw_headers from network::ResourceRequest" This reverts commit 28f4da1. * [DevTools] Remove report_raw_headers from network::ResourceRequest (Attempt adamlaska#2) https://chromium-review.googlesource.com/c/chromium/src/+/2856099 * DCHECK that predictor always has a non-empty NetworkIsolationKey. https://chromium-review.googlesource.com/c/chromium/src/+/3067698 * Remove --no-untrusted-code-mitigations from //content and //gin https://chromium-review.googlesource.com/c/chromium/src/+/3096585 * fixup! Remove kSameSiteByDefaultCookies and kCookiesWithoutSameSiteMustBeSecure https://chromium-review.googlesource.com/c/chromium/src/+/3059260 * fixup! Remove kSameSiteByDefaultCookies and kCookiesWithoutSameSiteMustBeSecure * Convert PrintManager to RenderFrameHostReceiverSet. https://chromium-review.googlesource.com/c/chromium/src/+/3072019 * chore: bump chromium in DEPS to 95.0.4612.5 * chore: disable v8 oilpan * [Compiler] Remove untrusted code mitigations. https://chromium-review.googlesource.com/c/v8/v8/+/3045704 * Remove most FTP logic from services/network. https://chromium-review.googlesource.com/c/chromium/src/+/3076119 * Rename scale_factor.h -> resource_scale_factor.h https://chromium-review.googlesource.com/c/chromium/src/+/3057113 * [GURL -> SiteForCookies] extensions/ https://chromium-review.googlesource.com/c/chromium/src/+/3100825 * breadcrumbs: add desktop entry point https://chromium-review.googlesource.com/c/chromium/src/+/3021746 * Move args_ to private in ExtensionFunction https://chromium-review.googlesource.com/c/chromium/src/+/3076261 * chore: iwyu * fixup! Remove kSameSiteByDefaultCookies and kCookiesWithoutSameSiteMustBeSecure * Disable kDesktopCaptureMacV2 https://chromium-review.googlesource.com/c/chromium/src/+/3069272 * fixup! [Compiler] Remove untrusted code mitigations. * fixup! Disable kDesktopCaptureMacV2 * Revert "chore: disable v8 oilpan" This reverts commit 5d255cf. * Reland "chore: disable v8 oilpan" This reverts commit 1c25276. The previous revert was to test on which platforms did the heapsnapshot test actually fail. * [Clipboard API] Clipboard Custom Formats implementation Part 5. https://chromium-review.googlesource.com/c/chromium/src/+/3039323 * Convert ExtensionFrameHost to RenderFrameHostReceiverSet. https://chromium-review.googlesource.com/c/chromium/src/+/3063358 * Convert PDFWebContentsHelper to RenderFrameHostReceiverSet. https://chromium-review.googlesource.com/c/chromium/src/+/3049751 * [Underscore Migration] Migrate ui/legacy https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/3093160 * chore: remove unknown permission error * chore: fix lint * chore: ignore -Wunreachable-code-return for node deps/ * fixup! chore: ignore -Wunreachable-code-return for node deps/ * fix: windows build * fix: build dependency Dependency was missed in cbeae20 * 3108669: arm,dsp: Fix 8bpp Dct64_NEON(). https://chromium-review.googlesource.com/c/codecs/libgav1/+/3108669 * chore: revert libgav1 roll * Revert "3108669: arm,dsp: Fix 8bpp Dct64_NEON()." This reverts commit 7ed3132. * Revert "chore: revert libgav1 roll" This reverts commit 084a490. * chore: revert clang roll * chore: Fix -Wunreachable-code-aggressive warnings in arm and arm64 code Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: mlaurencin <mlaurencin@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
1 parent 10c4931 commit 5513e66

File tree

109 files changed

+1322
-477
lines changed

Some content is hidden

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

109 files changed

+1322
-477
lines changed

‎BUILD.gn‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,6 +1149,7 @@ if (is_mac) {
11491149
]
11501150

11511151
data = []
1152+
data_deps = []
11521153

11531154
data += [ "$root_out_dir/resources.pak" ]
11541155
data += [ "$root_out_dir/chrome_100_percent.pak" ]
@@ -1167,6 +1168,10 @@ if (is_mac) {
11671168
public_deps = [ "//tools/v8_context_snapshot:v8_context_snapshot" ]
11681169
}
11691170

1171+
if (is_linux) {
1172+
data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ]
1173+
}
1174+
11701175
if (is_win) {
11711176
sources += [
11721177
# TODO: we should be generating our .rc files more like how chrome does

‎DEPS‎

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

1616
vars = {
1717
'chromium_version':
18-
'94.0.4590.2',
18+
'95.0.4612.5',
1919
'node_version':
2020
'v16.7.0',
2121
'nan_version':

‎build/args/all.gn‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,7 @@ is_cfi = false
3333
allow_runtime_configurable_key_storage = true
3434

3535
enable_cet_shadow_stack = false
36+
37+
# TODO(deepak1556): remove once https://bugs.chromium.org/p/chromium/issues/detail?id=1241610
38+
# is fixed.
39+
enable_blink_heap_use_v8_oilpan = false

‎docs/api/cookies.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ the response.
9393
* `domain` String (optional) - The domain of the cookie; this will be normalized with a preceding dot so that it's also valid for subdomains. Empty by default if omitted.
9494
* `path` String (optional) - The path of the cookie. Empty by default if omitted.
9595
* `secure` Boolean (optional) - Whether the cookie should be marked as Secure. Defaults to
96-
false.
96+
false unless [Same Site=None](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite#samesitenone_requires_secure) attribute is used.
9797
* `httpOnly` Boolean (optional) - Whether the cookie should be marked as HTTP only.
9898
Defaults to false.
9999
* `expirationDate` Double (optional) - The expiration date of the cookie as the number of

‎patches/chromium/.patches‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,5 +104,6 @@ don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
104104
add_gin_wrappable_crash_key.patch
105105
logging_win32_only_create_a_console_if_logging_to_stderr.patch
106106
disable_use_lld_for_macos.patch
107-
fix_fix_the_build_on_windows_on_arm.patch
108107
fix_media_key_usage_with_globalshortcuts.patch
108+
feat_expose_raw_response_headers_from_urlloader.patch
109+
revert_roll_clang_llvmorg-14-init-1002-gb5e470aa-1.patch

‎patches/chromium/add_didinstallconditionalfeatures.patch‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ index e24c169444c699f295de2c1f1f42683eeca73436..4675cdccb1876a318a9a0253cdf552bb
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 b0d68dc86bfb32f528bb392c6fe8d5c60805a41b..8c0fb0274650b2a4a36a446a1b0ce01e93c6304b 100644
26+
index da75e85c94b1dba16c423066940cf27c90c1081c..7884866e2358f78a994dd784f187fdb8bd592bad 100644
2727
--- a/content/renderer/render_frame_impl.cc
2828
+++ b/content/renderer/render_frame_impl.cc
29-
@@ -4413,6 +4413,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
29+
@@ -4446,6 +4446,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
3030
observer.DidCreateScriptContext(context, world_id);
3131
}
3232

@@ -40,10 +40,10 @@ index b0d68dc86bfb32f528bb392c6fe8d5c60805a41b..8c0fb0274650b2a4a36a446a1b0ce01e
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 73ad48a8f044ee4ffc795d3aeed17fc921eb44ee..27ade0af23c48dd9875d78113e6d5bb03c964fe1 100644
43+
index a2577aefe0f7121daa46765014fd94cc9c5264b9..302aeb4257105b04cb8ca4ce484354021757ee8d 100644
4444
--- a/content/renderer/render_frame_impl.h
4545
+++ b/content/renderer/render_frame_impl.h
46-
@@ -587,6 +587,8 @@ class CONTENT_EXPORT RenderFrameImpl
46+
@@ -588,6 +588,8 @@ class CONTENT_EXPORT RenderFrameImpl
4747
blink::WebLocalFrameClient::LazyLoadBehavior lazy_load_behavior) override;
4848
void DidCreateScriptContext(v8::Local<v8::Context> context,
4949
int world_id) override;
@@ -67,10 +67,10 @@ index 99ddb8f449481647a499a5bb3fd7f5d5272ae414..00d7f0bbb8dc3afdc2303668481cf17f
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 82750b58500681015be4cd75e9362d235a54c82f..497179aa9b4da053a44513103cdb93fd3fbc94e4 100644
70+
index b0d5db60fbe57275dda835113b0fb21acb9a422f..b6c9c389943088004a419677a2a17be0c6ab6398 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
73-
@@ -187,6 +187,7 @@ void LocalWindowProxy::Initialize() {
73+
@@ -201,6 +201,7 @@ void LocalWindowProxy::Initialize() {
7474
}
7575

7676
InstallConditionalFeatures();
@@ -79,10 +79,10 @@ index 82750b58500681015be4cd75e9362d235a54c82f..497179aa9b4da053a44513103cdb93fd
7979
if (World().IsMainWorld()) {
8080
GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
8181
diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
82-
index fd9d33e9ee3214673757d2857f339fff70e139f2..ed2ccb72e394f177ec17d823fbf22d725ba43853 100644
82+
index 8d7a0e9445d7817441f02b4def1777020d35618f..6f0f79b2766ee8f42815c15744ccfc2a75976b0b 100644
8383
--- a/third_party/blink/renderer/core/frame/local_frame_client.h
8484
+++ b/third_party/blink/renderer/core/frame/local_frame_client.h
85-
@@ -299,6 +299,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
85+
@@ -300,6 +300,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
8686

8787
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
8888
int32_t world_id) = 0;
@@ -92,7 +92,7 @@ index fd9d33e9ee3214673757d2857f339fff70e139f2..ed2ccb72e394f177ec17d823fbf22d72
9292
int32_t world_id) = 0;
9393
virtual bool AllowScriptExtensions() = 0;
9494
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
95-
index 96aea6ae2dc5322699741701569e8a1ccd4b9728..92a957fc4971ed3d5b343e8db4db9d603f11b1e9 100644
95+
index 94e332a2da9522e83ce55d8b7ce303a383e37d05..a3fa8d72ffb450f502de161a8875a81d72c075e8 100644
9696
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
9797
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
9898
@@ -273,6 +273,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
@@ -110,7 +110,7 @@ index 96aea6ae2dc5322699741701569e8a1ccd4b9728..92a957fc4971ed3d5b343e8db4db9d60
110110
v8::Local<v8::Context> context,
111111
int32_t world_id) {
112112
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
113-
index b66e501d692b75e37f50fa3be018df092fc35176..3135bdfa960e9e914ded8ee87f227d5897c9ed33 100644
113+
index 0d7ecf011c802f8c4d874815e345b16ac3a0b5dc..572968b7f6495ee544cdf265aa9b7f6728c74cc9 100644
114114
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
115115
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
116116
@@ -77,6 +77,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
@@ -123,10 +123,10 @@ index b66e501d692b75e37f50fa3be018df092fc35176..3135bdfa960e9e914ded8ee87f227d58
123123
int32_t world_id) override;
124124

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 e405538cf1f520c67bcb72e164c66f4a4859d588..054df6b7718cef2c891eb4d00c95792dde5abd4b 100644
126+
index ec4dfeb2d6fd5206c1d6d697a36d5d78899023cb..7b978f119d3321416dffcc2dea266403dd86f2b6 100644
127127
--- a/third_party/blink/renderer/core/loader/empty_clients.h
128128
+++ b/third_party/blink/renderer/core/loader/empty_clients.h
129-
@@ -355,6 +355,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
129+
@@ -356,6 +356,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
130130

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

‎patches/chromium/add_gin_wrappable_crash_key.patch‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,21 @@ help determine where the crash originated from.
1414
This patch should not be upstreamed, and can be removed in Electron 15 and
1515
beyond once we identify the cause of the crash.
1616

17+
diff --git a/gin/BUILD.gn b/gin/BUILD.gn
18+
index c6059fdb0e0f74ee3ef78c5517634ed5a36f1b10..e16b2ec43b98c3b8724fd85085a33fe52a1e1979 100644
19+
--- a/gin/BUILD.gn
20+
+++ b/gin/BUILD.gn
21+
@@ -88,6 +88,10 @@ component("gin") {
22+
frameworks = [ "CoreFoundation.framework" ]
23+
}
24+
25+
+ if (!is_mas_build) {
26+
+ public_deps += [ "//components/crash/core/common:crash_key" ]
27+
+ }
28+
+
29+
configs += [
30+
"//tools/v8_context_snapshot:use_v8_context_snapshot",
31+
"//v8:external_startup_data",
1732
diff --git a/gin/wrappable.cc b/gin/wrappable.cc
1833
index fe07eb94a8e679859bba6d76ff0d6ee86bd0c67e..ecb0aa2c4ec57e1814f4c94194e775440f4e35ee 100644
1934
--- a/gin/wrappable.cc

‎patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: allow disabling blink scheduler throttling per RenderView
66
This allows us to disable throttling for hidden windows.
77

88
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
9-
index 8f8e095a1dc959a2db5b1a5bc692f9b28896e282..8070f4cf34f341a772c54c47c50335b3db491b5a 100644
9+
index e4f71e2ce9cf7cce68c0b2c336d6a7329a7cd564..30bd888e778d27c738eb67df2316db191a3c3066 100644
1010
--- a/content/browser/renderer_host/render_view_host_impl.cc
1111
+++ b/content/browser/renderer_host/render_view_host_impl.cc
12-
@@ -631,6 +631,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
12+
@@ -616,6 +616,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
1313
GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
1414
}
1515

@@ -22,7 +22,7 @@ index 8f8e095a1dc959a2db5b1a5bc692f9b28896e282..8070f4cf34f341a772c54c47c50335b3
2222
return is_active();
2323
}
2424
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
25-
index f6716de3d78c301cb5283dd800cd23756bb2fbfa..da1af3187872645b89997192cbf5a16f79321ddd 100644
25+
index b9a91d4cf22379408c296742f8ec66eb20c34f7e..f110151e555fc90f9ad863a43b6185c7481cf3b3 100644
2626
--- a/content/browser/renderer_host/render_view_host_impl.h
2727
+++ b/content/browser/renderer_host/render_view_host_impl.h
2828
@@ -137,6 +137,7 @@ class CONTENT_EXPORT RenderViewHostImpl
@@ -85,10 +85,10 @@ index f54b993e9fb9fedcedef327290c2e5d706c699a7..73874e124e2810f07b72fc094f57c85c
8585
// Visibility -----------------------------------------------------------
8686

8787
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
88-
index 920ccfdb9d4c465e2ddf3963bf9c20df22c013da..afe02087fb46273f76069cf5c8d605a0d1e8ec3f 100644
88+
index 7995eb16a7cf6a824653736ca067baa5e688834f..c26e087f2f4d7a1446ce439e5a08a34aa2ccfec4 100644
8989
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
9090
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
91-
@@ -3625,6 +3625,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
91+
@@ -3630,6 +3630,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
9292
return GetPage()->GetPageScheduler();
9393
}
9494

@@ -102,7 +102,7 @@ index 920ccfdb9d4c465e2ddf3963bf9c20df22c013da..afe02087fb46273f76069cf5c8d605a0
102102
void WebViewImpl::SetVisibilityState(
103103
mojom::blink::PageVisibilityState visibility_state,
104104
bool is_initial_state) {
105-
@@ -3636,7 +3643,8 @@ void WebViewImpl::SetVisibilityState(
105+
@@ -3641,7 +3648,8 @@ void WebViewImpl::SetVisibilityState(
106106
}
107107
GetPage()->SetVisibilityState(visibility_state, is_initial_state);
108108
GetPage()->GetPageScheduler()->SetPageVisible(

‎patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Subject: Allow setting secondary label via SimpleMenuModel
66
Builds on https://chromium-review.googlesource.com/c/chromium/src/+/2208976
77

88
diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc
9-
index e7504cd790821ffa213961b51c0c9ab7763ddd82..bd96c37404e930a59d5c91c921b324a10aae38d3 100644
9+
index 1bfe8fb90673a0d0f9f9228a43eafc3b01b00c5f..1484fc4e477b97b6deb8e23b8a749264990cc1c6 100644
1010
--- a/ui/base/models/simple_menu_model.cc
1111
+++ b/ui/base/models/simple_menu_model.cc
1212
@@ -53,6 +53,11 @@ std::u16string SimpleMenuModel::Delegate::GetLabelForCommandId(
@@ -33,7 +33,7 @@ index e7504cd790821ffa213961b51c0c9ab7763ddd82..bd96c37404e930a59d5c91c921b324a1
3333
void SimpleMenuModel::SetMinorText(int index,
3434
const std::u16string& minor_text) {
3535
items_[ValidateItemIndex(index)].minor_text = minor_text;
36-
@@ -391,6 +401,12 @@ std::u16string SimpleMenuModel::GetLabelAt(int index) const {
36+
@@ -396,6 +406,12 @@ std::u16string SimpleMenuModel::GetLabelAt(int index) const {
3737
return items_[ValidateItemIndex(index)].label;
3838
}
3939

@@ -47,7 +47,7 @@ index e7504cd790821ffa213961b51c0c9ab7763ddd82..bd96c37404e930a59d5c91c921b324a1
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 4536b388717844cc74905760828e80ea6d64b7b1..2f9b507b623307e37eb1eb216e96363881404b25 100644
50+
index 529be99f6c5aa64c79745ecf83601ea11fe47c1c..ae9c78a65a5e32de90ae190b7ff170c6de82d84d 100644
5151
--- a/ui/base/models/simple_menu_model.h
5252
+++ b/ui/base/models/simple_menu_model.h
5353
@@ -50,6 +50,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
@@ -68,15 +68,15 @@ index 4536b388717844cc74905760828e80ea6d64b7b1..2f9b507b623307e37eb1eb216e963638
6868
// Sets the minor text for the item at |index|.
6969
void SetMinorText(int index, const std::u16string& minor_text);
7070

71-
@@ -192,6 +196,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
71+
@@ -196,6 +200,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
std::u16string GetLabelAt(int index) const override;
7575
+ std::u16string GetSecondaryLabelAt(int index) const override;
7676
std::u16string GetMinorTextAt(int index) const override;
7777
ImageModel GetMinorIconAt(int index) const override;
7878
bool IsItemDynamicAt(int index) const override;
79-
@@ -230,6 +235,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
79+
@@ -235,6 +240,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
8080
int command_id = 0;
8181
ItemType type = TYPE_COMMAND;
8282
std::u16string label;

‎patches/chromium/blink_local_frame.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ index 8bf6b4bc077cc41da5e0e6b13302bc343537c68f..01bddc0bcb7476408023c4cfc042a088
4949
// its owning reference back to our owning LocalFrame.
5050
client_->Detached(type);
5151
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
52-
index c90b14523f9507c41cc0c723d46a20cdb0fdbac4..c261a26a81d7491b17969a250ccc80def4bfec91 100644
52+
index a9c4d4efe4d66a152c02c7d6029d8c7e3740ebfb..cce1fc3bc9d7779215cd3536553e09078c8d9680 100644
5353
--- a/third_party/blink/renderer/core/frame/local_frame.cc
5454
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
5555
@@ -553,10 +553,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {

0 commit comments

Comments
 (0)