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 126.0.6445.0 (main) #41868

Merged
merged 56 commits into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
315bea8
chore: bump chromium in DEPS to 125.0.6421.0
electron-roller[bot] Apr 15, 2024
ca49c42
chore: bump chromium in DEPS to 125.0.6422.0
electron-roller[bot] Apr 16, 2024
e52bbe6
Add ENABLE_BASE_TRACING flags for compatibility with enable_base_trac…
jkleinsc Apr 16, 2024
96660d7
chore: update patches
jkleinsc Apr 16, 2024
b04570f
fixup: Add ENABLE_BASE_TRACING flags for compatibility with enable_ba…
jkleinsc Apr 16, 2024
3269279
chore: bump chromium in DEPS to 126.0.6423.0
electron-roller[bot] Apr 17, 2024
bf5caac
chore: update patches
jkleinsc Apr 17, 2024
014413f
5426599: Next generation control of unsafe-buffers-usage plugin
jkleinsc Apr 17, 2024
4bca367
chore: bump chromium in DEPS to 126.0.6425.0
electron-roller[bot] Apr 18, 2024
b8d1d0a
chore: update patches
patchup[bot] Apr 18, 2024
bffe203
Roll clang+rust llvmorg-19-init-7229-g315c88c5-2 : llvmorg-19-init-80…
jkleinsc Apr 18, 2024
ec334f5
5445074: [Views AX] Move AXEventNotificationDetails to ui/accessibility/
jkleinsc Apr 18, 2024
eb70d48
Pass IsolationInfo to ContentBrowserClient::WillCreateURLLoaderFactory()
jkleinsc Apr 18, 2024
1fe29cf
chore: bump chromium in DEPS to 126.0.6427.0
electron-roller[bot] Apr 19, 2024
dafc179
chore: update patches
jkleinsc Apr 19, 2024
d4b98ba
chore: remove no longer needed patch
jkleinsc Apr 19, 2024
4c8af33
chore: bump chromium in DEPS to 126.0.6429.0
electron-roller[bot] Apr 20, 2024
7155d1b
chore: bump chromium in DEPS to 126.0.6431.0
electron-roller[bot] Apr 21, 2024
29c3e81
chore: bump chromium in DEPS to 126.0.6433.0
electron-roller[bot] Apr 22, 2024
1e4309f
5466654: Do not create a console if logging to a handle
codebytere Apr 22, 2024
014a3b7
chore: fixup patch indices
codebytere Apr 22, 2024
dff980c
Address Linux NonClientFrameView Changes
codebytere Apr 22, 2024
1d43c72
chore: bump chromium in DEPS to 126.0.6435.0
electron-roller[bot] Apr 23, 2024
b36623f
chore: bump chromium in DEPS to 126.0.6437.0
electron-roller[bot] Apr 24, 2024
405865f
chore: update patches
VerteDinde Apr 24, 2024
c1971c9
chore: bump chromium in DEPS to 126.0.6439.0
electron-roller[bot] Apr 25, 2024
02e0823
chore: bump chromium in DEPS to 126.0.6441.0
electron-roller[bot] Apr 26, 2024
458fe71
5477689: components/crash/content/tools: Format with yapf | https://c…
VerteDinde Apr 26, 2024
1fcddb9
5485006: Remove enable_print_content_analysis GN flag | https://chrom…
VerteDinde Apr 26, 2024
2fae194
chore: update chromium patches
VerteDinde Apr 26, 2024
12a10be
chore: bump chromium in DEPS to 126.0.6443.0
electron-roller[bot] Apr 27, 2024
fbcd5d0
5465608: Convert DCHECKs near RenderWidgetHost, DelegatedFrameHost to…
VerteDinde Apr 27, 2024
c97e509
5492605: Migrate TODOs referencing old crbug IDs to the new issue tra…
VerteDinde Apr 27, 2024
6c9f149
chore: update patches
VerteDinde Apr 27, 2024
960bcca
chore: bump chromium in DEPS to 126.0.6445.0
electron-roller[bot] Apr 28, 2024
97ace95
chore: update patches
patchup[bot] Apr 28, 2024
81f0ac2
5468588: Fullscreen: Encapsulate ExclusiveAccessBubble params in a st…
VerteDinde Apr 29, 2024
173ba15
fixup! 5485006: Remove enable_print_content_analysis GN flag | https:…
VerteDinde Apr 29, 2024
cfbe05c
5461340: `size_t` in `mojo::DataPipe[Consumer|Producer]Handle`: /comp…
VerteDinde Apr 29, 2024
76506b3
5480213: Add an EvictIds struct to FrameEvictorClient | https://chrom…
VerteDinde Apr 29, 2024
ba0a2c2
4341506: [api] Deprecate Isolate::IdleNotificationDeadline | https://…
VerteDinde Apr 29, 2024
7c7ee80
5300826: [v8-tasks] Add source location to v8::TaskRunner, step 4/4. …
VerteDinde Apr 29, 2024
7dc1de1
partially revert is_newly_created to allow for browser initiated abou…
MarshallOfSound May 1, 2024
d5cfbbd
add dep on app_launch_prefetch
MarshallOfSound May 1, 2024
2d43e1e
install sysroots from electron not from chrome
MarshallOfSound May 1, 2024
10ebd55
Merge remote-tracking branch 'origin/main' into roller/chromium/main
MarshallOfSound May 2, 2024
16dcf74
refactor: make UpdateFrameHints an override
MarshallOfSound May 5, 2024
d49a5ba
fix ppapi
MarshallOfSound May 5, 2024
edd9e26
refactor: update namespace for pwm switches
MarshallOfSound May 6, 2024
a520b1c
5459367: WebSQL: Restrict WebSQL service creation to Android only | h…
VerteDinde May 6, 2024
8500df2
5455853: Revert "[Clipboard] Don't add meta charset tag for async wri…
VerteDinde May 7, 2024
7812f35
fixup! refactor: update namespace for pwm switches
VerteDinde May 7, 2024
0cee15e
5147611: [heap] Add checks for ensuring position info slow path is no…
VerteDinde May 8, 2024
8ecca61
fixup! 5412666: [heap] Also avoid heap allocation for allocation trac…
VerteDinde May 9, 2024
544f38a
chore: add websql removal to breaking-changes.md
VerteDinde May 9, 2024
63b629b
Merge branch 'main' into roller/chromium/main
VerteDinde May 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,7 @@ source_set("electron_lib") {
libs += [ "dwmapi.lib" ]
sources += [ "shell/common/asar/archive_win.cc" ]
deps += [
"//components/app_launch_prefetch",
"//components/crash/core/app:crash_export_thunks",
"//ui/native_theme:native_theme_browser",
"//ui/wm",
Expand Down
50 changes: 49 additions & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'

vars = {
'chromium_version':
'125.0.6412.0',
'126.0.6445.0',
'node_version':
'v20.12.2',
'nan_version':
Expand Down Expand Up @@ -161,6 +161,54 @@ hooks = [
'import os, subprocess; os.chdir(os.path.join("src", "electron")); subprocess.check_call(["python3", "script/lib/npx.py", "yarn@' + (Var("yarn_version")) + '", "install", "--frozen-lockfile"]);',
],
},
{
'name': 'sysroot_arm',
'pattern': '.',
'condition': 'checkout_linux and checkout_arm',
'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py',
'--sysroots-json-path=' + Var('sysroots_json_path'),
'--arch=arm'],
},
{
'name': 'sysroot_arm64',
'pattern': '.',
'condition': 'checkout_linux and checkout_arm64',
'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py',
'--sysroots-json-path=' + Var('sysroots_json_path'),
'--arch=arm64'],
},
{
'name': 'sysroot_x86',
'pattern': '.',
'condition': 'checkout_linux and (checkout_x86 or checkout_x64)',
'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py',
'--sysroots-json-path=' + Var('sysroots_json_path'),
'--arch=x86'],
},
{
'name': 'sysroot_mips',
'pattern': '.',
'condition': 'checkout_linux and checkout_mips',
'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py',
'--sysroots-json-path=' + Var('sysroots_json_path'),
'--arch=mips'],
},
{
'name': 'sysroot_mips64',
'pattern': '.',
'condition': 'checkout_linux and checkout_mips64',
'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py',
'--sysroots-json-path=' + Var('sysroots_json_path'),
'--arch=mips64el'],
},
{
'name': 'sysroot_x64',
'pattern': '.',
'condition': 'checkout_linux and checkout_x64',
'action': ['python3', 'src/build/linux/sysroot_scripts/install-sysroot.py',
'--sysroots-json-path=' + Var('sysroots_json_path'),
'--arch=x64'],
},
]

recursedeps = [
Expand Down
9 changes: 9 additions & 0 deletions build/args/all.gn
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,12 @@ v8_enable_private_mapping_fork_optimization = true

# Expose public V8 symbols for native modules.
v8_expose_public_symbols = true

# Disables unsafe-buffers-usage plugin due to incompatibilities with our reclient implementation
# Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5426599
# Ref: https://github.com/electron/electron/commit/8e20f16ea35eeaeb149ae63bad3703d782665f6a
clang_unsafe_buffers_paths = ""

# Disable snapshotting a page when printing for its content to be analyzed for
# sensitive content by enterprise users.
enterprise_content_analysis = false
6 changes: 6 additions & 0 deletions docs/breaking-changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ This document uses the following convention to categorize breaking changes:

## Planned Breaking API Changes (31.0)

### Removed: `WebSQL` support

Chromium has removed support for WebSQL upstream, transitioning it to Android only. See
[Chromium's intent to remove discussion](https://groups.google.com/a/chromium.org/g/blink-dev/c/fWYb6evVA-w/m/wGI863zaAAAJ)
for more information.

### Behavior Changed: `nativeImage.toDataURL` will preseve PNG colorspace

PNG decoder implementation has been changed to preserve colorspace data, the
Expand Down
5 changes: 2 additions & 3 deletions patches/chromium/.patches
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
build_make_libcxx_abi_unstable_false_for_electron.patch
introduce_ozoneplatform_electron_can_call_x11_property.patch
make_gtk_getlibgtk_public.patch
build_disable_print_content_analysis.patch
custom_protocols_plzserviceworker.patch
feat_filter_out_non-shareable_windows_in_the_current_application_in.patch
disable_freezing_flags_after_init_in_node.patch
Expand Down Expand Up @@ -114,7 +113,6 @@ fix_select_the_first_menu_item_when_opened_via_keyboard.patch
fix_return_v8_value_from_localframe_requestexecutescript.patch
fix_harden_blink_scriptstate_maybefrom.patch
fix_use_delegated_generic_capturer_when_available.patch
build_remove_ent_content_analysis_assert.patch
expose_webblob_path_to_allow_embedders_to_get_file_paths.patch
fix_move_autopipsettingshelper_behind_branding_buildflag.patch
revert_remove_the_allowaggressivethrottlingwithwebsocket_feature.patch
Expand All @@ -127,5 +125,6 @@ build_run_reclient_cfg_generator_after_chrome.patch
fix_getcursorscreenpoint_wrongly_returns_0_0.patch
fix_add_support_for_skipping_first_2_no-op_refreshes_in_thumb_cap.patch
refactor_expose_file_system_access_blocklist.patch
revert_power_update_trace_counter_in_power_monitor.patch
partially_revert_is_newly_created_to_allow_for_browser_initiated.patch
fix_use_app_launch_prefetch_namespace_for_subprocesstype.patch
feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch
12 changes: 6 additions & 6 deletions patches/chromium/accelerator.patch
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ This patch makes three changes to Accelerator::GetShortcutText to improve shortc
3. Ctrl-Shift-= and Ctrl-Plus show up as such

diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
index c33829d85745e595e3da8d9913f6e75b05e6c4a9..fa6fe3626b7c5f2b8e8ba9302780650952ecfa47 100644
index 3094f8f1b445b639f43573af6f6b5ae5eddf7227..7c8e781cf1502bdb72ffc9f2d7ab2be684f37d5c 100644
--- a/ui/base/accelerators/accelerator.cc
+++ b/ui/base/accelerators/accelerator.cc
@@ -11,6 +11,7 @@
@@ -12,6 +12,7 @@
#include "base/i18n/rtl.h"
#include "base/notreached.h"
#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
@@ -175,6 +176,11 @@ std::u16string Accelerator::GetShortcutText() const {
@@ -183,6 +184,11 @@ std::u16string Accelerator::GetShortcutText() const {
#endif

if (shortcut.empty()) {
Expand All @@ -33,7 +33,7 @@ index c33829d85745e595e3da8d9913f6e75b05e6c4a9..fa6fe3626b7c5f2b8e8ba93027806509
#if BUILDFLAG(IS_WIN)
// Our fallback is to try translate the key code to a regular character
// unless it is one of digits (VK_0 to VK_9). Some keyboard
@@ -198,6 +204,10 @@ std::u16string Accelerator::GetShortcutText() const {
@@ -206,6 +212,10 @@ std::u16string Accelerator::GetShortcutText() const {
shortcut +=
static_cast<std::u16string::value_type>(base::ToUpperASCII(c));
#endif
Expand All @@ -44,7 +44,7 @@ index c33829d85745e595e3da8d9913f6e75b05e6c4a9..fa6fe3626b7c5f2b8e8ba93027806509
}

#if BUILDFLAG(IS_MAC)
@@ -382,7 +392,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
@@ -390,7 +400,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
const std::u16string& shortcut) const {
std::u16string result = shortcut;

Expand All @@ -53,7 +53,7 @@ index c33829d85745e595e3da8d9913f6e75b05e6c4a9..fa6fe3626b7c5f2b8e8ba93027806509
result = ApplyModifierToAcceleratorString(result, IDS_APP_SHIFT_KEY);

// Note that we use 'else-if' in order to avoid using Ctrl+Alt as a shortcut.
@@ -390,7 +400,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
@@ -398,7 +408,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
// more information.
if (IsCtrlDown())
result = ApplyModifierToAcceleratorString(result, IDS_APP_CTRL_KEY);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
This should be upstreamed.

diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 234d3af2ec7d275bf2f1409540b2860118af36b9..c6f279d58cd23d9acc957a94f5e29faf11e4f25c 100644
index ab52bde9d5ffe8a18621d3bca22fa900af8f56ab..196807d12d385d42a6e3acc7ad1bdb5dd134d48b 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -265,6 +265,10 @@ int GpuMain(MainFunctionParams parameters) {
@@ -266,6 +266,10 @@ int GpuMain(MainFunctionParams parameters) {
// to the GpuProcessHost once the GpuServiceImpl has started.
viz::GpuServiceImpl::InstallPreInitializeLogHandler();

Expand All @@ -24,7 +24,7 @@ index 234d3af2ec7d275bf2f1409540b2860118af36b9..c6f279d58cd23d9acc957a94f5e29faf
// We are experiencing what appear to be memory-stomp issues in the GPU
// process. These issues seem to be impacting the task executor and listeners
// registered to it. Create the task executor on the heap to guard against
@@ -363,7 +367,6 @@ int GpuMain(MainFunctionParams parameters) {
@@ -364,7 +368,6 @@ int GpuMain(MainFunctionParams parameters) {
#endif
const bool dead_on_arrival = !init_success;

Expand Down
18 changes: 9 additions & 9 deletions patches/chromium/add_didinstallconditionalfeatures.patch
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ index 902d84ad70adc9496f3af989465a99b6f44b077a..3ce043eea32c41130aa59ab8570a05b3
int32_t world_id) {}
virtual void DidClearWindowObject() {}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index ccd88e26d49df102130574559c2b1087e77cdd09..48d1bb78b5b989a7ae5567cd8c483e654ae6f59f 100644
index 2d7d13fc9f361bc3e4b16e4db008c042f492704a..dc96cd01365491a2384e9d27e384b680c3e86a23 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4688,6 +4688,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
@@ -4692,6 +4692,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
observer.DidCreateScriptContext(context, world_id);
}

Expand All @@ -40,10 +40,10 @@ index ccd88e26d49df102130574559c2b1087e77cdd09..48d1bb78b5b989a7ae5567cd8c483e65
int world_id) {
for (auto& observer : observers_)
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index d45223da26fc56824183527dcf666d3fa01a75d6..ca3697e8d08f008f621b4ff66a43eb52d9391892 100644
index b4e2293651bb0e234aa8119c2afece5faa11a758..37af654883ec39c761cc4fcaab9d22061595d451 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -643,6 +643,8 @@ class CONTENT_EXPORT RenderFrameImpl
@@ -645,6 +645,8 @@ class CONTENT_EXPORT RenderFrameImpl
void DidObserveLayoutShift(double score, bool after_input_or_scroll) override;
void DidCreateScriptContext(v8::Local<v8::Context> context,
int world_id) override;
Expand All @@ -53,10 +53,10 @@ index d45223da26fc56824183527dcf666d3fa01a75d6..ca3697e8d08f008f621b4ff66a43eb52
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 2b1304f271872bbdbfa0869a02ca78d0102cb59a..ed64f37150a39657de28c77fcbf6faf0e687e28d 100644
index 2bb6e24cf5b83b8f6cf523d648307608ede1b538..1fe4df62e66fd10267e72d91176529fccabe83aa 100644
--- a/third_party/blink/public/web/web_local_frame_client.h
+++ b/third_party/blink/public/web/web_local_frame_client.h
@@ -641,6 +641,9 @@ class BLINK_EXPORT WebLocalFrameClient {
@@ -645,6 +645,9 @@ class BLINK_EXPORT WebLocalFrameClient {
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
int32_t world_id) {}

Expand All @@ -67,7 +67,7 @@ index 2b1304f271872bbdbfa0869a02ca78d0102cb59a..ed64f37150a39657de28c77fcbf6faf0
virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
int32_t world_id) {}
diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
index 821886767b14786145240992f45bd6106c57d153..f6924f04e156843624b3b9d063a540f488c4b047 100644
index 0d387e5ae2177311123789762fb2686770e78cab..6b442f0568f119bf8476a09d91a5fdd59b469399 100644
--- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
+++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
@@ -215,6 +215,7 @@ void LocalWindowProxy::Initialize() {
Expand All @@ -92,10 +92,10 @@ index 69c46beec12f4b5abf530c2fb836d6185ee049f9..e9c0f5c0930929a5f62a34943f7619a3
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 18fc1ea8772b89c82b00984b5e638d7766fb47a8..3271fa1aa149fa51d2832cbcca193740c2a5295b 100644
index 0cee9fc9642c4a2eac51cc7b57124d9772411b8c..4a2bd06f9f254969419d3ec00a59466f8278814c 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
@@ -292,6 +292,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
@@ -293,6 +293,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
web_frame_->Client()->DidCreateScriptContext(context, world_id);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ decorations in maximized mode where needed, preventing empty space caused
by decoration shadows and rounded titlebars around the window while maximized.

diff --git a/ui/gtk/gtk_ui.cc b/ui/gtk/gtk_ui.cc
index ab8f0d6b545b24c28eb427e6d2ef33ef35d22e91..ed3213e73959079e5bc119987da7c31cc07f2f27 100644
index 7b81a752ffad229a7bf1917f000b7a45f0828c36..1f08396713155eafc78a1fa9fc8fec22df350a91 100644
--- a/ui/gtk/gtk_ui.cc
+++ b/ui/gtk/gtk_ui.cc
@@ -562,11 +562,12 @@ std::unique_ptr<ui::NavButtonProvider> GtkUi::CreateNavButtonProvider() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ index 6022a0af4241fe65bd03d7cbf95785e8879dc78e..ec9e4c6ece9014b66e7d65e99cda2b95
objects_.clear();
platform_representations_.clear();
diff --git a/ui/base/clipboard/scoped_clipboard_writer.h b/ui/base/clipboard/scoped_clipboard_writer.h
index 08fce03a51ded80c8dfe59f17a438ace21f8daa7..ffbd0cbff14ae7af2d00d5949f6b608e998e0429 100644
index 96ba9abb9b7efab79adbf299c6bd3b4f7a4501e1..0916b81ec5b3cb123185b7cff332120ee498fb57 100644
--- a/ui/base/clipboard/scoped_clipboard_writer.h
+++ b/ui/base/clipboard/scoped_clipboard_writer.h
@@ -89,6 +89,10 @@ class COMPONENT_EXPORT(UI_BASE_CLIPBOARD) ScopedClipboardWriter {
Expand Down
12 changes: 6 additions & 6 deletions patches/chromium/adjust_accessibility_ui_for_electron.patch
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ usage of BrowserList and Browser as we subclass related methods and use our
WindowList.

diff --git a/chrome/browser/ui/webui/accessibility/accessibility_ui.cc b/chrome/browser/ui/webui/accessibility/accessibility_ui.cc
index 45b085ebb5096b2cdd083337371539a249c7a0a8..9a0a6cb8b37c60641c2c51aa489fbf22cdb123cb 100644
index aff8a187b6d81172bf5930c6da6bfed4d7989057..5923e39ae94cabd716d845c86db5f84c3c51e2cb 100644
--- a/chrome/browser/ui/webui/accessibility/accessibility_ui.cc
+++ b/chrome/browser/ui/webui/accessibility/accessibility_ui.cc
@@ -44,6 +44,7 @@
@@ -43,6 +43,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_delegate.h"
#include "content/public/browser/web_ui_data_source.h"
+#include "electron/shell/browser/electron_browser_context.h"
#include "ui/accessibility/accessibility_features.h"
#include "ui/accessibility/ax_updates_and_events.h"
#include "ui/accessibility/platform/ax_platform_node.h"
#include "ui/accessibility/platform/ax_platform_node_delegate.h"
@@ -169,7 +170,7 @@ base::Value::Dict BuildTargetDescriptor(content::RenderViewHost* rvh) {
accessibility_mode);
}
Expand Down Expand Up @@ -128,10 +128,10 @@ index 45b085ebb5096b2cdd083337371539a249c7a0a8..9a0a6cb8b37c60641c2c51aa489fbf22
+#endif
}
diff --git a/chrome/browser/ui/webui/accessibility/accessibility_ui.h b/chrome/browser/ui/webui/accessibility/accessibility_ui.h
index b62ebe504451d7dcd057a3fb6fa64ecd8897c26f..b0e54b76fa9a42df789b12f2e7e6d1ebd41b6aed 100644
index 45dead36d71f1c91e1be607180e548854083304c..79a2742e6b95e9ab8257c0f1af75eeebce8566e9 100644
--- a/chrome/browser/ui/webui/accessibility/accessibility_ui.h
+++ b/chrome/browser/ui/webui/accessibility/accessibility_ui.h
@@ -27,6 +27,8 @@ class ScopedAccessibilityMode;
@@ -30,6 +30,8 @@ class ScopedAccessibilityMode;
class WebContents;
} // namespace content

Expand All @@ -140,7 +140,7 @@ index b62ebe504451d7dcd057a3fb6fa64ecd8897c26f..b0e54b76fa9a42df789b12f2e7e6d1eb
namespace user_prefs {
class PrefRegistrySyncable;
} // namespace user_prefs
@@ -79,6 +81,8 @@ class AccessibilityUIMessageHandler : public content::WebUIMessageHandler {
@@ -82,6 +84,8 @@ class AccessibilityUIMessageHandler : public content::WebUIMessageHandler {
static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);

private:
Expand Down