Skip to content

Commit 6566111

Browse files
electron-roller[bot]patchup[bot]VerteDinde
authored and
pull[bot]
committed
chore: bump chromium to 116.0.5817.0 (main) (electron#38465)
* chore: bump chromium in DEPS to 116.0.5793.3 * chore: update patches * chore: bump chromium in DEPS to 116.0.5795.0 * chore: update patches * chore: bump chromium in DEPS to 116.0.5797.0 * chore: update patches * chore: bump chromium in DEPS to 116.0.5799.0 * 4522192: [serial] Allow Bluetooth ports to be requested by service class ID. | https://chromium-review.googlesource.com/c/chromium/src/+/4522192 * 4545385: Create base::apple::Owned[frameworktype], use it for gfx::NativeEvent | https://chromium-review.googlesource.com/c/chromium/src/+/4545385 * chore: bump chromium in DEPS to 116.0.5801.0 * chore: update patches * 4562796: Use base::apple::Owned[frameworktype] for ui::PlatformEvent | https://chromium-review.googlesource.com/c/chromium/src/+/4562796 * 4559790: Manual raw_ptr rewrite: //base | https://chromium-review.googlesource.com/c/chromium/src/+/4559790 * chore: bump chromium in DEPS to 116.0.5803.0 * chore: update patches * chore: bump chromium in DEPS to 116.0.5805.2 * chore: update patches * 4547630: Move content/public/common/network_service_util.h to c/p/browser/ | https://chromium-review.googlesource.com/c/chromium/src/+/4547630 * 4510075: Adding extensions to network response experiment | https://chromium-review.googlesource.com/c/chromium/src/+/4510075 * 4566552: Auto-generate grd file for chrome://accessibility. | https://chromium-review.googlesource.com/c/chromium/src/+/4566552 * chore: bump chromium in DEPS to 116.0.5807.0 * chore: update patches * 4533536: [Privacy Hub] Geolocation manager used directly | https://chromium-review.googlesource.com/c/chromium/src/+/4533536 * chore: patch out ARC support from /chrome/browser 4571955: Convert /chrome/browser to use ARC | https://chromium-review.googlesource.com/c/chromium/src/+/4571955 * chore: bump chromium in DEPS to 116.0.5809.2 * chore: bump chromium in DEPS to 116.0.5811.0 * chore: update patches * 4573627: Adopt base::NoDestructor for KeyedService factories | https://chromium-review.googlesource.com/c/chromium/src/+/4573627 * 4576878: Reland "Shared Storage: Add mojo method for observing response headers" | https://chromium-review.googlesource.com/c/chromium/src/+/4576878 * chore: bump chromium in DEPS to 116.0.5813.0 * chore: update patches * fixup! 4566552: Auto-generate grd file for chrome://accessibility. | https://chromium-review.googlesource.com/c/chromium/src/+/4566552 * chore: fix up lint * test: (debug) use Promise.all in asan tests * chore: manually roll DEPS to 116.0.5815.0 * chore: update patches * 4585150: Convert /printing to use ARC | https://chromium-review.googlesource.com/c/chromium/src/+/4585150 * test: (asan) extend timeout, clean up debugging * chore: remove ARC chromium patch * chore: update patches after main sync * 4546398: Convert /chrome/browser to use ARC | https://chromium-review.googlesource.com/c/chromium/src/+/4546398 * build: add chrome_lib_arc for chromium_src/BUILD.gn sources * fixup! 4559790: Manual raw_ptr rewrite: //base | https://chromium-review.googlesource.com/c/chromium/src/+/4559790 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: VerteDinde <[email protected]> Co-authored-by: VerteDinde <[email protected]>
1 parent 0c208dc commit 6566111

102 files changed

Lines changed: 459 additions & 469 deletions

File tree

Some content is hidden

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

‎BUILD.gn‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,7 @@ source_set("electron_lib") {
540540

541541
if (is_mac) {
542542
deps += [
543+
":chrome_lib_arc",
543544
":electron_lib_arc",
544545
"//components/remote_cocoa/app_shim",
545546
"//components/remote_cocoa/browser",
@@ -769,6 +770,32 @@ source_set("electron_lib") {
769770
}
770771

771772
if (is_mac) {
773+
source_set("chrome_lib_arc") {
774+
include_dirs = [ "." ]
775+
sources = [
776+
"//chrome/browser/extensions/global_shortcut_listener_mac.h",
777+
"//chrome/browser/extensions/global_shortcut_listener_mac.mm",
778+
"//chrome/browser/icon_loader_mac.mm",
779+
"//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
780+
"//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
781+
"//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.h",
782+
"//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm",
783+
"//chrome/browser/media/webrtc/window_icon_util_mac.mm",
784+
"//chrome/browser/platform_util_mac.mm",
785+
"//chrome/browser/process_singleton_mac.mm",
786+
]
787+
788+
deps = [
789+
"//base",
790+
"//skia",
791+
"//third_party/electron_node:node_lib",
792+
"//third_party/webrtc_overrides:webrtc_component",
793+
"//v8",
794+
]
795+
796+
configs += [ "//build/config/compiler:enable_arc" ]
797+
}
798+
772799
source_set("electron_lib_arc") {
773800
include_dirs = [ "." ]
774801
sources = [

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
22

33
vars = {
44
'chromium_version':
5-
'116.0.5791.0',
5+
'116.0.5815.0',
66
'node_version':
77
'v18.16.0',
88
'nan_version':

‎chromium_src/BUILD.gn‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -129,16 +129,6 @@ static_library("chrome") {
129129

130130
if (is_mac) {
131131
sources += [
132-
"//chrome/browser/extensions/global_shortcut_listener_mac.h",
133-
"//chrome/browser/extensions/global_shortcut_listener_mac.mm",
134-
"//chrome/browser/icon_loader_mac.mm",
135-
"//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
136-
"//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
137-
"//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.h",
138-
"//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm",
139-
"//chrome/browser/media/webrtc/window_icon_util_mac.mm",
140-
"//chrome/browser/platform_util_mac.mm",
141-
"//chrome/browser/process_singleton_mac.mm",
142132
"//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.h",
143133
"//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.mm",
144134
]
@@ -178,6 +168,7 @@ static_library("chrome") {
178168

179169
public_deps = [
180170
"//chrome/browser:dev_ui_browser_resources",
171+
"//chrome/browser/resources/accessibility:resources",
181172
"//chrome/browser/ui/color:mixers",
182173
"//chrome/common",
183174
"//chrome/common:version_header",

‎electron_paks.gni‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ template("electron_extra_paks") {
5252
])
5353
output = "${invoker.output_dir}/resources.pak"
5454
sources = [
55+
"$root_gen_dir/chrome/accessibility_resources.pak",
5556
"$root_gen_dir/chrome/browser_resources.pak",
5657
"$root_gen_dir/chrome/common_resources.pak",
5758
"$root_gen_dir/chrome/dev_ui_browser_resources.pak",
@@ -69,6 +70,7 @@ template("electron_extra_paks") {
6970
deps = [
7071
"//chrome/browser:dev_ui_browser_resources",
7172
"//chrome/browser:resources",
73+
"//chrome/browser/resources/accessibility:resources",
7274
"//chrome/common:resources",
7375
"//components/resources",
7476
"//content:content_resources",

‎patches/boringssl/revert_track_ssl_error_zero_return_explicitly.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ index 2ca14efae5ea478f43794a81883b00dfdb1a37b0..d73055fbf39334925ef4b4804bbaca57
2020

2121
case ssl_open_record_error:
2222
diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc
23-
index 838761af5cb8498d8bcb66b1a7a6f9c1a233cac7..b9bda24dd4d372485622ff99873ee34ee4bd9684 100644
23+
index d7b5be3ddeec762a3353baefc67d659c9aba68f5..82bf00311b36bdbc948ae14f808c78fd2f71ca54 100644
2424
--- a/ssl/ssl_lib.cc
2525
+++ b/ssl/ssl_lib.cc
2626
@@ -1333,7 +1333,7 @@ int SSL_get_error(const SSL *ssl, int ret_code) {
@@ -32,7 +32,7 @@ index 838761af5cb8498d8bcb66b1a7a6f9c1a233cac7..b9bda24dd4d372485622ff99873ee34e
3232
return SSL_ERROR_ZERO_RETURN;
3333
}
3434
// An EOF was observed which violates the protocol, and the underlying
35-
@@ -2622,13 +2622,7 @@ void *SSL_CTX_get_ex_data(const SSL_CTX *ctx, int idx) {
35+
@@ -2695,13 +2695,7 @@ void *SSL_CTX_get_ex_data(const SSL_CTX *ctx, int idx) {
3636
return CRYPTO_get_ex_data(&ctx->ex_data, idx);
3737
}
3838

‎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 c641da1b1f096a41c708737435140691a501c431..4e9940c00bad3f0ba72c0b32833a0d0df095c61e 100644
13+
index 16610b7729464949eb78ecaf78c87b2d6df3d973..386fadd8ba7e654707c41e32291c9d3d17e6756a 100644
1414
--- a/content/gpu/gpu_main.cc
1515
+++ b/content/gpu/gpu_main.cc
16-
@@ -258,6 +258,10 @@ int GpuMain(MainFunctionParams parameters) {
16+
@@ -255,6 +255,10 @@ int GpuMain(MainFunctionParams parameters) {
1717
// to the GpuProcessHost once the GpuServiceImpl has started.
1818
viz::GpuServiceImpl::InstallPreInitializeLogHandler();
1919

@@ -24,7 +24,7 @@ index c641da1b1f096a41c708737435140691a501c431..4e9940c00bad3f0ba72c0b32833a0d0d
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-
@@ -342,7 +346,6 @@ int GpuMain(MainFunctionParams parameters) {
27+
@@ -339,7 +343,6 @@ int GpuMain(MainFunctionParams parameters) {
2828
const_cast<base::CommandLine*>(&command_line), gpu_preferences);
2929
const bool dead_on_arrival = !init_success;
3030

‎patches/chromium/add_didinstallconditionalfeatures.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ index 103a9d9fb17e954ecaf0acecaa3eeafc23e39c94..de299316216dba204decba3b0eb57f5c
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 1a0e197b5fe5b698671ddcb0660b69669939ebc2..b1978947e3dc568ea3badcd21dfdb4d089c791e5 100644
26+
index 797ebc2b7aa045bcf9e032b3ebae28a3fc8d2403..f3d5f0b36a2484b1959e26ff170836750c4d4c3e 100644
2727
--- a/content/renderer/render_frame_impl.cc
2828
+++ b/content/renderer/render_frame_impl.cc
29-
@@ -4416,6 +4416,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
29+
@@ -4419,6 +4419,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
3030
observer.DidCreateScriptContext(context, world_id);
3131
}
3232

‎patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch‎

Lines changed: 15 additions & 15 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 3b059b6121562dba8ec7c4483388408100d8ef26..0eb07c514883975f39b1a98ccfe65028e4c2ad75 100644
9+
index 421a0b8ba291a944db62507d1004210555a1200c..09dd63d9f9a59d32dc9dd569aaa176a94dbfdfaa 100644
1010
--- a/content/browser/renderer_host/render_view_host_impl.cc
1111
+++ b/content/browser/renderer_host/render_view_host_impl.cc
12-
@@ -700,6 +700,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
12+
@@ -710,6 +710,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
1313
GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
1414
}
1515

@@ -48,25 +48,25 @@ index 9979c25ecd57e68331b628a518368635db5c2027..f65bfbbb663a5bb0511ffa389d3163e0
4848
// This interface should only be implemented inside content.
4949
friend class RenderViewHostImpl;
5050
diff --git a/content/test/test_page_broadcast.h b/content/test/test_page_broadcast.h
51-
index 3f4396e50b419cd6a16f34036f4a0a1113109c55..60e038413369ea1021bcad86f9398c9964140652 100644
51+
index 73c0f64aa84061381a98ba60906835258f881468..41bdf7e231eca4617dbe53737a3925039bf77c4f 100644
5252
--- a/content/test/test_page_broadcast.h
5353
+++ b/content/test/test_page_broadcast.h
54-
@@ -43,6 +43,7 @@ class TestPageBroadcast : public blink::mojom::PageBroadcast {
55-
blink::mojom::RemoteFrameInterfacesFromBrowserPtr remote_frame_interfaces,
56-
blink::mojom::RemoteMainFrameInterfacesPtr remote_main_frame_interfaces)
54+
@@ -45,6 +45,7 @@ class TestPageBroadcast : public blink::mojom::PageBroadcast {
5755
override;
56+
void UpdatePageBrowsingContextGroup(const blink::BrowsingContextGroupInfo&
57+
browsing_context_group_info) override;
5858
+ void SetSchedulerThrottling(bool allowed) override {}
5959

6060
mojo::AssociatedReceiver<blink::mojom::PageBroadcast> receiver_;
6161
};
6262
diff --git a/third_party/blink/public/mojom/page/page.mojom b/third_party/blink/public/mojom/page/page.mojom
63-
index d18c66114870de83c7eef21578e9e2b8d5606a8b..e1defb3992289427df85963f44a705e3d9257342 100644
63+
index d3877e946b1d65eba5bb45efe786fbcc7925ca6e..73bd5056baf7e4278b7260e550e2b8516be72f20 100644
6464
--- a/third_party/blink/public/mojom/page/page.mojom
6565
+++ b/third_party/blink/public/mojom/page/page.mojom
66-
@@ -149,4 +149,7 @@ interface PageBroadcast {
67-
mojo_base.mojom.UnguessableToken devtools_frame_token,
68-
RemoteFrameInterfacesFromBrowser remote_frame_interfaces,
69-
RemoteMainFrameInterfaces remote_main_frame_interfaces);
66+
@@ -155,4 +155,7 @@ interface PageBroadcast {
67+
// in `browsing_context_group_info`.
68+
UpdatePageBrowsingContextGroup(
69+
blink.mojom.BrowsingContextGroupInfo browsing_context_group_info);
7070
+
7171
+ // Whether to enable the Renderer scheduler background throttling.
7272
+ SetSchedulerThrottling(bool allowed);
@@ -84,7 +84,7 @@ index 8a18ecf567cd3a6a2fb1627083a5544a93198bf4..6bb4074e033e045de164bc776f75f152
8484
// Visibility -----------------------------------------------------------
8585

8686
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
87-
index a1bcdb3b7ceb5bed96b4c442268e3b7ddb490fa4..acda9f8ea1789d3febc0386ae855c009ea462816 100644
87+
index ec75fb7adcd7f1b39ded29df61dbcb060798becc..0576934b9f747ab731ab1fe52c7d02882949e227 100644
8888
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
8989
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
9090
@@ -3833,13 +3833,21 @@ PageScheduler* WebViewImpl::Scheduler() const {
@@ -111,18 +111,18 @@ index a1bcdb3b7ceb5bed96b4c442268e3b7ddb490fa4..acda9f8ea1789d3febc0386ae855c009
111111
if (!is_initial_state) {
112112
for (auto& observer : observers_)
113113
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
114-
index cce09d720fda1929cd5202841305ea564ebdecaf..63bb7c62a8a6abf32fd8e29861018b0c9c80d471 100644
114+
index 6a180620e00c77d0f4be346d1296f62feb714abb..c0ccf14faa52ab190c5848e8e9b597bcf637d4c0 100644
115115
--- a/third_party/blink/renderer/core/exported/web_view_impl.h
116116
+++ b/third_party/blink/renderer/core/exported/web_view_impl.h
117-
@@ -443,6 +443,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
117+
@@ -445,6 +445,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
118118
LocalDOMWindow* PagePopupWindow() const;
119119

120120
PageScheduler* Scheduler() const override;
121121
+ void SetSchedulerThrottling(bool allowed) override;
122122
void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
123123
bool is_initial_state) override;
124124
mojom::blink::PageVisibilityState GetVisibilityState() override;
125-
@@ -907,6 +908,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
125+
@@ -909,6 +910,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
126126
// If true, we send IPC messages when |preferred_size_| changes.
127127
bool send_preferred_size_changes_ = false;
128128

‎patches/chromium/allow_setting_secondary_label_via_simplemenumodel.patch‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ 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 c058edaf6ea40746228da569a8739c50f958500d..2d4306d16ce8e354dcdf3da8c5afce8546349fcd 100644
9+
index 73bdc6d0788463ef7a8656e8902fde62cbbb5464..7d49d9928fcbb23361a63eb458d6841e4adcbf41 100644
1010
--- a/ui/base/models/simple_menu_model.cc
1111
+++ b/ui/base/models/simple_menu_model.cc
12-
@@ -52,6 +52,11 @@ std::u16string SimpleMenuModel::Delegate::GetLabelForCommandId(
12+
@@ -48,6 +48,11 @@ std::u16string SimpleMenuModel::Delegate::GetLabelForCommandId(
1313
return std::u16string();
1414
}
1515

@@ -21,7 +21,7 @@ index c058edaf6ea40746228da569a8739c50f958500d..2d4306d16ce8e354dcdf3da8c5afce85
2121
ImageModel SimpleMenuModel::Delegate::GetIconForCommandId(
2222
int command_id) const {
2323
return ImageModel();
24-
@@ -310,6 +315,11 @@ void SimpleMenuModel::SetLabel(size_t index, const std::u16string& label) {
24+
@@ -313,6 +318,11 @@ void SimpleMenuModel::SetLabel(size_t index, const std::u16string& label) {
2525
MenuItemsChanged();
2626
}
2727

@@ -33,7 +33,7 @@ index c058edaf6ea40746228da569a8739c50f958500d..2d4306d16ce8e354dcdf3da8c5afce85
3333
void SimpleMenuModel::SetMinorText(size_t index,
3434
const std::u16string& minor_text) {
3535
items_[ValidateItemIndex(index)].minor_text = minor_text;
36-
@@ -403,6 +413,12 @@ std::u16string SimpleMenuModel::GetLabelAt(size_t index) const {
36+
@@ -406,6 +416,12 @@ std::u16string SimpleMenuModel::GetLabelAt(size_t index) const {
3737
return items_[ValidateItemIndex(index)].label;
3838
}
3939

@@ -47,7 +47,7 @@ index c058edaf6ea40746228da569a8739c50f958500d..2d4306d16ce8e354dcdf3da8c5afce85
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 3f2ae4cb1347a8bac7df6d993d5b70b4212fdc66..72d70e3f94f990f8f9f5e4268f6186762e409d15 100644
50+
index 11dde7dde3fb3bd2f61cacb4a11e33a3d2a90e0c..56ec74ee34397ce09248687e196400ed254d811c 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 {
@@ -58,7 +58,7 @@ index 3f2ae4cb1347a8bac7df6d993d5b70b4212fdc66..72d70e3f94f990f8f9f5e4268f618676
5858
// Gets the icon for the item with the specified id.
5959
virtual ImageModel GetIconForCommandId(int command_id) const;
6060

61-
@@ -167,6 +168,9 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
61+
@@ -168,6 +169,9 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
6262
// Sets the label for the item at |index|.
6363
void SetLabel(size_t index, const std::u16string& label);
6464

@@ -68,15 +68,15 @@ index 3f2ae4cb1347a8bac7df6d993d5b70b4212fdc66..72d70e3f94f990f8f9f5e4268f618676
6868
// Sets the minor text for the item at |index|.
6969
void SetMinorText(size_t index, const std::u16string& minor_text);
7070

71-
@@ -206,6 +210,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
71+
@@ -207,6 +211,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
7272
ui::MenuSeparatorType GetSeparatorTypeAt(size_t index) const override;
7373
int GetCommandIdAt(size_t index) const override;
7474
std::u16string GetLabelAt(size_t index) const override;
7575
+ std::u16string GetSecondaryLabelAt(size_t index) const override;
7676
std::u16string GetMinorTextAt(size_t index) const override;
7777
ImageModel GetMinorIconAt(size_t index) const override;
7878
bool IsItemDynamicAt(size_t index) const override;
79-
@@ -246,6 +251,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
79+
@@ -247,6 +252,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 22c4d4e9718a503d9c7ca26a40c97149b0f8986a..6bdc2757c96a28022fda9e6f5e3b74a0
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 c01a916555d1fe5dbf972cba3b7ce248c80df371..d7ba7113f69e23b0fe47d135a4f51b9d50fa45b2 100644
52+
index e49e7e8079d525e94d7063ed8613056b59e2d873..0ea3c6c8b4a718821ea5dd40cb9239114207216d 100644
5353
--- a/third_party/blink/renderer/core/frame/local_frame.cc
5454
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
5555
@@ -636,10 +636,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {

0 commit comments

Comments
 (0)