mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: bump chromium to 113.0.5660.0 (main) (#37612)

Browse source 
* chore: bump chromium in DEPS to 113.0.5657.0

* chore: bump chromium in DEPS to 113.0.5660.0

* chore: update patches

printing.patch
https://chromium-review.googlesource.com/c/chromium/src/+/4347664
https://chromium-review.googlesource.com/c/chromium/src/+/4347664
https://chromium-review.googlesource.com/c/chromium/src/+/4338810
https://chromium-review.googlesource.com/c/chromium/src/+/4339496

mas_disable_remote_layer.patch
https://chromium-review.googlesource.com/c/chromium/src/+/4334544
https://chromium-review.googlesource.com/c/chromium/src/+/4335299

* Add API to verify `TOP_LEVEL_STORAGE_ACCESS` permission status

https://chromium-review.googlesource.com/c/chromium/src/+/4306712

* Move os_crypt into a sync/ subdirectory.

https://chromium-review.googlesource.com/c/chromium/src/+/4336304

* chore: generate libc++ headers

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
electron-roller[bot] 2023-03-20 07:06:57 -04:00 committed by GitHub
parent 9611b641c9
commit 5261e08d0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
64 changed files with 391 additions and 377 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
BUILD.gn
View file

@ -1,7 +1,7 @@
import("//build/config/locales.gni")
import("//build/config/ui.gni")
import("//build/config/win/manifest.gni")
import("//components/os_crypt/features.gni")
import("//components/os_crypt/sync/features.gni")
import("//components/spellcheck/spellcheck_build_features.gni")
import("//content/public/app/mac_helpers.gni")
import("//extensions/buildflags/buildflags.gni")
@ -433,7 +433,7 @@ source_set("electron_lib") {
"//components/network_hints/renderer",
"//components/network_session_configurator/common",
"//components/omnibox/browser:buildflags",
"//components/os_crypt",
"//components/os_crypt/sync",
"//components/pref_registry",
"//components/prefs",
"//components/security_state/content",

2
DEPS
View file

@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
vars = {
'chromium_version':
'113.0.5653.0',
'113.0.5660.0',
'node_version':
'v18.15.0',
'nan_version':

5
filenames.libcxx.gni
View file

@ -226,10 +226,15 @@ libcxx_headers = [
"//buildtools/third_party/libc++/trunk/include/__bsd_locale_defaults.h",
"//buildtools/third_party/libc++/trunk/include/__bsd_locale_fallbacks.h",
"//buildtools/third_party/libc++/trunk/include/__charconv/chars_format.h",
"//buildtools/third_party/libc++/trunk/include/__charconv/from_chars_integral.h",
"//buildtools/third_party/libc++/trunk/include/__charconv/from_chars_result.h",
"//buildtools/third_party/libc++/trunk/include/__charconv/tables.h",
"//buildtools/third_party/libc++/trunk/include/__charconv/to_chars.h",
"//buildtools/third_party/libc++/trunk/include/__charconv/to_chars_base_10.h",
"//buildtools/third_party/libc++/trunk/include/__charconv/to_chars_floating_point.h",
"//buildtools/third_party/libc++/trunk/include/__charconv/to_chars_integral.h",
"//buildtools/third_party/libc++/trunk/include/__charconv/to_chars_result.h",
"//buildtools/third_party/libc++/trunk/include/__charconv/traits.h",
"//buildtools/third_party/libc++/trunk/include/__chrono/calendar.h",
"//buildtools/third_party/libc++/trunk/include/__chrono/concepts.h",
"//buildtools/third_party/libc++/trunk/include/__chrono/convert_to_timespec.h",

1
patches/chromium/.patches
View file

@ -126,4 +126,3 @@ expose_v8initializer_codegenerationcheckcallbackinmainthread.patch
chore_patch_out_profile_methods_in_profile_selections_cc.patch
chore_defer_usb_service_getdevices_request_until_usb_service_is.patch
revert_roll_clang_rust_llvmorg-16-init-17653-g39da55e8-3.patch
fix_copying_of_runtime_dlls_to_win_clang_x64.patch

16
patches/chromium/add_didinstallconditionalfeatures.patch
View file

@ -23,10 +23,10 @@ index 6c92a2856e447bdda11c7ed2c64b79b93a0eca26..03dedde2d83e6b09fb7e90be7dfdce24
int32_t world_id) {}
virtual void DidClearWindowObject() {}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 9d36910bf306eb900a4f3668ed62609454a1849b..77d81002500acc34228d393eb2a79f3067a68a1b 100644
index 266b52ee18cf3f9cf25cb394780f098c292b9449..23c814d1cecd62121c78702cb0986de3de46df68 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4377,6 +4377,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
@@ -4382,6 +4382,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
observer.DidCreateScriptContext(context, world_id);
}
@ -40,10 +40,10 @@ index 9d36910bf306eb900a4f3668ed62609454a1849b..77d81002500acc34228d393eb2a79f30
int world_id) {
for (auto& observer : observers_)
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index ff1a05ac05d2df7db3ba3579ddf0d2d329d9782c..72806c4947b7187b54c79a1cd05200183e56d4d1 100644
index f3b4f9be415f2ced0adb7aca57b26ea339d0ff3d..5d810d33db7c1d0a3e22da8f5588d0f748534fac 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -605,6 +605,8 @@ class CONTENT_EXPORT RenderFrameImpl
@@ -606,6 +606,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;
@ -53,10 +53,10 @@ index ff1a05ac05d2df7db3ba3579ddf0d2d329d9782c..72806c4947b7187b54c79a1cd0520018
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 246d2ff90ea004102aa2680a60741fb1eedc3d8c..e9358bb7b3808215e27faa58b87045cbd6ab0598 100644
index 082e8ec96fb8f2fea660ea12fd349a248b7422a2..77a7aee67a69fb7728525af3baa45410d866b266 100644
--- a/third_party/blink/public/web/web_local_frame_client.h
+++ b/third_party/blink/public/web/web_local_frame_client.h
@@ -599,6 +599,9 @@ class BLINK_EXPORT WebLocalFrameClient {
@@ -603,6 +603,9 @@ class BLINK_EXPORT WebLocalFrameClient {
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
int32_t world_id) {}
@ -92,7 +92,7 @@ index 2e876bbd8687fd99bdfcc4b7f22d23f4a4c9a0ef..1a3e7c682350670baf6e31bd7ef158e5
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 3e43e9d70eaf2fbfbe7a7fe4e7326cd2b97df565..e94415f3b87e9eb1d6a9142d35928682ddc0064a 100644
index 2508c036483f018572981b5f18080e71e0028363..02ef80ea9cf52c3c99e1008c38ed4151a041e2f5 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(
@ -123,7 +123,7 @@ index fc562006952b92d4aabf67f2db172797ca193035..ca2b370309ca8fcc0afbca77514430e9
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 06f0a9215bd63ae4b2f5df278b656f7b810bf822..7994db250fd41e65d45c1714b03ba554526b1a2d 100644
index 4f34252f45353f2be2222e5878d888ec47e17123..4a670dcf917a1e4448063ef4c241006b66f18891 100644
--- a/third_party/blink/renderer/core/loader/empty_clients.h
+++ b/third_party/blink/renderer/core/loader/empty_clients.h
@@ -402,6 +402,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {

4
patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
View file

@ -72,10 +72,10 @@ index c8655d9270b812df04f27025ff29a2fb6d2a4066..2f83e5ce40f8217ff5d53f7205299ad7
// 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 f40d632e9cacb4c5b722aa9163995e52bcb8546e..f299f1103edfd5f53cfc8bafff1dcb907cbd5437 100644
index c734e277f15c52712a44ce9c4294d3d65e04f0f2..384fb38acccb5368336a1ce826246b5ce0f312a2 100644
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -3889,13 +3889,21 @@ PageScheduler* WebViewImpl::Scheduler() const {
@@ -3891,13 +3891,21 @@ PageScheduler* WebViewImpl::Scheduler() const {
return GetPage()->GetPageScheduler();
}

10
patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
View file

@ -8,7 +8,7 @@ WebPreferences of in-process child windows, rather than relying on
process-level command line switches, as before.
diff --git a/third_party/blink/common/web_preferences/web_preferences.cc b/third_party/blink/common/web_preferences/web_preferences.cc
index 589b70693c0067464564120b776d7edfd32a09f4..0364d5bf3fe9cd4318a4947143f92ab92b1ee688 100644
index 825fe182a24ae373b8e9b73fb18d8def2f36399d..33513a690d3b0d43da5e22ea3423eb7192e0046c 100644
--- a/third_party/blink/common/web_preferences/web_preferences.cc
+++ b/third_party/blink/common/web_preferences/web_preferences.cc
@@ -144,6 +144,19 @@ WebPreferences::WebPreferences()
@ -32,7 +32,7 @@ index 589b70693c0067464564120b776d7edfd32a09f4..0364d5bf3fe9cd4318a4947143f92ab9
accelerated_video_decode_enabled(false),
animation_policy(
diff --git a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
index 797286d9dfafcf70e3430d5a9e59ef4458566fbc..a735740932bf448454d5b066c712bfeb56313292 100644
index 5c9427d0d43a6ba68049fc513e7dd329e54ac079..46ca6167d89efeed74495b4cb23f6f6449080045 100644
--- a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
+++ b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
@@ -152,6 +152,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
@ -56,7 +56,7 @@ index 797286d9dfafcf70e3430d5a9e59ef4458566fbc..a735740932bf448454d5b066c712bfeb
out->accelerated_video_decode_enabled =
data.accelerated_video_decode_enabled();
diff --git a/third_party/blink/public/common/web_preferences/web_preferences.h b/third_party/blink/public/common/web_preferences/web_preferences.h
index 4d80bf0895028d50a9913543072d848a3537049e..5d940fb52e9ddeb557519c0e2d5098db83d2b449 100644
index 642644dbf46a43d9ceebf29f253d8e6d943f3c75..fc1525c21dc3401e88e7398867745a00c59320d6 100644
--- a/third_party/blink/public/common/web_preferences/web_preferences.h
+++ b/third_party/blink/public/common/web_preferences/web_preferences.h
@@ -10,6 +10,7 @@
@ -88,7 +88,7 @@ index 4d80bf0895028d50a9913543072d848a3537049e..5d940fb52e9ddeb557519c0e2d5098db
// This flags corresponds to a Page's Settings' setCookieEnabled state. It
// only controls whether or not the "document.cookie" field is properly
diff --git a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
index 3f36eb927cb4860cd4939251fec1cf922978bc71..7b3dee1baa6abfca1f34695adff187b4f2a24dfb 100644
index dc2eac781dd659106a156d779bd4976a44b0d77b..97491962403863f6360d42026bdc14efbebe66b4 100644
--- a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
+++ b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
@@ -6,6 +6,7 @@
@ -153,7 +153,7 @@ index 3f36eb927cb4860cd4939251fec1cf922978bc71..7b3dee1baa6abfca1f34695adff187b4
return r.cookie_enabled;
}
diff --git a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
index e82d36c0d1c06695503fd58ce8d67027f872f536..110b010669433fcf2a6e103839fc0405db7161df 100644
index 2ed34c3dcea95b90a8be1639c03029bd287926aa..dd0c537b72d52f8567b1af6eb72e6dc5686dad6e 100644
--- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
+++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
@@ -9,6 +9,7 @@ import "third_party/blink/public/mojom/css/preferred_contrast.mojom";

6
patches/chromium/blink_local_frame.patch
View file

@ -15,10 +15,10 @@ Refs changes in:
This patch reverts the changes to fix associated crashes in Electron.
diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc
index 22bf66cc28e084f062a0f90b547cd76ae3221ae4..2397739954dcbd60074cd173741db6971719ae30 100644
index d6927a76fac48bf1e1ee4f9bc626a72551934906..9de6eb2b13f7a3dd272c4c747535026ed03c047e 100644
--- a/third_party/blink/renderer/core/frame/frame.cc
+++ b/third_party/blink/renderer/core/frame/frame.cc
@@ -124,14 +124,6 @@ bool Frame::Detach(FrameDetachType type) {
@@ -125,14 +125,6 @@ bool Frame::Detach(FrameDetachType type) {
DCHECK(!IsDetached());
@ -33,7 +33,7 @@ index 22bf66cc28e084f062a0f90b547cd76ae3221ae4..2397739954dcbd60074cd173741db697
if (type == FrameDetachType::kRemove) {
if (provisional_frame_) {
provisional_frame_->Detach(FrameDetachType::kRemove);
@@ -155,6 +147,14 @@ bool Frame::Detach(FrameDetachType type) {
@@ -156,6 +148,14 @@ bool Frame::Detach(FrameDetachType type) {
GetWindowProxyManager()->ClearForSwap();
}

2
patches/chromium/build_add_electron_tracing_category.patch
View file

@ -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 0a1d3f0b1912873cb14873aa78269c57080a4b67..8f94caabf26a0c0be606d419eacc228e14ad20b3 100644
index 7146ce14ee1a235b134ed4c7b16fb2a37f63a865..bf4dbc1813944135d67700fd6e744dfc80dd777d 100644
--- a/base/trace_event/builtin_categories.h
+++ b/base/trace_event/builtin_categories.h
@@ -80,6 +80,7 @@

16
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
View file

@ -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 219f004962f0fbbe1548d8bab19c964bcc554e9b..088b7cd6578593d0ace8683765ce77202cbf1313 100644
index 259f352a7478f5a5ab9222b58c6089ea907c9495..5b99175d1c02f356b6566f69e08b62ebf34ee35a 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -186,11 +186,16 @@ if (!is_android && !is_mac) {
@ -33,10 +33,10 @@ index 219f004962f0fbbe1548d8bab19c964bcc554e9b..088b7cd6578593d0ace8683765ce7720
"//base",
"//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index c88ed72dc5f9c7dca220dd3fa630cd722d7f5f10..51ab002d7bb1c335ae115b9477914f0fd7156c2f 100644
index 23fb26e3d3a490840a902eeacbf0f6399d57a606..3a171224b6b39300aada31cb530bbc2a4503609f 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4581,7 +4581,7 @@ static_library("browser") {
@@ -4584,7 +4584,7 @@ static_library("browser") {
# On Windows, the hashes are embedded in //chrome:chrome_initial rather
# than here in :chrome_dll.
@ -46,10 +46,10 @@ index c88ed72dc5f9c7dca220dd3fa630cd722d7f5f10..51ab002d7bb1c335ae115b9477914f0f
sources += [ "certificate_viewer_stub.cc" ]
}
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index de01d238eee9cccf8f5655d0f3f3ab7fcd90ca59..dae4137d8930d0fda68fdc69ae08320de7006e78 100644
index 431ae4fdd73850a5c193bfd9d7d43b7cc0249091..fdcac26778eb066b4ed267739369c6efc78fcbcd 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -6364,7 +6364,6 @@ test("unit_tests") {
@@ -6381,7 +6381,6 @@ test("unit_tests") {
deps += [
"//chrome:other_version",
@ -57,7 +57,7 @@ index de01d238eee9cccf8f5655d0f3f3ab7fcd90ca59..dae4137d8930d0fda68fdc69ae08320d
"//chrome//services/util_win:unit_tests",
"//chrome/app:chrome_dll_resources",
"//chrome/app:win_unit_tests",
@@ -6390,6 +6389,10 @@ test("unit_tests") {
@@ -6407,6 +6406,10 @@ test("unit_tests") {
"//ui/resources",
]
@ -68,7 +68,7 @@ index de01d238eee9cccf8f5655d0f3f3ab7fcd90ca59..dae4137d8930d0fda68fdc69ae08320d
ldflags = [
"/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
"/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
@@ -7305,7 +7308,6 @@ test("unit_tests") {
@@ -7324,7 +7327,6 @@ test("unit_tests") {
}
deps += [
@ -76,7 +76,7 @@ index de01d238eee9cccf8f5655d0f3f3ab7fcd90ca59..dae4137d8930d0fda68fdc69ae08320d
"//chrome/browser/apps:icon_standardizer",
"//chrome/browser/apps/app_service",
"//chrome/browser/apps/app_service:test_support",
@@ -7381,6 +7383,10 @@ test("unit_tests") {
@@ -7400,6 +7402,10 @@ test("unit_tests") {
"//ui/webui/resources/js/browser_command:mojo_bindings",
]

32
patches/chromium/build_only_use_the_mas_build_config_in_the_required_components.patch
View file

@ -6,10 +6,10 @@ Subject: build: only use the mas build config in the required components
Before landing this patch should be split into the relevant MAS patches, or at least the patch this one partially reverts
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 05565026676962f651992c0e09c7575073c412c9..b0c177dfc0c4b64027af1fe08096af2eccc93e31 100644
index 186946dce785b65f08133f8ab89f564952129cfb..9b4ff1c59dffeb637db5f76831f3d9b0f2e3048f 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1027,6 +1027,7 @@ component("base") {
@@ -1026,6 +1026,7 @@ component("base") {
"//build/config/compiler:prevent_unsafe_narrowing",
"//build/config/compiler:wexit_time_destructors",
"//build/config/compiler:wglobal_constructors",
@ -29,11 +29,11 @@ index 68d467f75faa3fddd385632b536373bd9167d881..7699ea2310308b1b42e12bf26a6a0ed2
]
if (is_win) {
diff --git a/components/os_crypt/BUILD.gn b/components/os_crypt/BUILD.gn
index 8448ff2d912ed8664ba1117397a2407c08e9a578..5f6bb1a87615c474e06209fc8034ff36ee6a5b75 100644
--- a/components/os_crypt/BUILD.gn
+++ b/components/os_crypt/BUILD.gn
@@ -65,6 +65,8 @@ component("os_crypt") {
diff --git a/components/os_crypt/sync/BUILD.gn b/components/os_crypt/sync/BUILD.gn
index 3314c2a5cdcef04d7f1a8bf0e07cafa073f2815e..ef75cef4e449bb5c689f95ab664c19a1c2362b16 100644
--- a/components/os_crypt/sync/BUILD.gn
+++ b/components/os_crypt/sync/BUILD.gn
@@ -70,6 +70,8 @@ component("os_crypt") {
"keychain_password_mac.mm",
"os_crypt_mac.mm",
]
@ -76,7 +76,7 @@ index 17b6cfd529e971cfe6683531d14daa121f531bb1..5ba0aacf84177274935bfdd22e26a299
if (is_win) {
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index aec1fddcdb0e5e4e4b6fa0927cb6ebba05430382..7893009b83c34a87809784beb23db75052f921e5 100644
index 4cabad83bd9de68424abb7961d45cf096e5afcb1..d151178d33b7dcf0ed1807f47db87a3983506ba0 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -56,6 +56,7 @@ source_set("browser") {
@ -88,10 +88,10 @@ index aec1fddcdb0e5e4e4b6fa0927cb6ebba05430382..7893009b83c34a87809784beb23db750
libs = []
frameworks = []
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index 9b4c78c06f49ade480d956025e68cb7efac336db..0bf304daf0ea68ba7b086a92dd0e95ab8f377bbd 100644
index 64fe01344b7c0b5c9e19d45f291804380f698d90..4c8a7b799d1531c8d6fb8db260463f90d3551453 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -170,6 +170,7 @@ source_set("common") {
@@ -168,6 +168,7 @@ source_set("common") {
"//content:content_implementation",
"//build/config:precompiled_headers",
]
@ -112,10 +112,10 @@ index 3ec54c242fb920a53fcaa6d8040f2ec88c2727df..27dee1596183d2ead5290a60c08e47e6
public_deps = [
diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn
index 2faf5de6feb42ae444f7a334b10327899f345fdb..a9dc5c19f90bfeede23f596d41e31613f28ffb7b 100644
index 5e9f447e4d946cd48d7b18d81c256baa169f93ea..fcfda1b4fde66c39b53a52d57c5e57b7f239bda1 100644
--- a/device/bluetooth/BUILD.gn
+++ b/device/bluetooth/BUILD.gn
@@ -237,6 +237,7 @@ component("bluetooth") {
@@ -240,6 +240,7 @@ component("bluetooth") {
"IOKit.framework",
"Foundation.framework",
]
@ -201,10 +201,10 @@ index f61e0ad85e7e7faf97274bad4b59fc91c41e3168..c308bcb30f57e7b0c9ae58420bedd343
public_deps = [
":core_generated",
diff --git a/ui/accelerated_widget_mac/BUILD.gn b/ui/accelerated_widget_mac/BUILD.gn
index 161a304180a4a580efa7e8a8bb634a84594b857a..fd7e4f714655f8679e4e6dc2d87cff2c7090afdb 100644
index 7637db0ce03b9e8d242e47f5aff85c21967a541f..e66fdb98adb035a917942432806e0dfaff19e471 100644
--- a/ui/accelerated_widget_mac/BUILD.gn
+++ b/ui/accelerated_widget_mac/BUILD.gn
@@ -30,6 +30,8 @@ component("accelerated_widget_mac") {
@@ -32,6 +32,8 @@ component("accelerated_widget_mac") {
"QuartzCore.framework",
]
@ -226,10 +226,10 @@ index ebc2470893838ec41ac1bf536c5a6db304bfa7cb..4a2082c2fed4e220cb8cbc2c803f682c
if (use_atk) {
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 6c0b1ce058f59ed769e291291fd099f36c94347c..6628f661024a5c56aa207eab447311f279e50008 100644
index 90074c3e90d9b4bbfaf2c86f8c1a5a3c36babdc8..991bc348a5fb5c2e9a744b14ed5894fe3155f4c0 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -347,6 +347,7 @@ component("base") {
@@ -345,6 +345,7 @@ component("base") {
"l10n/l10n_util_mac.mm",
"resource/resource_bundle_mac.mm",
]

20
patches/chromium/can_create_window.patch
View file

@ -9,10 +9,10 @@ potentially prevent a window from being created.
TODO(loc): this patch is currently broken.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 33119c93000f739be6c3539ce39e8f763f051262..bc41363dcc0809a839ab33bd49b856ca3f7e8fbe 100644
index f46871f9237917f17295e134bce1082ce2084e27..ecdc9ce92365c49c94267cfb85b4b56868b70376 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -7615,6 +7615,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -7628,6 +7628,7 @@ void RenderFrameHostImpl::CreateNewWindow(
last_committed_origin_, params->window_container_type,
params->target_url, params->referrer.To<Referrer>(),
params->frame_name, params->disposition, *params->features,
@ -21,10 +21,10 @@ index 33119c93000f739be6c3539ce39e8f763f051262..bc41363dcc0809a839ab33bd49b856ca
&no_javascript_access);
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index a606f4b2d9ae916147ece16b05d16a2a4bd3d5c6..84f08460ff6b99a40e0591730d4bfadfdf896edf 100644
index 8cd33cbc8b38368fbf64c3ed74d7b37d88c44abf..e410f83816f6579dd07062b5037bf04407bda711 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4127,6 +4127,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4123,6 +4123,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
auto* new_contents_impl = new_contents.get();
@ -37,7 +37,7 @@ index a606f4b2d9ae916147ece16b05d16a2a4bd3d5c6..84f08460ff6b99a40e0591730d4bfadf
// If the new frame has a name, make sure any SiteInstances that can find
// this named frame have proxies for it. Must be called after
// SetSessionStorageNamespace, since this calls CreateRenderView, which uses
@@ -4168,12 +4174,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4164,12 +4170,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
AddWebContentsDestructionObserver(new_contents_impl);
}
@ -66,7 +66,7 @@ index 4fbba74078390c0c530294d65fd0ce74c3eec65a..6f9a676c10ff009fa3d27f2ab33c4c12
// Operation result when the renderer asks the browser to create a new window.
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 42a1094883b5b385f2fa374d71f561e1ab48ea6d..7310bae78f55712731d5f788a77208453758f9f8 100644
index e996294b57d6441d95ca290675265a4d155a4c78..3e7e5219da2e428b60642417235eb53d2209d4c2 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -634,6 +634,8 @@ bool ContentBrowserClient::CanCreateWindow(
@ -79,7 +79,7 @@ index 42a1094883b5b385f2fa374d71f561e1ab48ea6d..7310bae78f55712731d5f788a7720845
bool opener_suppressed,
bool* no_javascript_access) {
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 986dc23537b9abc3b95eff18bfb32f02bd1f5def..621903d03500f3a4c6bb123c7c183f790b804c2c 100644
index 1acdf47d744a512b0452c91aa7cf4a1e4af949f6..dd52f45aa0d2931b67e707082f6afd493c1201bb 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -164,6 +164,7 @@ class NetworkService;
@ -148,10 +148,10 @@ index 5da6f93293bc5ddae88c17ac2dd8d7037ba8e8f3..76d699790fb7d92587293b14332f696d
// typically happens when popups are created.
virtual void WebContentsCreated(WebContents* source_contents,
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index ab6c963b099954baf95c6c895a13ff7c3e62c7d4..9d36910bf306eb900a4f3668ed62609454a1849b 100644
index 0492b7641facac05b9fc37a5f5a766ab7b658498..266b52ee18cf3f9cf25cb394780f098c292b9449 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -6263,6 +6263,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
@@ -6268,6 +6268,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
blink::GetNavigationInitiatorActivationAndAdStatus(
request.HasUserGesture(), GetWebFrame()->IsAdScriptInStack());
@ -210,7 +210,7 @@ index a50a83d36f9172add44867ee0b0f1c89779b387e..c4ac7d4c885e764cfcfc3f2cd25e31b4
} // namespace blink
diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
index fee3b48e5a7d90157578c9c39c1f5a9fff6ee222..b400dd33d9b932b0b4e36371de76f69da18bd9f6 100644
index 8e675fcf1227af5123fd7a62a1eadd341aa5a9ec..4c023dbb0e659f027498e1c72fcf1dbe8b2de752 100644
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
@@ -2211,6 +2211,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,

24
patches/chromium/chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch
View file

@ -7,11 +7,11 @@ With WCO, allow chromium to handle synthetic mouse events generated for touch
actions in the non-client caption area.
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
index e534b895eca4e28e003ef35de4a2fb5b32baf88b..756738951476ba1d509935d0eb152c978cfde7e6 100644
index b2e8e4127d73d1c8f0f3698fe9c7f37a03868c06..79e00fd9f83dc6cb4114ceac53ea025dcb7595b7 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -1204,6 +1204,10 @@ void DesktopWindowTreeHostWin::HandleWindowScaleFactorChanged(
}
@@ -1209,6 +1209,10 @@ void DesktopWindowTreeHostWin::HandleHeadlessWindowBoundsChanged(
window()->SetProperty(aura::client::kHeadlessBoundsKey, bounds);
}
+bool DesktopWindowTreeHostWin::HandleMouseEventForCaption(UINT message) const {
@ -22,22 +22,22 @@ index e534b895eca4e28e003ef35de4a2fb5b32baf88b..756738951476ba1d509935d0eb152c97
DesktopWindowTreeHostWin::GetSingletonDesktopNativeCursorManager() {
return new DesktopNativeCursorManagerWin();
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
index b23ba1bf3a49f72d1cd0f0ae4b0f316e7c15fa76..bf0a4869af4aaca15074fae42508b54aef611cf6 100644
index 2b935ac09209c1b043aa416f886a84dff742826e..04b586a7fd15bc2e85cb62cd6cefe63461a2539e 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
@@ -258,6 +258,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
void HandleWindowSizeChanging() override;
@@ -259,6 +259,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
void HandleWindowSizeUnchanged() override;
void HandleWindowScaleFactorChanged(float window_scale_factor) override;
void HandleHeadlessWindowBoundsChanged(const gfx::Rect& bounds) override;
+ bool HandleMouseEventForCaption(UINT message) const override;
Widget* GetWidget();
const Widget* GetWidget() const;
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index 0eef92569684a223c3e3f953ec77dc602a5abe4c..60a334e37e8f00be1e06fbc996b1367d88e073f2 100644
index 66444599384981681a3018b5de516e2242324285..c55e27bfc275ff63282f8d703dcdf723b5b2385d 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -3212,15 +3212,19 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
@@ -3209,15 +3209,19 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
SetMsgHandled(FALSE);
// We must let Windows handle the caption buttons if it's drawing them, or
// they won't work.
@ -60,12 +60,12 @@ index 0eef92569684a223c3e3f953ec77dc602a5abe4c..60a334e37e8f00be1e06fbc996b1367d
}
diff --git a/ui/views/win/hwnd_message_handler_delegate.h b/ui/views/win/hwnd_message_handler_delegate.h
index da6afe2ae8940faebe3fbacfd7780fa0d5b1591a..4263d68e8b01eb961ab0e38d6b64b0c0b24146eb 100644
index fde18715e33ee67f64740ebda7c641954360483c..cf1ea75f8e9dd1d95045736959c4f3ca1a27a1ab 100644
--- a/ui/views/win/hwnd_message_handler_delegate.h
+++ b/ui/views/win/hwnd_message_handler_delegate.h
@@ -251,6 +251,10 @@ class VIEWS_EXPORT HWNDMessageHandlerDelegate {
// Called when the window scale factor has changed.
virtual void HandleWindowScaleFactorChanged(float window_scale_factor) = 0;
@@ -255,6 +255,10 @@ class VIEWS_EXPORT HWNDMessageHandlerDelegate {
// Called when the headless window bounds has changed.
virtual void HandleHeadlessWindowBoundsChanged(const gfx::Rect& bounds) = 0;
+ // Called when synthetic mouse event is generated for touch event on
+ // caption buttons.

6
patches/chromium/chore_introduce_blocking_api_for_electron.patch
View file

@ -7,7 +7,7 @@ This patch comes after Chromium removed the ScopedAllowIO API in favor
of explicitly adding ScopedAllowBlocking calls as friends.
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
index 8b6b194a86ce78a3935c74c20a8305345b58bb8e..3f0391f2a1e3467735ab33f63a30eeddedfdb0e4 100644
index 861c5f9da0506d8180d4e2a2af9c0c59a3f18bac..20d07b453ec28eb43736776f6cb6a6e20ded2885 100644
--- a/base/threading/thread_restrictions.h
+++ b/base/threading/thread_restrictions.h
@@ -133,6 +133,7 @@ class FirefoxProfileLock;
@ -28,7 +28,7 @@ index 8b6b194a86ce78a3935c74c20a8305345b58bb8e..3f0391f2a1e3467735ab33f63a30eedd
namespace enterprise_connectors {
class LinuxKeyRotationCommand;
} // namespace enterprise_connectors
@@ -573,6 +577,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBlocking {
@@ -574,6 +578,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBlocking {
friend class ::DesktopNotificationBalloon;
friend class ::FirefoxProfileLock;
friend class ::GaiaConfig;
@ -36,7 +36,7 @@ index 8b6b194a86ce78a3935c74c20a8305345b58bb8e..3f0391f2a1e3467735ab33f63a30eedd
friend class ::ProfileImpl;
friend class ::ScopedAllowBlockingForProfile;
friend class ::StartupTabProviderImpl;
@@ -610,6 +615,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBlocking {
@@ -611,6 +616,7 @@ class BASE_EXPORT [[maybe_unused, nodiscard]] ScopedAllowBlocking {
friend class crosapi::LacrosThreadTypeDelegate;
friend class crypto::ScopedAllowBlockingForNSS; // http://crbug.com/59847
friend class drive::FakeDriveService;

10
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
View file

@ -80,7 +80,7 @@ index aaaa61d5c3a1d5ade2fd355e38a3985ef5cc4e7d..b45746ba0f38a381a2ee5ca17f3a1685
}
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 8e86697ca27eca507e5a95acbc3d68656532e59a..a11b0dbd0962e67cc5e90a6b7fefc86974ec5a1e 100644
index 7d3cc3f8467eb1478979e078c8ca74c332f50066..1520da223f6c835ec522993e56ab06bfc02ac1e6 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1835,12 +1835,11 @@ bool Browser::IsWebContentsCreationOverridden(
@ -218,10 +218,10 @@ index 4e32d708ecf4afd3913d86ec1602ef2dc9a60998..1dd2f50fba1387b5eeb554dd540957d7
void AddNewContents(content::WebContents* source,
std::unique_ptr<content::WebContents> new_contents,
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index cd4f7e96d87908a3b3c3a83e4bd246b3e80603aa..d0d01e4d927efa0880cff4ee43dbb8c1371f03e6 100644
index f2dd1ecf9440030463669c515685d56c6a3b5c2d..220cb9a72e913e97830c58704441fdc55e2af560 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4030,8 +4030,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4026,8 +4026,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
if (delegate_ && delegate_->IsWebContentsCreationOverridden(
source_site_instance, params.window_container_type,
@ -316,10 +316,10 @@ index 2ade4d0b28ba4c7179886c740952e963f828888e..b5e70e7e52df862a64baa8e3ca7e5902
content::RenderFrameHost* opener,
content::SiteInstance* source_site_instance,
diff --git a/fuchsia_web/webengine/browser/frame_impl.cc b/fuchsia_web/webengine/browser/frame_impl.cc
index 6b90e0714ac2e2ad7b08ba12728c804b70fc97c2..2bc077fd8fcca08b5956b6268397d656cab24b6b 100644
index 87348466587ed5f21cd3d89da13f5c8599fbeb2f..116199ab85aa8ccd2717a689b5ce9f3038253091 100644
--- a/fuchsia_web/webengine/browser/frame_impl.cc
+++ b/fuchsia_web/webengine/browser/frame_impl.cc
@@ -562,8 +562,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
@@ -565,8 +565,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,

14
patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch
View file

@ -7,7 +7,7 @@ By default, chromium sets up one v8 snapshot to be used in all v8 contexts. This
to have a dedicated browser process v8 snapshot defined by the file `browser_v8_context_snapshot.bin`.
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
index 1422099cf38dc762257e0b67a0c0d3f61b38c99f..af6023c95d284a5fc3ba6c66c8b5b58de47b8e79 100644
index 6a72d0a8f731b5dbc4468ba302bb76a18b4dff92..3550cd5711b98283ed87aa8399b7f38560ee0052 100644
--- a/content/app/content_main_runner_impl.cc
+++ b/content/app/content_main_runner_impl.cc
@@ -39,6 +39,7 @@
@ -18,7 +18,7 @@ index 1422099cf38dc762257e0b67a0c0d3f61b38c99f..af6023c95d284a5fc3ba6c66c8b5b58d
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/task/single_thread_task_runner.h"
@@ -256,8 +257,13 @@ std::string GetSnapshotDataDescriptor(const base::CommandLine& command_line) {
@@ -253,8 +254,13 @@ std::string GetSnapshotDataDescriptor(const base::CommandLine& command_line) {
#endif
@ -33,7 +33,7 @@ index 1422099cf38dc762257e0b67a0c0d3f61b38c99f..af6023c95d284a5fc3ba6c66c8b5b58d
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
base::FileDescriptorStore& file_descriptor_store =
base::FileDescriptorStore::GetInstance();
@@ -286,11 +292,12 @@ bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
@@ -283,11 +289,12 @@ bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
#endif // V8_USE_EXTERNAL_STARTUP_DATA
@ -48,7 +48,7 @@ index 1422099cf38dc762257e0b67a0c0d3f61b38c99f..af6023c95d284a5fc3ba6c66c8b5b58d
#endif // V8_USE_EXTERNAL_STARTUP_DATA
}
@@ -1000,7 +1007,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParams params) {
@@ -962,7 +969,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParams params) {
return TerminateForFatalInitializationError();
#endif // BUILDFLAG(IS_ANDROID) && (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE)
@ -102,10 +102,10 @@ index d4bb0e9a017a833b403916e1d6e64fb058f40f86..35ba35a95e39700824d6e0b480b99bc3
friend class ContentClientCreator;
friend class ContentClientInitializer;
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
index a7fa30946131687b046c701d1fe49293f1e837f7..4e7f681fb0ee15ec50328e345975195b0e9c6ba1 100644
index 7f114d1897e7000799aa4da0bda4ac082311b03a..1b7d9c8ede6d74cb6f91020f606307d84f26364f 100644
--- a/gin/v8_initializer.cc
+++ b/gin/v8_initializer.cc
@@ -494,8 +494,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out,
@@ -497,8 +497,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out,
#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
@ -115,7 +115,7 @@ index a7fa30946131687b046c701d1fe49293f1e837f7..4e7f681fb0ee15ec50328e345975195b
if (g_mapped_snapshot) {
// TODO(crbug.com/802962): Confirm not loading different type of snapshot
// files in a process.
@@ -504,10 +503,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) {
@@ -507,10 +506,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) {
base::MemoryMappedFile::Region file_region;
base::File file =

4
patches/chromium/disable_color_correct_rendering.patch
View file

@ -93,10 +93,10 @@ index 0fe4c9933ed471037bdf34a954f0b7739707ca05..b64e873823dec1a01ce255fbeb5a72fa
sandbox::policy::switches::kGpuSandboxAllowSysVShm,
sandbox::policy::switches::kGpuSandboxFailuresFatal,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index c1b51f51354954a4020110897d90e80b09a6b79b..378980e6c70d19fc424055ce261528d56e723a2b 100644
index 9dfe0c331f97b11f285179881cd8c7820b4b61a5..7d0417c08cfabc466d6586ad382135f2a3feff0b 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -3321,6 +3321,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
@@ -3317,6 +3317,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
// Propagate the following switches to the renderer command line (along
// with any associated values) if present in the browser command line.
static const char* const kSwitchNames[] = {

2
patches/chromium/disable_hidden.patch
View file

@ -33,7 +33,7 @@ index 5b2482ee77ef33dde9cc659f44a651721858edab..fd4559b531a796b6349d7db66c5e8861
protected:
// |routing_id| must not be MSG_ROUTING_NONE.
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index abf1c83d6d452be8ed5e6d79a9e5d80dc31c54a2..20f517c14b58e3c88b4aa9736096a7f79edbfdf5 100644
index 7098e7e553bcd73ed5cebd8cf46efc4261ceb5a0..4e96b2b03835ce147d841c5358b77e1135927cb0 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -605,7 +605,7 @@ void RenderWidgetHostViewAura::HideImpl() {

6
patches/chromium/enable_reset_aspect_ratio.patch
View file

@ -6,7 +6,7 @@ Subject: feat: enable setting aspect ratio to 0
Make SetAspectRatio accept 0 as valid input, which would reset to null.
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
index 0be1688818063dac2242428393babcca1d03e836..e534b895eca4e28e003ef35de4a2fb5b32baf88b 100644
index d52fc15106eb3a834f1008846df6cb954db17250..b2e8e4127d73d1c8f0f3698fe9c7f37a03868c06 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -564,7 +564,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
@ -19,10 +19,10 @@ index 0be1688818063dac2242428393babcca1d03e836..e534b895eca4e28e003ef35de4a2fb5b
aspect_ratio.height());
}
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index 70a3b6d10faeb1f2b85e8671cc0161b7b7932cf4..6415774708ee5ae8211b71379a41f57764b89f05 100644
index 5de1045439dca219331968dcac3c721907e20c35..8edbbbea1afcae8a32d18d23afa706224bf58b14 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -1126,8 +1126,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen,
@@ -1123,8 +1123,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen,
}
void HWNDMessageHandler::SetAspectRatio(float aspect_ratio) {

12
patches/chromium/expose_setuseragent_on_networkcontext.patch
View file

@ -33,10 +33,10 @@ index 0ab8187b0db8ae6db46d81738f653a2bc4c566f6..de3d55e85c22317f7f9375eb94d0d5d4
} // namespace net
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index 1e6300466078bbe1ad02922d87e173d062cf1f79..e007b1ea550aa73fc0f04dc3dc4695574b70d3e0 100644
index 53348f7a19ef39eb0a6fbdfbfcc7e280125f45f3..d67ac2c33eb94484827f96cc373d90a8633cf988 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -1395,6 +1395,13 @@ void NetworkContext::SetNetworkConditions(
@@ -1410,6 +1410,13 @@ void NetworkContext::SetNetworkConditions(
std::move(network_conditions));
}
@ -51,10 +51,10 @@ index 1e6300466078bbe1ad02922d87e173d062cf1f79..e007b1ea550aa73fc0f04dc3dc469557
// This may only be called on NetworkContexts created with the constructor
// that calls MakeURLRequestContext().
diff --git a/services/network/network_context.h b/services/network/network_context.h
index 5aaa11be3d8ead3626bf49f7efcfe04ddbfa6933..c2e01df9ee72483121c307ca3a83d5307aa3eaa8 100644
index ce1162a98b9fa50e775d4f2539d6f38389d49bdd..515ea31e8d19b55cf81b15e2ba41c22686a16df5 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -310,6 +310,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@@ -313,6 +313,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
void CloseIdleConnections(CloseIdleConnectionsCallback callback) override;
void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
mojom::NetworkConditionsPtr conditions) override;
@ -63,7 +63,7 @@ index 5aaa11be3d8ead3626bf49f7efcfe04ddbfa6933..c2e01df9ee72483121c307ca3a83d530
void SetEnableReferrers(bool enable_referrers) override;
void SetEnablePreconnect(bool enable_preconnect) override;
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index 71a39f2c31099ac4869690d4fe81ce9b83d49893..ccb72ac227aa621dd56d8f008d7dce2e00b0e60e 100644
index ee9771be4f6ed4bc30bc812eaf4f7b23643a4548..ce08b0912e4f314387727c830b93b07d4b7a2f06 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -1102,6 +1102,9 @@ interface NetworkContext {
@ -77,7 +77,7 @@ index 71a39f2c31099ac4869690d4fe81ce9b83d49893..ccb72ac227aa621dd56d8f008d7dce2e
SetAcceptLanguage(string new_accept_language);
diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
index 8719a8bd10960671561a316103a5d8e8fb9a98a9..43b6df49d94073861ce2aceaa538bef15f95985c 100644
index 05071b3ab170d8c8d54e9dd1d3859ff3244a3310..fda0926db3b8266d74ab5fb2a8ac553c75ea3100 100644
--- a/services/network/test/test_network_context.h
+++ b/services/network/test/test_network_context.h
@@ -139,6 +139,7 @@ class TestNetworkContext : public mojom::NetworkContext {

4
patches/chromium/extend_apply_webpreferences.patch
View file

@ -12,7 +12,7 @@ Ideally we could add an embedder observer pattern here but that can be
done in future work.
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 f299f1103edfd5f53cfc8bafff1dcb907cbd5437..763c09fa845e0764096db4c075bf4f809e3cca14 100644
index 384fb38acccb5368336a1ce826246b5ce0f312a2..9f044206c9640768434c6d33b30d70b3d92f4343 100644
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -165,6 +165,7 @@
@ -23,7 +23,7 @@ index f299f1103edfd5f53cfc8bafff1dcb907cbd5437..763c09fa845e0764096db4c075bf4f80
#include "third_party/blink/renderer/platform/graphics/image.h"
#include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
#include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
@@ -1818,6 +1819,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
@@ -1820,6 +1821,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
#if BUILDFLAG(IS_MAC)
web_view_impl->SetMaximumLegibleScale(
prefs.default_maximum_page_scale_factor);

4
patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
View file

@ -26,7 +26,7 @@ index 835fa36e64e2cb350f3f09798b0040b234f7c0ee..f9a754acab125bc50660e9c3763b3693
}
diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h
index a97bf39a8b481ce5d6c87a22054451f5fd470b75..4748ef033d939173b4dbe6f6cb83eb3b9ebcd970 100644
index 535e60b3efeb02ca9789e84460fde31e969b4043..5d9f3fa03f88c820cc3573c2d27f9b4f21ccc4a8 100644
--- a/ui/native_theme/native_theme.h
+++ b/ui/native_theme/native_theme.h
@@ -407,6 +407,23 @@ class NATIVE_THEME_EXPORT NativeTheme {
@ -53,7 +53,7 @@ index a97bf39a8b481ce5d6c87a22054451f5fd470b75..4748ef033d939173b4dbe6f6cb83eb3b
// Returns a shared instance of the native theme that should be used for web
// rendering. Do not use it in a normal application context (i.e. browser).
// The returned object should not be deleted by the caller. This function is
@@ -588,6 +605,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
@@ -589,6 +606,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
PageColors page_colors_ = PageColors::kOff;
PreferredColorScheme preferred_color_scheme_ = PreferredColorScheme::kLight;
PreferredContrast preferred_contrast_ = PreferredContrast::kNoPreference;

2
patches/chromium/feat_configure_launch_options_for_service_process.patch
View file

@ -183,7 +183,7 @@ index 4d4c17b8fe687e01f7403335c88453998259d647..22c1e5fd0c6f16a101b2578675704f18
host->GetChildProcess()->BindServiceInterface(std::move(receiver));
}
diff --git a/content/browser/utility_process_host.cc b/content/browser/utility_process_host.cc
index fe0b5134ea3d7887aa237200e89e79c2ff68314c..c544d1ef0eb381da7f96013643c862f60984a9c9 100644
index 17653e54563ac243ca18a85b3f38a7d6c24adf38..40eed26c8311352f71532919a28525936733bfb8 100644
--- a/content/browser/utility_process_host.cc
+++ b/content/browser/utility_process_host.cc
@@ -106,11 +106,13 @@ const ChildProcessData& UtilityProcessHost::GetData() {

8
patches/chromium/feat_ensure_mas_builds_of_the_same_application_can_use_safestorage.patch
View file

@ -11,10 +11,10 @@ We attempt to migrate the safe storage key from the old account, if that migrati
Existing apps that aren't built for the app store should be unimpacted, there is one edge case where a user uses BOTH an AppStore and a darwin build of the same app only one will keep it's access to the safestorage key as during the migration we delete the old account. This is an acceptable edge case as no one should be actively using two versions of the same app.
diff --git a/components/os_crypt/keychain_password_mac.mm b/components/os_crypt/keychain_password_mac.mm
index 214ae79b9a6de27b99ccfa9cf03327449fd79198..fc8e8485706a8725f88e8a37c8d26ca29ec492e8 100644
--- a/components/os_crypt/keychain_password_mac.mm
+++ b/components/os_crypt/keychain_password_mac.mm
diff --git a/components/os_crypt/sync/keychain_password_mac.mm b/components/os_crypt/sync/keychain_password_mac.mm
index 1895fc822281ccc9e36500e755f028fb2f877060..8d02e232dcb53e3d753b64c8548a5b98d2bb571f 100644
--- a/components/os_crypt/sync/keychain_password_mac.mm
+++ b/components/os_crypt/sync/keychain_password_mac.mm
@@ -22,6 +22,12 @@
using KeychainNameContainerType = const base::NoDestructor<std::string>;
#endif

10
patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
View file

@ -112,10 +112,10 @@ index 48d273dd5db3b9db89fc543b04d47d1da9ccfede..0b95993bc7e5b8bd675e295f8d4acd2a
string mime_type;
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
index fbce18484c05c27f0fbd248251e667ec42a1c338..6b0569f81e99cec72b1febbdaf011d85246657a4 100644
index 1320507f190cba1172469f985d2844240555850d..0bfde16e65668cc28dd0d0a6279b114552e91b43 100644
--- a/services/network/url_loader.cc
+++ b/services/network/url_loader.cc
@@ -641,6 +641,7 @@ URLLoader::URLLoader(
@@ -642,6 +642,7 @@ URLLoader::URLLoader(
has_user_activation_ = request.trusted_params->has_user_activation;
allow_cookies_from_browser_ =
request.trusted_params->allow_cookies_from_browser;
@ -123,7 +123,7 @@ index fbce18484c05c27f0fbd248251e667ec42a1c338..6b0569f81e99cec72b1febbdaf011d85
}
throttling_token_ = network::ScopedThrottlingToken::MaybeCreate(
@@ -707,7 +708,7 @@ URLLoader::URLLoader(
@@ -708,7 +709,7 @@ URLLoader::URLLoader(
url_request_->SetRequestHeadersCallback(base::BindRepeating(
&URLLoader::SetRawRequestHeadersAndNotify, base::Unretained(this)));
@ -132,7 +132,7 @@ index fbce18484c05c27f0fbd248251e667ec42a1c338..6b0569f81e99cec72b1febbdaf011d85
url_request_->SetResponseHeadersCallback(base::BindRepeating(
&URLLoader::SetRawResponseHeaders, base::Unretained(this)));
}
@@ -1579,6 +1580,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
@@ -1591,6 +1592,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
}
response_ = BuildResponseHead();
@ -153,7 +153,7 @@ index fbce18484c05c27f0fbd248251e667ec42a1c338..6b0569f81e99cec72b1febbdaf011d85
// Parse and remove the Trust Tokens response headers, if any are expected,
diff --git a/services/network/url_loader.h b/services/network/url_loader.h
index 7293516425c03c7c31fee0b4631986330cd447cb..97f96ec1df7fd780bc3edcd1a2833e48a7bf7c43 100644
index 65e522e131b97fb4187aabadcb9406ae55e07ea1..8a25a1ce3363811059e4532e3fbbe3a78ea96016 100644
--- a/services/network/url_loader.h
+++ b/services/network/url_loader.h
@@ -553,6 +553,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader

4
patches/chromium/fix_allow_guest_webcontents_to_enter_fullscreen.patch
View file

@ -6,10 +6,10 @@ Subject: fix: allow guest webcontents to enter fullscreen
This can be upstreamed, a guest webcontents can't technically become the focused webContents. This DCHECK should allow all guest webContents to request fullscreen entrance.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index d5647fd2d482b037bbded1117c917efc00fa39ac..bf1805257cd6b2d6a799b25e5b43e986428214c1 100644
index 9ef2e1eff9fbda6ebcd8c8e8f37201f1cf7c8718..66528026750e5c56c009f06ef4463d5f30ab5685 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3552,7 +3552,7 @@ void WebContentsImpl::EnterFullscreenMode(
@@ -3547,7 +3547,7 @@ void WebContentsImpl::EnterFullscreenMode(
OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode");
DCHECK(CanEnterFullscreenMode(requesting_frame, options));
DCHECK(requesting_frame->IsActive());

4
patches/chromium/fix_aspect_ratio_with_max_size.patch
View file

@ -11,10 +11,10 @@ enlarge window above dimensions set during creation of the
BrowserWindow.
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index 6415774708ee5ae8211b71379a41f57764b89f05..0eef92569684a223c3e3f953ec77dc602a5abe4c 100644
index 8edbbbea1afcae8a32d18d23afa706224bf58b14..66444599384981681a3018b5de516e2242324285 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -3785,6 +3785,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
@@ -3782,6 +3782,21 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
delegate_->GetMinMaxSize(&min_window_size, &max_window_size);
min_window_size = delegate_->DIPToScreenSize(min_window_size);
max_window_size = delegate_->DIPToScreenSize(max_window_size);

35
patches/chromium/fix_copying_of_runtime_dlls_to_win_clang_x64.patch
View file

@ -1,35 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Bruce Dawson <brucedawson@chromium.org>
Date: Wed, 15 Mar 2023 20:44:27 +0000
Subject: Fix copying of runtime DLLs to win_clang_x64
Change crrev.com/c/4336228 copied the x64 runtime DLLs to win_clang_x64
during arm64 builds, but for some of those DLLs (including
msvcp140d.dll) it copied the ARM64 version instead of the x64 version.
This prevents debug builds from building, but wasn't noticed until a
clean build was done.
This change fixes the runtime_dir so that the correct files are copied,
and this change was tested with a full build of a debug component
arm64 Windows build.
Bug: 1424422
Change-Id: I43106597059dc243af383dbdb0c3b23703034765
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4336046
Reviewed-by: Dirk Pranke <dpranke@google.com>
Auto-Submit: Bruce Dawson <brucedawson@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/main@{#1117727}
diff --git a/build/vs_toolchain.py b/build/vs_toolchain.py
index eceea83f021573e6ba677904da3bb269a2279740..a9cd6f03d9214ad5077b10d4d76b878255266bdc 100755
--- a/build/vs_toolchain.py
+++ b/build/vs_toolchain.py
@@ -401,6 +401,7 @@ def CopyDlls(target_dir, configuration, target_cpu):
if target_cpu == 'arm64':
target_dir = os.path.join(target_dir, 'win_clang_x64')
target_cpu = 'x64'
+ runtime_dir = x64_runtime
os.makedirs(target_dir, exist_ok=True)
_CopyRuntime(target_dir, runtime_dir, target_cpu, debug=False)
if configuration == 'Debug':

10
patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch
View file

@ -17,10 +17,10 @@ policy->CanCommitOriginAndUrl.
Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856266.
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
index ee847c685b75d48f942a78759ac3f8dd068ca104..0e1e0180739aef844581f3cfabe4c57db98cd4e4 100644
index b2b19773136ca1b66080c905e9d6c9cc51d9a7f0..59bcfec0fe5c91ca852b9449e5f05b48337c4095 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -7134,10 +7134,11 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
@@ -7173,10 +7173,11 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
if (IsForMhtmlSubframe())
return origin_with_debug_info;
@ -37,10 +37,10 @@ index ee847c685b75d48f942a78759ac3f8dd068ca104..0e1e0180739aef844581f3cfabe4c57d
}
diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h
index 0c9248c558d0061d918139547d5d56347a4af7c7..18dcd085afdfa5bcbed07c5ef2b07f145e19479a 100644
index ab194495edf27ea3193ce31276f458d495fb1fd9..07bcf27b7c085b29b0497474e75e74215e29eea8 100644
--- a/content/browser/renderer_host/render_frame_host_impl.h
+++ b/content/browser/renderer_host/render_frame_host_impl.h
@@ -2882,6 +2882,17 @@ class CONTENT_EXPORT RenderFrameHostImpl
@@ -2883,6 +2883,17 @@ class CONTENT_EXPORT RenderFrameHostImpl
// last committed document.
CookieChangeListener::CookieChangeInfo GetCookieChangeInfo();
@ -58,7 +58,7 @@ index 0c9248c558d0061d918139547d5d56347a4af7c7..18dcd085afdfa5bcbed07c5ef2b07f14
protected:
friend class RenderFrameHostFactory;
@@ -3205,17 +3216,6 @@ class CONTENT_EXPORT RenderFrameHostImpl
@@ -3207,17 +3218,6 @@ class CONTENT_EXPORT RenderFrameHostImpl
// relevant.
void ResetWaitingState();

2
patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
View file

@ -8,7 +8,7 @@ we invoke it in order to expose contents.decrementCapturerCount([stayHidden, sta
to users. We should try to upstream this.
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 204ec1bd91e514e9b9332fe1de4bb9a2c9f69413..3a1bed2dddc3ec0f80974a3e38666b44180797d2 100644
index 30e2e358ebe97a0cd06ddc63ce51ea845c82c77e..51e0b306d1d4781959dae4c02ff090b506230e16 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -1867,7 +1867,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,

4
patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch
View file

@ -45,10 +45,10 @@ index 2ca4e42342ff6bf3f2ad104208944e36d572aa3c..7421cc779873b580d6f5a109d57ff744
// RenderFrameMetadataProvider::Observer implementation.
void OnRenderFrameMetadataChangedBeforeActivation(
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index bf1805257cd6b2d6a799b25e5b43e986428214c1..eae7e6311003d549cc414f108e3934c9c4b55c2b 100644
index 66528026750e5c56c009f06ef4463d5f30ab5685..547d87ea3cb5e6a3004d6164508f9a1a1691d8aa 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -8055,7 +8055,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
@@ -8057,7 +8057,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
"WebContentsImpl::OnFocusedElementChangedInFrame",
"render_frame_host", frame);
RenderWidgetHostViewBase* root_view =

4
patches/chromium/fix_remove_caption-removing_style_call.patch
View file

@ -18,10 +18,10 @@ or resizing, but Electron does not seem to run into that issue
for opaque frameless windows even with that block commented out.
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index 60a334e37e8f00be1e06fbc996b1367d88e073f2..ed0393cae510a845f4f935b606fd78859f70ec17 100644
index c55e27bfc275ff63282f8d703dcdf723b5b2385d..ba915088fa641ab7948ecd49fcbb53c30348c3ff 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -1850,7 +1850,23 @@ LRESULT HWNDMessageHandler::OnCreate(CREATESTRUCT* create_struct) {
@@ -1847,7 +1847,23 @@ LRESULT HWNDMessageHandler::OnCreate(CREATESTRUCT* create_struct) {
SendMessage(hwnd(), WM_CHANGEUISTATE, MAKELPARAM(UIS_CLEAR, UISF_HIDEFOCUS),
0);

2
patches/chromium/frame_host_manager.patch
View file

@ -20,7 +20,7 @@ index 9ffeee895d26666a3bf47f374f7b77818316d446..48f1431287e151106cca4c2a20b1d221
}
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 621903d03500f3a4c6bb123c7c183f790b804c2c..9461a4251525cccb3cd29209191e36a0dfeeef08 100644
index dd52f45aa0d2931b67e707082f6afd493c1201bb..0f1445dd39eb0a7742476ef2d4b4e9a5f07d18ef 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -275,6 +275,11 @@ class CONTENT_EXPORT ContentBrowserClient {

6
patches/chromium/gin_enable_disable_v8_platform.patch
View file

@ -38,10 +38,10 @@ index 10caab6d9ef3345332c163a55dcef991248ab4ea..c9bc6e5dd7e1cf8d198afcd21cbb2497
// Returns whether `Initialize` has already been invoked in the process.
// Initialization is a one-way operation (i.e., this method cannot return
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
index e2a73449586ec8f5f76ff3ca6152dca817c0b41c..a7fa30946131687b046c701d1fe49293f1e837f7 100644
index 6ad7e4fb16ef4db322ca7e08417d6554ab24fe60..7f114d1897e7000799aa4da0bda4ac082311b03a 100644
--- a/gin/v8_initializer.cc
+++ b/gin/v8_initializer.cc
@@ -382,7 +382,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
@@ -385,7 +385,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
// static
void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
const std::string js_command_line_flags,
@ -51,7 +51,7 @@ index e2a73449586ec8f5f76ff3ca6152dca817c0b41c..a7fa30946131687b046c701d1fe49293
static bool v8_is_initialized = false;
if (v8_is_initialized)
return;
@@ -392,7 +393,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
@@ -395,7 +396,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
// See https://crbug.com/v8/11043
SetFlags(mode, js_command_line_flags);

4
patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
View file

@ -40,10 +40,10 @@ index 1b03f182346d544a2551ab3a8fcad288d819ea26..67884548adff4a8dbda52e68f863445b
void UpdateDawnInfo(const std::vector<std::string>& dawn_info_list);
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
index 192341a5fad51a0b73d80f2ae5becf36d5a0ea91..54a316b80dc86a3bd4fa80b35fb249f32a45cfe0 100644
index f5b4d25d529465085bf07cffd54013520715ee8e..8d92cb3734cfe020f0b3a54436ab9f9c1cc01312 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -1198,6 +1198,12 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
@@ -1199,6 +1199,12 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
if (host)
host->ForceShutdown();
}

4
patches/chromium/gritsettings_resource_ids.patch
View file

@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
Add electron resources file to the list of resource ids generation.
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
index ba5cd9a58e90c0238b1a7aab93a4f7b140b6929a..bd7f7c546e1b0947c6c13c67d9c77366fc5be455 100644
index a21845c454f438c0ec4607d8f90eb758a5c1b256..ca49c75c55b09639ed35f832a0d24947e19f7934 100644
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -1127,6 +1127,11 @@
@@ -1111,6 +1111,11 @@
"includes": [4960],
},

2
patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
View file

@ -11,7 +11,7 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
index 63d6eb3415a19afe047a490de7629a34b31a2816..5b2289d07b9f23302a346aae180a8e18d39b9510 100755
index 5dd69146da3af2e8a5f78bd4a4440df791916f05..8d104087f7baa04493eec9daafcfa76f077e18b7 100755
--- a/tools/clang/scripts/update.py
+++ b/tools/clang/scripts/update.py
@@ -302,6 +302,8 @@ def GetDefaultHostOs():

4
patches/chromium/load_v8_snapshot_in_browser_process.patch
View file

@ -9,10 +9,10 @@ but due to the nature of electron, we need to load the v8 snapshot
in the browser process.
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
index 07d8b8aa07af722fbf899dc8d5b2397455d5c2c1..1422099cf38dc762257e0b67a0c0d3f61b38c99f 100644
index 0846656e45ba8ed88a069cc0e7c19758997613a6..6a72d0a8f731b5dbc4468ba302bb76a18b4dff92 100644
--- a/content/app/content_main_runner_impl.cc
+++ b/content/app/content_main_runner_impl.cc
@@ -277,11 +277,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
@@ -274,11 +274,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
const std::string& process_type) {

6
patches/chromium/mas_disable_remote_accessibility.patch
View file

@ -44,10 +44,10 @@ index 3600a7ce7b3e6540767f64c631f352aa62240459..3147961f3d1c2c1690b5adf16a9a58f7
} // namespace
diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
index 213f4ed2560cacbf684e45ade9dcfe3bd0bf2f3b..add3d5607b2bcc2474df09d1059bee55500e203f 100644
index daadfaf97b7639980d7d961f67a72030dea9cfec..4fce9a0e1117a399ba640ab75c4bbed17453abcb 100644
--- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
+++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
@@ -600,10 +600,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
@@ -599,10 +599,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
// this should be treated as an error and caught early.
CHECK(bridged_view_);
@ -213,7 +213,7 @@ index d616c812f099505783ad7aed5e0ebfe7d15ea553..66c8dda8af5605fb270011bd58c7bed5
///////////////////////////////////////////////////////////////////////////////
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 8461ec2086eabdb5fcbf287ed27a4243f9081ee7..6c0b1ce058f59ed769e291291fd099f36c94347c 100644
index de80e0d5e40bdff504a1786adffa50c73d16b4c5..90074c3e90d9b4bbfaf2c86f8c1a5a3c36babdc8 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -360,6 +360,13 @@ component("base") {

66
patches/chromium/mas_disable_remote_layer.patch
View file

@ -16,7 +16,7 @@ cases where performance improves when disabling remote CoreAnimation (remote
CoreAnimation is really only about battery usage).
diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.h b/gpu/ipc/service/image_transport_surface_overlay_mac.h
index 4f3673c2766993d9c41a1bc8013a9b26e31d37ce..4d9ca8c945c22801c172d4243bd50653cd441721 100644
index 7d0b810073898dd4a3607828e3419b65ee1cb09d..20c6bd1a002e2b54eed0a8732b2807f598b5f20f 100644
--- a/gpu/ipc/service/image_transport_surface_overlay_mac.h
+++ b/gpu/ipc/service/image_transport_surface_overlay_mac.h
@@ -17,7 +17,9 @@
@ -29,55 +29,69 @@ index 4f3673c2766993d9c41a1bc8013a9b26e31d37ce..4d9ca8c945c22801c172d4243bd50653
@class CALayer;
namespace ui {
@@ -73,10 +75,10 @@ class ImageTransportSurfaceOverlayMacEGL : public gl::Presenter {
@@ -73,8 +75,10 @@ class ImageTransportSurfaceOverlayMacEGL : public gl::Presenter {
base::WeakPtr<ImageTransportSurfaceDelegate> delegate_;
-#if BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_MAC) && !IS_MAS_BUILD()
bool use_remote_layer_api_;
-#endif
+#if !IS_MAS_BUILD()
const bool use_remote_layer_api_;
base::scoped_nsobject<CAContext> ca_context_;
+#endif
std::unique_ptr<ui::CALayerTreeCoordinator> ca_layer_tree_coordinator_;
gfx::Size pixel_size_;
diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.mm b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
index 34723c177874131ae7859671338b7da0be4da24a..1c6d47bae1ffbb621692d412f79a9c4ba5f7df83 100644
index 1f9d7ec4bd7ab0668a081ecc74bf9a3ab80c4697..4e3014ff05c001d37f583cb7c1af6b3dda9b1503 100644
--- a/gpu/ipc/service/image_transport_surface_overlay_mac.mm
+++ b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
@@ -55,7 +55,7 @@
@@ -55,7 +55,9 @@
ImageTransportSurfaceOverlayMacEGL::ImageTransportSurfaceOverlayMacEGL(
base::WeakPtr<ImageTransportSurfaceDelegate> delegate)
: delegate_(delegate),
-#if BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_MAC) && !IS_MAS_BUILD()
+#if !IS_MAS_BUILD()
use_remote_layer_api_(ui::RemoteLayerAPISupported()),
#endif
+#endif
scale_factor_(1),
@@ -71,7 +71,7 @@
vsync_callback_(delegate->GetGpuVSyncCallback()),
weak_ptr_factory_(this) {
@@ -68,6 +70,7 @@
->workarounds()
.disable_av_sample_buffer_display_layer;
-#if BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_MAC) && !IS_MAS_BUILD()
+#if !IS_MAS_BUILD()
ca_layer_tree_coordinator_ = std::make_unique<ui::CALayerTreeCoordinator>(
use_remote_layer_api_, allow_av_sample_buffer_display_layer);
@@ -168,7 +168,7 @@
@@ -88,6 +91,10 @@
#endif
[ca_context_ setLayer:ca_layer_tree_coordinator_->GetCALayerForDisplay()];
}
+#else
+ ca_layer_tree_coordinator_ = std::make_unique<ui::CALayerTreeCoordinator>(
+ /*allow_remote_layers=*/false, allow_av_sample_buffer_display_layer);
+#endif
}
ImageTransportSurfaceOverlayMacEGL::~ImageTransportSurfaceOverlayMacEGL() {
@@ -169,9 +176,13 @@
TRACE_EVENT_INSTANT2("test_gpu", "SwapBuffers", TRACE_EVENT_SCOPE_THREAD,
"GLImpl", static_cast<int>(gl::GetGLImplementation()),
"width", pixel_size_.width());
-#if BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_MAC) && !IS_MAS_BUILD()
+#if !IS_MAS_BUILD()
if (use_remote_layer_api_) {
params.ca_context_id = [ca_context_ contextId];
} else {
+#else
+ if (true) {
+#endif
IOSurfaceRef io_surface =
ca_layer_tree_coordinator_->GetIOSurfaceForDisplay();
if (io_surface) {
diff --git a/ui/accelerated_widget_mac/display_ca_layer_tree.mm b/ui/accelerated_widget_mac/display_ca_layer_tree.mm
index 2c4821b34f71d30ce814bd1f3cf9a7a76bbaac66..c7dc371c780a405f502a84c77e92251ae08f66e0 100644
index 8cd4cd65a02b3ca332f1d4164ff7c16cda10cdb8..bcd99c491085d3bfca4434c65ad53d2f6da51831 100644
--- a/ui/accelerated_widget_mac/display_ca_layer_tree.mm
+++ b/ui/accelerated_widget_mac/display_ca_layer_tree.mm
@@ -99,6 +99,7 @@ - (void)setContentsChanged;
@@ -119,6 +119,7 @@ - (void)setContentsChanged;
}
void DisplayCALayerTree::GotCALayerFrame(uint32_t ca_context_id) {
@ -85,7 +99,7 @@ index 2c4821b34f71d30ce814bd1f3cf9a7a76bbaac66..c7dc371c780a405f502a84c77e92251a
// Early-out if the remote layer has not changed.
if ([remote_layer_ contextId] == ca_context_id)
return;
@@ -123,6 +124,9 @@ - (void)setContentsChanged;
@@ -149,6 +150,9 @@ - (void)setContentsChanged;
[io_surface_layer_ removeFromSuperlayer];
io_surface_layer_.reset();
}
@ -96,18 +110,18 @@ index 2c4821b34f71d30ce814bd1f3cf9a7a76bbaac66..c7dc371c780a405f502a84c77e92251a
void DisplayCALayerTree::GotIOSurfaceFrame(
diff --git a/ui/base/cocoa/remote_layer_api.h b/ui/base/cocoa/remote_layer_api.h
index 9b691e2f16c68235dd180a28b6eb2eefc91f8e4c..9d4a7fb36e671980024b895eaafab2d970ac2818 100644
index 5763f05d30ee718b5b6ec75465bc5f58fc263a91..e470d8a719119427026b5656159f8c7188727ad4 100644
--- a/ui/base/cocoa/remote_layer_api.h
+++ b/ui/base/cocoa/remote_layer_api.h
@@ -13,6 +13,7 @@
@@ -17,6 +17,7 @@
#include "base/component_export.h"
#if BUILDFLAG(IS_MAC)
+#if !IS_MAS_BUILD()
// The CGSConnectionID is used to create the CAContext in the process that is
// going to share the CALayers that it is rendering to another process to
// display.
@@ -50,6 +51,8 @@ typedef uint32_t CAContextID;
@@ -68,6 +69,8 @@ extern NSString* const kCAContextIgnoresHitTest;
#endif // __OBJC__
@ -117,7 +131,7 @@ index 9b691e2f16c68235dd180a28b6eb2eefc91f8e4c..9d4a7fb36e671980024b895eaafab2d9
// This function will check if all of the interfaces listed above are supported
diff --git a/ui/base/cocoa/remote_layer_api.mm b/ui/base/cocoa/remote_layer_api.mm
index e23eb7719a9798afe984c6af6a422167b93d89b5..d448bc09ee54fc77f1ed4d088d1369b96f83a1db 100644
index fc25ba79d2b0e1acdb7ba54b89e7d6e16f94771b..962df2d65d61ec0836cf465d847eb666033846f2 100644
--- a/ui/base/cocoa/remote_layer_api.mm
+++ b/ui/base/cocoa/remote_layer_api.mm
@@ -10,6 +10,7 @@
@ -139,7 +153,7 @@ index e23eb7719a9798afe984c6af6a422167b93d89b5..d448bc09ee54fc77f1ed4d088d1369b9
if (!base::FeatureList::IsEnabled(kRemoteCoreAnimationAPI))
return false;
@@ -50,6 +53,9 @@ bool RemoteLayerAPISupported() {
@@ -55,6 +58,9 @@ bool RemoteLayerAPISupported() {
// If everything is there, we should be able to use the API.
return true;

20
patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
View file

@ -7,10 +7,10 @@ This adds a callback from the network service that's used to implement
session.setCertificateVerifyCallback.
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index a454899a6aec4e581c9166478b4f4118e7a9e0a8..1e6300466078bbe1ad02922d87e173d062cf1f79 100644
index 8d2080d91c5c0a1d4fbd6a4261d9c14bf36bc34c..53348f7a19ef39eb0a6fbdfbfcc7e280125f45f3 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -137,6 +137,11 @@
@@ -138,6 +138,11 @@
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "url/gurl.h"
@ -22,7 +22,7 @@ index a454899a6aec4e581c9166478b4f4118e7a9e0a8..1e6300466078bbe1ad02922d87e173d0
#if BUILDFLAG(IS_CT_SUPPORTED)
#include "components/certificate_transparency/chrome_ct_policy_enforcer.h"
#include "components/certificate_transparency/chrome_require_ct_delegate.h"
@@ -417,6 +422,91 @@ bool GetFullDataFilePath(
@@ -418,6 +423,91 @@ bool GetFullDataFilePath(
} // namespace
@ -114,7 +114,7 @@ index a454899a6aec4e581c9166478b4f4118e7a9e0a8..1e6300466078bbe1ad02922d87e173d0
constexpr uint32_t NetworkContext::kMaxOutstandingRequestsPerProcess;
NetworkContext::PendingCertVerify::PendingCertVerify() = default;
@@ -717,6 +807,13 @@ void NetworkContext::SetClient(
@@ -718,6 +808,13 @@ void NetworkContext::SetClient(
client_.Bind(std::move(client));
}
@ -128,7 +128,7 @@ index a454899a6aec4e581c9166478b4f4118e7a9e0a8..1e6300466078bbe1ad02922d87e173d0
void NetworkContext::CreateURLLoaderFactory(
mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
mojom::URLLoaderFactoryParamsPtr params) {
@@ -2202,6 +2299,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2217,6 +2314,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
std::move(cert_verifier));
cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_.get());
#endif // BUILDFLAG(IS_CHROMEOS)
@ -139,10 +139,10 @@ index a454899a6aec4e581c9166478b4f4118e7a9e0a8..1e6300466078bbe1ad02922d87e173d0
builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
diff --git a/services/network/network_context.h b/services/network/network_context.h
index dfacd0003f71fc929f61f5059dd5be606f6abedf..5aaa11be3d8ead3626bf49f7efcfe04ddbfa6933 100644
index ab0d0362e9d61b6a5c395591f772819f0302d8aa..ce1162a98b9fa50e775d4f2539d6f38389d49bdd 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -111,6 +111,7 @@ class URLMatcher;
@@ -114,6 +114,7 @@ class URLMatcher;
namespace network {
class CertVerifierWithTrustAnchors;
@ -150,7 +150,7 @@ index dfacd0003f71fc929f61f5059dd5be606f6abedf..5aaa11be3d8ead3626bf49f7efcfe04d
class CookieManager;
class HostResolver;
class MdnsResponderManager;
@@ -246,6 +247,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@@ -249,6 +250,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
void CreateURLLoaderFactory(
mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
mojom::URLLoaderFactoryParamsPtr params) override;
@ -159,7 +159,7 @@ index dfacd0003f71fc929f61f5059dd5be606f6abedf..5aaa11be3d8ead3626bf49f7efcfe04d
void ResetURLLoaderFactories() override;
void GetViaObliviousHttp(
mojom::ObliviousHttpRequestPtr request,
@@ -838,6 +841,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@@ -845,6 +848,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
std::vector<base::OnceClosure> dismount_closures_;
#endif // BUILDFLAG(IS_DIRECTORY_TRANSFER_REQUIRED)
@ -169,7 +169,7 @@ index dfacd0003f71fc929f61f5059dd5be606f6abedf..5aaa11be3d8ead3626bf49f7efcfe04d
std::unique_ptr<HostResolver> internal_host_resolver_;
// Map values set to non-null only if that HostResolver has its own private
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index 5e719e0bbb87107754d5a8961625935c456de0ae..71a39f2c31099ac4869690d4fe81ce9b83d49893 100644
index 290804a60997d21f5486e83b9625c73dd8685106..ee9771be4f6ed4bc30bc812eaf4f7b23643a4548 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -293,6 +293,17 @@ struct NetworkContextFilePaths {

6
patches/chromium/notification_provenance.patch
View file

@ -133,10 +133,10 @@ index bbd2aa78722fc0a14ac815ca0243b83965ad8d7c..b6e0a2fce3a0fb9c449aa1bef6a0f970
const GURL& document_url,
const WeakDocumentPtr& weak_document_ptr,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 829a7a2d3966682bd43a6788fa4a7d0514df2d1b..0781fb499a0c490939c2b0a0cfa72efcdb5eb0cc 100644
index fa0d5afe801d83c6bcbe3e64acb43353ee413107..0d2fedc58a7e0ec968764ebfba33e4a4aa11c177 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2115,7 +2115,7 @@ void RenderProcessHostImpl::CreateNotificationService(
@@ -2113,7 +2113,7 @@ void RenderProcessHostImpl::CreateNotificationService(
case RenderProcessHost::NotificationServiceCreatorType::kSharedWorker:
case RenderProcessHost::NotificationServiceCreatorType::kDedicatedWorker: {
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
@ -145,7 +145,7 @@ index 829a7a2d3966682bd43a6788fa4a7d0514df2d1b..0781fb499a0c490939c2b0a0cfa72efc
creator_type, std::move(receiver));
break;
}
@@ -2123,7 +2123,7 @@ void RenderProcessHostImpl::CreateNotificationService(
@@ -2121,7 +2121,7 @@ void RenderProcessHostImpl::CreateNotificationService(
CHECK(rfh);
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(

6
patches/chromium/port_autofill_colors_to_the_color_pipeline.patch
View file

@ -8,10 +8,10 @@ needed in chromium but our autofill implementation uses them. This patch can be
our autofill implementation to work like Chromium's.
diff --git a/ui/color/color_id.h b/ui/color/color_id.h
index 36e82370f1f1aa9da6cfc762a921d5d9b83140f7..0f0a1953fcfb9ec73a96c42d6d90c88598e96d8f 100644
index e25a87d2710ed0486bd780791635a5c2e2adfd48..8c0e4d2f25a74ab3c09655871e8586fc9f1bd10b 100644
--- a/ui/color/color_id.h
+++ b/ui/color/color_id.h
@@ -339,6 +339,10 @@
@@ -345,6 +345,10 @@
E_CPONLY(kColorScrollbarThumbInactive) \
E_CPONLY(kColorScrollbarThumbPressed) \
E_CPONLY(kColorScrollbarTrack) \
@ -22,7 +22,7 @@ index 36e82370f1f1aa9da6cfc762a921d5d9b83140f7..0f0a1953fcfb9ec73a96c42d6d90c885
E_CPONLY(kColorSeparator) \
E_CPONLY(kColorShadowBase) \
E_CPONLY(kColorShadowValueAmbientShadowElevationSixteen) \
@@ -409,6 +413,7 @@
@@ -416,6 +420,7 @@
E_CPONLY(kColorTreeNodeForeground) \
E_CPONLY(kColorTreeNodeForegroundSelectedFocused) \
E_CPONLY(kColorTreeNodeForegroundSelectedUnfocused) \

234
patches/chromium/printing.patch
View file

@ -78,10 +78,10 @@ index 044b34d3738985f3e38476c37a189a5c06ed5353..8cf9832ca1ba864860bccb9b8cb4180d
: PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3;
}
diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3ab7a577db 100644
index 58a8f21df0925d8f9b0e7effce83aab1c031d45e..93eaad3275257228ad1c20b3408bb21e014f3e9b 100644
--- a/chrome/browser/printing/print_view_manager_base.cc
+++ b/chrome/browser/printing/print_view_manager_base.cc
@@ -22,7 +22,9 @@
@@ -23,7 +23,9 @@
#include "chrome/browser/bad_message.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
@ -91,7 +91,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
#include "chrome/browser/printing/print_job.h"
#include "chrome/browser/printing/print_job_manager.h"
#include "chrome/browser/printing/print_view_manager_common.h"
@@ -77,6 +79,17 @@ namespace printing {
@@ -79,6 +81,17 @@ namespace printing {
namespace {
@ -109,38 +109,56 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
using PrintSettingsCallback =
base::OnceCallback<void(std::unique_ptr<PrinterQuery>)>;
@@ -87,15 +100,18 @@ void OnDidGetDefaultPrintSettings(
mojom::PrintManagerHost::GetDefaultPrintSettingsCallback callback) {
@@ -90,9 +103,11 @@ void OnDidGetDefaultPrintSettings(
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
mojom::PrintParamsPtr params = mojom::PrintParams::New();
- if (printer_query &&
- printer_query->last_status() == mojom::ResultCode::kSuccess) {
+ // We call update without first printing from defaults,
+ // so the last printer status will still be defaulted to PrintingContext::FAILED
+ if (printer_query) {
RenderParamsFromPrintSettings(printer_query->settings(), params.get());
params->document_cookie = printer_query->cookie();
}
if (printer_query->last_status() != mojom::ResultCode::kSuccess) {
+#if 0 // Electron does not use Chrome error dialogs
if (!want_pdf_settings && !PrintMsgPrintParamsIsValid(*params)) {
if (!want_pdf_settings) {
ShowPrintErrorDialogForInvalidPrinterError();
}
+#endif
std::move(callback).Run(std::move(params));
@@ -165,7 +181,8 @@ void OnDidScriptedPrint(
std::move(callback).Run(nullptr);
return;
}
bool has_valid_cookie = params->params->document_cookie;
bool has_dpi = !params->params->dpi.IsEmpty();
@@ -102,9 +117,11 @@ void OnDidGetDefaultPrintSettings(
params->document_cookie = printer_query->cookie();
if (!PrintMsgPrintParamsIsValid(*params)) {
+#if 0 // Electron does not use Chrome error dialogs
if (!want_pdf_settings) {
ShowPrintErrorDialogForInvalidPrinterError();
}
+#endif
std::move(callback).Run(nullptr);
return;
}
@@ -121,7 +138,7 @@ void OnDidScriptedPrint(
if (printer_query->last_status() != mojom::ResultCode::kSuccess ||
!printer_query->settings().dpi()) {
- std::move(callback).Run(nullptr);
+ std::move(callback).Run(nullptr, false);
return;
}
@@ -131,12 +148,13 @@ void OnDidScriptedPrint(
params->params.get());
params->params->document_cookie = printer_query->cookie();
if (!PrintMsgPrintParamsIsValid(*params->params)) {
- std::move(callback).Run(nullptr);
+ std::move(callback).Run(nullptr, false);
return;
}
params->pages = printer_query->settings().ranges();
- std::move(callback).Run(std::move(params));
+ bool canceled = printer_query->last_status() == mojom::ResultCode::kCanceled;
+ std::move(callback).Run(std::move(params), canceled);
if (has_dpi && has_valid_cookie) {
queue->QueuePrinterQuery(std::move(printer_query));
@@ -178,9 +195,11 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
}
@@ -173,9 +191,11 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
: PrintManager(web_contents),
queue_(g_browser_process->print_job_manager()->queue()) {
DCHECK(queue_);
@ -153,7 +171,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
}
PrintViewManagerBase::~PrintViewManagerBase() {
@@ -188,7 +207,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
@@ -183,7 +203,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
DisconnectFromCurrentPrintJob();
}
@ -165,7 +183,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
// Remember the ID for `rfh`, to enable checking that the `RenderFrameHost`
// is still valid after a possible inner message loop runs in
// `DisconnectFromCurrentPrintJob()`.
@@ -216,7 +238,12 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
@@ -211,7 +234,12 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
#endif
SetPrintingRFH(rfh);
@ -178,7 +196,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
return true;
}
@@ -388,7 +415,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
@@ -377,7 +405,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
void PrintViewManagerBase::ScriptedPrintReply(
ScriptedPrintCallback callback,
int process_id,
@ -188,64 +206,54 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
#if BUILDFLAG(ENABLE_OOP_PRINTING)
@@ -414,8 +442,11 @@ void PrintViewManagerBase::ScriptedPrintReply(
@@ -404,12 +433,15 @@ void PrintViewManagerBase::ScriptedPrintReply(
return;
}
+ if (canceled)
+ UserInitCanceled();
+
if (params) {
set_cookie(params->params->document_cookie);
- std::move(callback).Run(std::move(params));
+ std::move(callback).Run(std::move(params), canceled);
} else {
set_cookie(0);
- std::move(callback).Run(nullptr);
+ std::move(callback).Run(nullptr, false);
}
}
void PrintViewManagerBase::NavigationStopped() {
@@ -550,11 +581,13 @@ void PrintViewManagerBase::DidPrintDocument(
@@ -545,10 +577,12 @@ void PrintViewManagerBase::DidPrintDocument(
void PrintViewManagerBase::GetDefaultPrintSettings(
GetDefaultPrintSettingsCallback callback) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+#if 0 // Printing is always enabled.
if (!printing_enabled_.GetValue()) {
GetDefaultPrintSettingsReply(std::move(callback),
mojom::PrintParams::New());
GetDefaultPrintSettingsReply(std::move(callback), nullptr);
return;
}
+#endif
#if BUILDFLAG(ENABLE_OOP_PRINTING)
if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
#if BUILDFLAG(ENABLE_PRINT_CONTENT_ANALYSIS)
@@ -602,11 +635,13 @@ void PrintViewManagerBase::UpdatePrintSettings(
@@ -595,6 +629,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
base::Value::Dict job_settings,
UpdatePrintSettingsCallback callback) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+#if 0 // Printing is always enabled.
if (!printing_enabled_.GetValue()) {
UpdatePrintSettingsReply(std::move(callback),
CreateEmptyPrintPagesParamsPtr(), false);
std::move(callback).Run(nullptr);
return;
}
+#endif
if (!job_settings.FindInt(kSettingPrinterType)) {
UpdatePrintSettingsReply(std::move(callback),
@@ -614,6 +649,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
return;
}
+#if 0
content::BrowserContext* context =
web_contents() ? web_contents()->GetBrowserContext() : nullptr;
PrefService* prefs =
@@ -623,6 +659,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
@@ -628,6 +663,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
if (value > 0)
job_settings.Set(kSettingRasterizePdfDpi, value);
}
+#endif
auto callback_wrapper =
base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
@@ -641,7 +678,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
std::unique_ptr<PrintSettings> print_settings =
PrintSettingsFromJobSettings(job_settings);
@@ -656,7 +692,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
void PrintViewManagerBase::IsPrintingEnabled(
IsPrintingEnabledCallback callback) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@ -254,24 +262,24 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
}
void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
@@ -657,14 +694,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
@@ -672,14 +708,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
// didn't happen for some reason.
bad_message::ReceivedBadMessage(
render_process_host, bad_message::PVMB_SCRIPTED_PRINT_FENCED_FRAME);
- std::move(callback).Run(CreateEmptyPrintPagesParamsPtr());
+ std::move(callback).Run(CreateEmptyPrintPagesParamsPtr(), false);
- std::move(callback).Run(nullptr);
+ std::move(callback).Run(nullptr, false);
return;
}
#if BUILDFLAG(ENABLE_OOP_PRINTING)
if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
!query_with_ui_client_id_.has_value()) {
// Renderer process has requested settings outside of the expected setup.
- std::move(callback).Run(CreateEmptyPrintPagesParamsPtr());
+ std::move(callback).Run(CreateEmptyPrintPagesParamsPtr(), false);
- std::move(callback).Run(nullptr);
+ std::move(callback).Run(nullptr, false);
return;
}
#endif
@@ -702,6 +739,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
@@ -717,6 +753,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
PrintManager::PrintingFailed(cookie, reason);
@ -279,7 +287,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
// `PrintingFailed()` can occur because asynchronous compositing results
// don't complete until after a print job has already failed and been
// destroyed. In such cases the error notification to the user will
@@ -711,7 +749,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
@@ -726,7 +763,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
print_job_->document()->cookie() == cookie) {
ShowPrintErrorDialogForGenericError();
}
@ -288,7 +296,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
ReleasePrinterQuery();
}
@@ -723,15 +761,24 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
@@ -738,15 +775,24 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
observers_.RemoveObserver(&observer);
}
@ -313,7 +321,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
}
void PrintViewManagerBase::RenderFrameDeleted(
@@ -783,7 +830,12 @@ void PrintViewManagerBase::OnJobDone() {
@@ -798,7 +844,12 @@ void PrintViewManagerBase::OnJobDone() {
// Printing is done, we don't need it anymore.
// print_job_->is_job_pending() may still be true, depending on the order
// of object registration.
@ -327,7 +335,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
ReleasePrintJob();
}
@@ -792,9 +844,10 @@ void PrintViewManagerBase::OnCanceling() {
@@ -807,9 +858,10 @@ void PrintViewManagerBase::OnCanceling() {
}
void PrintViewManagerBase::OnFailed() {
@ -339,7 +347,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
TerminatePrintJob(true);
}
@@ -804,7 +857,7 @@ bool PrintViewManagerBase::RenderAllMissingPagesNow() {
@@ -819,7 +871,7 @@ bool PrintViewManagerBase::RenderAllMissingPagesNow() {
// Is the document already complete?
if (print_job_->document() && print_job_->document()->IsComplete()) {
@ -348,7 +356,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
return true;
}
@@ -852,7 +905,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
@@ -867,7 +919,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
// Disconnect the current `print_job_`.
auto weak_this = weak_ptr_factory_.GetWeakPtr();
@ -360,7 +368,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
if (!weak_this)
return false;
@@ -873,7 +929,7 @@ bool PrintViewManagerBase::CreateNewPrintJob(
@@ -888,7 +943,7 @@ bool PrintViewManagerBase::CreateNewPrintJob(
#endif
print_job_->AddObserver(*this);
@ -369,7 +377,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
return true;
}
@@ -935,6 +991,11 @@ void PrintViewManagerBase::ReleasePrintJob() {
@@ -950,6 +1005,11 @@ void PrintViewManagerBase::ReleasePrintJob() {
}
#endif
@ -381,7 +389,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
if (!print_job_)
return;
@@ -942,7 +1003,7 @@ void PrintViewManagerBase::ReleasePrintJob() {
@@ -957,7 +1017,7 @@ void PrintViewManagerBase::ReleasePrintJob() {
// printing_rfh_ should only ever point to a RenderFrameHost with a live
// RenderFrame.
DCHECK(rfh->IsRenderFrameLive());
@ -390,7 +398,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
}
print_job_->RemoveObserver(*this);
@@ -984,7 +1045,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
@@ -999,7 +1059,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
}
bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
@ -399,7 +407,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
return true;
if (!cookie) {
@@ -1101,7 +1162,7 @@ void PrintViewManagerBase::ReleasePrinterQuery() {
@@ -1116,7 +1176,7 @@ void PrintViewManagerBase::ReleasePrinterQuery() {
}
void PrintViewManagerBase::CompletePrintNow(content::RenderFrameHost* rfh) {
@ -408,6 +416,15 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
for (auto& observer : GetObservers())
observer.OnPrintNow(rfh);
@@ -1164,7 +1224,7 @@ void PrintViewManagerBase::CompleteScriptedPrintAfterContentAnalysis(
bool allowed) {
if (!allowed || !printing_rfh_ || IsCrashed() ||
!printing_rfh_->IsRenderFrameLive()) {
- std::move(callback).Run(nullptr);
+ std::move(callback).Run(nullptr, false);
return;
}
CompleteScriptedPrint(printing_rfh_, std::move(params), std::move(callback));
diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
index 52faaedf4c93fa02548355218933df45db091e3e..67fe40ff154b99fbf0e66621b91834d1fb55bda6 100644
--- a/chrome/browser/printing/print_view_manager_base.h
@ -562,10 +579,10 @@ index ca71560874a0189068dd11fbc039f5673bf6bd96..a8551d95e64da2afbc1685b2df8f1fc3
mojom::PrintFailureReason reason) override;
diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom
index 8c6b0aee3964791ad7d73ee8bc367456280a3eec..e42e8bceb792f9fa9c0b2d32853746c7714e1bd8 100644
index c440ebb5c43d7d6bd6aa1a32aad77980644f9f3e..6a1872f69998fb7dbcef048eb580fdf908c6f8af 100644
--- a/components/printing/common/print.mojom
+++ b/components/printing/common/print.mojom
@@ -291,7 +291,7 @@ union PrintWithParamsResult {
@@ -288,7 +288,7 @@ union PrintWithParamsResult {
interface PrintRenderFrame {
// Tells the RenderFrame to switch the CSS to print media type, render every
// requested page, and then switch back the CSS to display media type.
@ -574,12 +591,12 @@ index 8c6b0aee3964791ad7d73ee8bc367456280a3eec..e42e8bceb792f9fa9c0b2d32853746c7
// Requests the frame to be printed with specified parameters. This is used
// to programmatically produce PDF by request from the browser (e.g. over
@@ -382,7 +382,10 @@ interface PrintManagerHost {
// Requests the print settings from the user. This step is about showing
// UI to the user to select the final print settings.
@@ -380,7 +380,10 @@ interface PrintManagerHost {
// UI to the user to select the final print settings. If the user cancels or
// an error occurs, return null.
[Sync]
- ScriptedPrint(ScriptedPrintParams params) => (PrintPagesParams settings);
+ ScriptedPrint(ScriptedPrintParams params) => (PrintPagesParams settings, bool canceled);
- ScriptedPrint(ScriptedPrintParams params) => (PrintPagesParams? settings);
+ ScriptedPrint(ScriptedPrintParams params) => (PrintPagesParams? settings, bool canceled);
+
+ // Tells the browser that there are invalid printer settings.
+ ShowInvalidPrinterSettingsError();
@ -587,7 +604,7 @@ index 8c6b0aee3964791ad7d73ee8bc367456280a3eec..e42e8bceb792f9fa9c0b2d32853746c7
// Tells the browser printing failed.
PrintingFailed(int32 cookie, PrintFailureReason reason);
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac38d32dce 100644
index 7e7acaa2b35a931ba1c52191a816dd5b93c98b11..a7f5581bc26354014a73544ad8a7997464b4061c 100644
--- a/components/printing/renderer/print_render_frame_helper.cc
+++ b/components/printing/renderer/print_render_frame_helper.cc
@@ -45,6 +45,7 @@
@ -598,7 +615,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
#include "printing/units.h"
#include "services/metrics/public/cpp/ukm_source_id.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
@@ -1335,7 +1336,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
@@ -1314,7 +1315,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
if (!weak_this)
return;
@ -608,7 +625,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
if (!weak_this)
return;
@@ -1366,7 +1368,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
@@ -1345,7 +1347,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
receivers_.Add(this, std::move(receiver));
}
@ -617,7 +634,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
return;
@@ -1381,7 +1383,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
@@ -1360,7 +1362,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
// plugin node and print that instead.
auto plugin = delegate_->GetPdfElement(frame);
@ -626,7 +643,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
if (!render_frame_gone_)
frame->DispatchAfterPrintEvent();
@@ -1463,7 +1465,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
@@ -1441,7 +1443,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
}
Print(frame, print_preview_context_.source_node(),
@ -636,7 +653,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
if (!render_frame_gone_)
print_preview_context_.DispatchAfterPrintEvent();
// WARNING: |this| may be gone at this point. Do not do any more work here and
@@ -1512,6 +1515,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
@@ -1490,6 +1493,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
return;
@ -645,7 +662,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
print_preview_context_.OnPrintPreview();
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -2122,7 +2127,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
@@ -2104,7 +2109,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
return;
Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
@ -655,7 +672,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
// Check if |this| is still valid.
if (!weak_this)
return;
@@ -2137,7 +2143,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
@@ -2119,7 +2125,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
const blink::WebNode& node,
@ -666,7 +683,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
// If still not finished with earlier print request simply ignore.
if (prep_frame_view_)
return;
@@ -2145,7 +2153,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
@@ -2127,7 +2135,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
FrameReference frame_ref(frame);
uint32_t expected_page_count = 0;
@ -675,7 +692,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
DidFinishPrinting(FAIL_PRINT_INIT);
return; // Failed to init print page settings.
}
@@ -2164,8 +2172,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
@@ -2146,8 +2154,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
print_pages_params_->params->print_scaling_option;
auto self = weak_ptr_factory_.GetWeakPtr();
@ -692,50 +709,47 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
// Check if |this| is still valid.
if (!self)
return;
@@ -2420,36 +2435,51 @@ void PrintRenderFrameHelper::IPCProcessed() {
@@ -2402,37 +2417,49 @@ void PrintRenderFrameHelper::IPCProcessed() {
}
}
-bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
- mojom::PrintPagesParams settings;
- settings.params = mojom::PrintParams::New();
- GetPrintManagerHost()->GetDefaultPrintSettings(&settings.params);
+bool PrintRenderFrameHelper::InitPrintSettings(
+ bool fit_to_paper_size,
+ base::Value::Dict new_settings) {
// Reset to default values.
ignore_css_margins_ = false;
- mojom::PrintPagesParams settings;
- GetPrintManagerHost()->GetDefaultPrintSettings(&settings.params);
+ mojom::PrintPagesParamsPtr settings;
+
+ if (new_settings.empty()) {
+ settings = mojom::PrintPagesParams::New();
+ settings->params = mojom::PrintParams::New();
+ GetPrintManagerHost()->GetDefaultPrintSettings(&settings->params);
+ } else {
+ bool canceled = false;
+ GetPrintManagerHost()->UpdatePrintSettings(
+ std::move(new_settings), &settings, &canceled);
+ if (canceled)
+ return false;
+ std::move(new_settings), &settings);
+ }
// Check if the printer returned any settings, if the settings is empty, we
// can safely assume there are no printer drivers configured. So we safely
// terminate.
- const bool result = PrintMsgPrintParamsIsValid(*settings.params);
+ const bool result = PrintMsgPrintParamsIsValid(*settings->params);
// Reset to default values.
ignore_css_margins_ = false;
- settings.pages.clear();
+ settings->pages.clear();
// Check if the printer returned any settings, if the settings are null,
// assume there are no printer drivers configured. So safely terminate.
- if (!settings.params) {
+ if (!settings->params) {
// Caller will reset `print_pages_params_`.
return false;
}
- settings.params->print_scaling_option =
+ settings->params->print_scaling_option =
fit_to_paper_size ? mojom::PrintScalingOption::kFitToPrintableArea
: mojom::PrintScalingOption::kSourceSize;
- CHECK(PrintMsgPrintParamsIsValid(*settings.params));
- SetPrintPagesParams(settings);
+ CHECK(PrintMsgPrintParamsIsValid(*settings->params));
+ SetPrintPagesParams(*settings);
return result;
return true;
}
-bool PrintRenderFrameHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
@ -756,7 +770,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
return false;
}
@@ -2570,7 +2600,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
@@ -2537,7 +2564,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
std::move(params),
base::BindOnce(
[](base::OnceClosure quit_closure, mojom::PrintPagesParamsPtr* output,
@ -766,7 +780,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
std::move(quit_closure).Run();
},
diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
index c7be37dc31f4725c945e7fde016b542d6e2b5902..03eff9ffcec9c655542d9c6508d9eb2fcad95583 100644
index 12dab2542d58b5a61eefd38420ee68687274b461..737a67a59f7a3e6fe026631def02d4c196b8875d 100644
--- a/components/printing/renderer/print_render_frame_helper.h
+++ b/components/printing/renderer/print_render_frame_helper.h
@@ -253,7 +253,7 @@ class PrintRenderFrameHelper
@ -807,10 +821,10 @@ index c7be37dc31f4725c945e7fde016b542d6e2b5902..03eff9ffcec9c655542d9c6508d9eb2f
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
// Set options for print preset from source PDF document.
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 29e6932405dc48ecd29beb620bedef40ddb4c481..aec1fddcdb0e5e4e4b6fa0927cb6ebba05430382 100644
index 4eb28092c67a0b88228919d0d075a7d7d71b4776..4cabad83bd9de68424abb7961d45cf096e5afcb1 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -2826,8 +2826,9 @@ source_set("browser") {
@@ -2830,8 +2830,9 @@ source_set("browser") {
"//ppapi/shared_impl",
]

10
patches/chromium/proxy_config_monitor.patch
View file

@ -6,7 +6,7 @@ Subject: proxy_config_monitor.patch
Allow monitoring proxy config changes for a pref service.
diff --git a/chrome/browser/net/proxy_config_monitor.cc b/chrome/browser/net/proxy_config_monitor.cc
index 34584b44002762c875b68eb8547f651b8d7d7a0e..e3f33934c536920981b01ec2e1bc6a5905f40fc4 100644
index 6dc5622f50847e35d66eff8b34b4888aa6c4ca90..dcbf445709d0511b84ea647892d12266f6be446a 100644
--- a/chrome/browser/net/proxy_config_monitor.cc
+++ b/chrome/browser/net/proxy_config_monitor.cc
@@ -11,7 +11,9 @@
@ -19,7 +19,7 @@ index 34584b44002762c875b68eb8547f651b8d7d7a0e..e3f33934c536920981b01ec2e1bc6a59
#include "components/proxy_config/pref_proxy_config_tracker_impl.h"
#include "content/public/browser/browser_thread.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
@@ -21,12 +23,13 @@
@@ -22,12 +24,13 @@
#include "chrome/browser/ash/profiles/profile_helper.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -34,7 +34,7 @@ index 34584b44002762c875b68eb8547f651b8d7d7a0e..e3f33934c536920981b01ec2e1bc6a59
ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
DCHECK(profile);
@@ -57,6 +60,7 @@ ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) {
@@ -58,6 +61,7 @@ ProxyConfigMonitor::ProxyConfigMonitor(Profile* profile) {
proxy_config_service_->AddObserver(this);
}
@ -42,7 +42,7 @@ index 34584b44002762c875b68eb8547f651b8d7d7a0e..e3f33934c536920981b01ec2e1bc6a59
ProxyConfigMonitor::ProxyConfigMonitor(PrefService* local_state) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
@@ -134,9 +138,11 @@ void ProxyConfigMonitor::OnLazyProxyConfigPoll() {
@@ -139,9 +143,11 @@ void ProxyConfigMonitor::OnLazyProxyConfigPoll() {
void ProxyConfigMonitor::OnPACScriptError(int32_t line_number,
const std::string& details) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@ -54,7 +54,7 @@ index 34584b44002762c875b68eb8547f651b8d7d7a0e..e3f33934c536920981b01ec2e1bc6a59
}
void ProxyConfigMonitor::OnRequestMaybeFailedDueToProxySettings(
@@ -150,9 +156,10 @@ void ProxyConfigMonitor::OnRequestMaybeFailedDueToProxySettings(
@@ -155,9 +161,10 @@ void ProxyConfigMonitor::OnRequestMaybeFailedDueToProxySettings(
// controlled.
return;
}

6
patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
View file

@ -43,10 +43,10 @@ index 9c3241c40e9b969c8f3d77f9b68f183b6f75ebbb..04caca821dc7b701b98e378f8084a797
void RenderWidgetHostImpl::ShowContextMenuAtPoint(
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 84f08460ff6b99a40e0591730d4bfadfdf896edf..cd4f7e96d87908a3b3c3a83e4bd246b3e80603aa 100644
index e410f83816f6579dd07062b5037bf04407bda711..f2dd1ecf9440030463669c515685d56c6a3b5c2d 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4719,6 +4719,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
@@ -4715,6 +4715,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
return text_input_manager_.get();
}
@ -59,7 +59,7 @@ index 84f08460ff6b99a40e0591730d4bfadfdf896edf..cd4f7e96d87908a3b3c3a83e4bd246b3
RenderWidgetHostImpl* render_widget_host) {
return render_widget_host == GetPrimaryMainFrame()->GetRenderWidgetHost();
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 836344556773b54846c57e7b63a225077b9d2a99..204ec1bd91e514e9b9332fe1de4bb9a2c9f69413 100644
index 1b0b92ec09df720f504fd12ca6f4ff73d86f603f..30e2e358ebe97a0cd06ddc63ce51ea845c82c77e 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -968,6 +968,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,

14
patches/chromium/render_widget_host_view_mac.patch
View file

@ -10,10 +10,10 @@ kinds of utility windows. Similarly for `disableAutoHideCursor`.
Additionally, disables usage of some private APIs in MAS builds.
diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
index 4f05c52e9c11de59439cddbb57bfb287a5486ad9..fba400984386f5ed980962dbe43e2e5c0d42e1e0 100644
index 179badac1553e4692022347fbfb22c57e9d00527..949f9a615d1842be4be496a4523411aa4e97a3a6 100644
--- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
+++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
@@ -156,6 +156,15 @@ void ExtractUnderlines(NSAttributedString* string,
@@ -155,6 +155,15 @@ void ExtractUnderlines(NSAttributedString* string,
} // namespace
@ -29,7 +29,7 @@ index 4f05c52e9c11de59439cddbb57bfb287a5486ad9..fba400984386f5ed980962dbe43e2e5c
// RenderWidgetHostViewCocoa ---------------------------------------------------
// Private methods:
@@ -595,6 +604,9 @@ - (BOOL)acceptsMouseEventsWhenInactive {
@@ -594,6 +603,9 @@ - (BOOL)acceptsMouseEventsWhenInactive {
}
- (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
@ -39,7 +39,7 @@ index 4f05c52e9c11de59439cddbb57bfb287a5486ad9..fba400984386f5ed980962dbe43e2e5c
return [self acceptsMouseEventsWhenInactive];
}
@@ -671,6 +683,10 @@ - (BOOL)shouldIgnoreMouseEvent:(NSEvent*)theEvent {
@@ -670,6 +682,10 @@ - (BOOL)shouldIgnoreMouseEvent:(NSEvent*)theEvent {
// its parent view.
BOOL hitSelf = NO;
while (view) {
@ -50,7 +50,7 @@ index 4f05c52e9c11de59439cddbb57bfb287a5486ad9..fba400984386f5ed980962dbe43e2e5c
if (view == self)
hitSelf = YES;
if ([view isKindOfClass:[self class]] && ![view isEqual:self] &&
@@ -990,6 +1006,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
@@ -989,6 +1005,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
eventType == NSEventTypeKeyDown &&
!(modifierFlags & NSEventModifierFlagCommand);
@ -61,7 +61,7 @@ index 4f05c52e9c11de59439cddbb57bfb287a5486ad9..fba400984386f5ed980962dbe43e2e5c
// We only handle key down events and just simply forward other events.
if (eventType != NSEventTypeKeyDown) {
_hostHelper->ForwardKeyboardEvent(event, latency_info);
@@ -1803,9 +1823,11 @@ - (NSAccessibilityRole)accessibilityRole {
@@ -1801,9 +1821,11 @@ - (NSAccessibilityRole)accessibilityRole {
// Since this implementation doesn't have to wait any IPC calls, this doesn't
// make any key-typing jank. --hbono 7/23/09
//
@ -73,7 +73,7 @@ index 4f05c52e9c11de59439cddbb57bfb287a5486ad9..fba400984386f5ed980962dbe43e2e5c
- (NSArray*)validAttributesForMarkedText {
// This code is just copied from WebKit except renaming variables.
@@ -1814,7 +1836,10 @@ - (NSArray*)validAttributesForMarkedText {
@@ -1812,7 +1834,10 @@ - (NSArray*)validAttributesForMarkedText {
initWithObjects:NSUnderlineStyleAttributeName,
NSUnderlineColorAttributeName,
NSMarkedClauseSegmentAttributeName,

2
patches/chromium/resource_file_conflict.patch
View file

@ -52,7 +52,7 @@ Some alternatives to this patch:
None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 949a855674a83db20c43982fb53f31df3bcfcd52..219f004962f0fbbe1548d8bab19c964bcc554e9b 100644
index 07a31589fd6b2bcd6e1261c3d3abb3494168b2eb..259f352a7478f5a5ab9222b58c6089ea907c9495 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1553,7 +1553,7 @@ if (is_chrome_branded && !is_android) {

4
patches/chromium/revert_roll_clang_rust_llvmorg-16-init-17653-g39da55e8-3.patch
View file

@ -45,14 +45,14 @@ index b686912d6fb5775731b07217c964dc9f0ade8309..d78a85422fcbf3afb909d5195fad2942
print('--pgo/--thinlto requires --bootstrap')
return 1
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
index 5b2289d07b9f23302a346aae180a8e18d39b9510..106849006b66b157da92df2bbf2f7016d56dc375 100755
index 8d104087f7baa04493eec9daafcfa76f077e18b7..106849006b66b157da92df2bbf2f7016d56dc375 100755
--- a/tools/clang/scripts/update.py
+++ b/tools/clang/scripts/update.py
@@ -35,11 +35,12 @@ import zlib
# https://chromium.googlesource.com/chromium/src/+/main/docs/updating_clang.md
# Reverting problematic clang rolls is safe, though.
# This is the output of `git describe` and is usable as a commit-ish.
-CLANG_REVISION = 'llvmorg-17-init-3874-g93a2fecc'
-CLANG_REVISION = 'llvmorg-17-init-4759-g547e3456'
-CLANG_SUB_REVISION = 1
+CLANG_REVISION = 'llvmorg-16-init-17653-g39da55e8'
+CLANG_SUB_REVISION = 3

2
patches/chromium/support_mixed_sandbox_with_zygote.patch
View file

@ -22,7 +22,7 @@ However, the patch would need to be reviewed by the security team, as it
does touch a security-sensitive class.
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 0781fb499a0c490939c2b0a0cfa72efcdb5eb0cc..c1b51f51354954a4020110897d90e80b09a6b79b 100644
index 0d2fedc58a7e0ec968764ebfba33e4a4aa11c177..9dfe0c331f97b11f285179881cd8c7820b4b61a5 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1794,9 +1794,15 @@ bool RenderProcessHostImpl::Init() {

6
patches/chromium/web_contents.patch
View file

@ -9,10 +9,10 @@ is needed for OSR.
Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index d0d01e4d927efa0880cff4ee43dbb8c1371f03e6..d5647fd2d482b037bbded1117c917efc00fa39ac 100644
index 220cb9a72e913e97830c58704441fdc55e2af560..9ef2e1eff9fbda6ebcd8c8e8f37201f1cf7c8718 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3170,6 +3170,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -3165,6 +3165,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
params.main_frame_name, GetOpener(), primary_main_frame_policy,
base::UnguessableToken::Create());
@ -26,7 +26,7 @@ index d0d01e4d927efa0880cff4ee43dbb8c1371f03e6..d5647fd2d482b037bbded1117c917efc
std::unique_ptr<WebContentsViewDelegate> delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -3180,6 +3187,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -3175,6 +3182,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
view_ = CreateWebContentsView(this, std::move(delegate),
&render_view_host_delegate_view_);
}

4
patches/chromium/webview_cross_drag.patch
View file

@ -24,10 +24,10 @@ index 37b75adc1ef25d1688ea63da083c8dd764e953c8..63175581edc351e3dc13caa97ab0b86d
////////////////////////////////////////////////////////////////////////////////
diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm
index d19a52391c0a38b498931638009e792bb73316f7..eb86bd94062bd0175c0e5529e463694092e738cf 100644
index 4a7153d7b6e23c372c6f4dd4b5d02eb2ed372ca0..aa165434b4db9a4663e890a4729badb322832af2 100644
--- a/content/browser/web_contents/web_drag_dest_mac.mm
+++ b/content/browser/web_contents/web_drag_dest_mac.mm
@@ -389,9 +389,7 @@ - (void)resetDragStartTrackers {
@@ -386,9 +386,7 @@ - (void)resetDragStartTrackers {
}
- (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH {

4
patches/chromium/webview_fullscreen.patch
View file

@ -14,10 +14,10 @@ Note that we also need to manually update embedder's
`api::WebContents::IsFullscreenForTabOrPending` value.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index bc41363dcc0809a839ab33bd49b856ca3f7e8fbe..60e3cfee399582b722b7702f9ba519641cd2dfcc 100644
index ecdc9ce92365c49c94267cfb85b4b56868b70376..49f36b5536f3e5f8c88e2b4bc95818dfebcb761f 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -6854,6 +6854,17 @@ void RenderFrameHostImpl::EnterFullscreen(
@@ -6862,6 +6862,17 @@ void RenderFrameHostImpl::EnterFullscreen(
}
}

6
patches/v8/build_gn.patch
View file

@ -9,10 +9,10 @@ necessary for native modules to load.
Also, some fixes relating to mksnapshot on ARM.
diff --git a/BUILD.gn b/BUILD.gn
index 9be8aa4162819f3ef71c4ee6d761a889e727e51c..f75829682551c174fdd9f7147cabf2b046f2d74f 100644
index c9ffeb8601d2929e115ff73e7af762be3df5a6b8..c9ef4bb0d47af0688bbc32e3ab2c1ccda3190a7d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -685,7 +685,7 @@ config("internal_config") {
@@ -688,7 +688,7 @@ config("internal_config") {
":cppgc_header_features",
]
@ -21,7 +21,7 @@ index 9be8aa4162819f3ef71c4ee6d761a889e727e51c..f75829682551c174fdd9f7147cabf2b0
defines += [ "BUILDING_V8_SHARED" ]
}
@@ -6359,7 +6359,7 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -6397,7 +6397,7 @@ if (current_toolchain == v8_generator_toolchain) {
"src/interpreter/bytecodes.h",
]

4
patches/v8/dcheck.patch
View file

@ -6,10 +6,10 @@ Subject: dcheck.patch
https://github.com/auchenberg/volkswagen
diff --git a/src/api/api.cc b/src/api/api.cc
index 3825787c73fbf91fbbaa54d966b640de98b4db7e..4372a3f0aa99af212ef828a0ec01fc3a9be6efac 100644
index e286ccd254497acd71b86876afba430a0032d015..32dfeb7bca5788bf653ea551be16fce120d7d796 100644
--- a/src/api/api.cc
+++ b/src/api/api.cc
@@ -9868,7 +9868,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
@@ -9894,7 +9894,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
}
void Isolate::PerformMicrotaskCheckpoint() {

4
patches/v8/do_not_export_private_v8_symbols_on_windows.patch
View file

@ -12,10 +12,10 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
contain any standard C++ library exports (e.g. `std::ostringstream`).
diff --git a/BUILD.gn b/BUILD.gn
index 31a32019635652010c84b5204e06107c4c014b94..79b459e4058ce1068bc2e580c9df993563c6a627 100644
index 8bd530b943f8a23c853a47850aebd924c363745f..c4b233efe42950a38ed0fae2308e059ed0327347 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -685,6 +685,10 @@ config("internal_config") {
@@ -688,6 +688,10 @@ config("internal_config") {
":cppgc_header_features",
]

4
patches/v8/expose_mksnapshot.patch
View file

@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
Needed in order to target mksnapshot for mksnapshot zip.
diff --git a/BUILD.gn b/BUILD.gn
index f75829682551c174fdd9f7147cabf2b046f2d74f..31a32019635652010c84b5204e06107c4c014b94 100644
index c9ef4bb0d47af0688bbc32e3ab2c1ccda3190a7d..8bd530b943f8a23c853a47850aebd924c363745f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -6371,7 +6371,6 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -6409,7 +6409,6 @@ if (current_toolchain == v8_generator_toolchain) {
if (current_toolchain == v8_snapshot_toolchain) {
v8_executable("mksnapshot") {

8
patches/v8/workaround_an_undefined_symbol_error.patch
View file

@ -12,7 +12,7 @@ By moving some functions out of the the arm64-assembler header file,
this error no longer seems to happen.
diff --git a/src/codegen/arm64/assembler-arm64.cc b/src/codegen/arm64/assembler-arm64.cc
index fbaa2ad36e8609ab66a2c6fb2294f64735f5ad97..c48373e88444f0ce4737dcc5032df706f005b0f8 100644
index f753e0bcc8221c38238da21281c20a0a17ed46c4..ae86c369f4e09187b2a935d0942a2df70d79a56c 100644
--- a/src/codegen/arm64/assembler-arm64.cc
+++ b/src/codegen/arm64/assembler-arm64.cc
@@ -3793,6 +3793,22 @@ void Assembler::MoveWide(const Register& rd, uint64_t imm, int shift,
@ -39,10 +39,10 @@ index fbaa2ad36e8609ab66a2c6fb2294f64735f5ad97..c48373e88444f0ce4737dcc5032df706
const Operand& operand, FlagsUpdate S, AddSubOp op) {
DCHECK_EQ(rd.SizeInBits(), rn.SizeInBits());
diff --git a/src/codegen/arm64/assembler-arm64.h b/src/codegen/arm64/assembler-arm64.h
index 431a1abba7a88a2c422cfb3103c5b56b57b98e30..decdee799f083ed2b62fb7f76c39511de25f0c35 100644
index 5c10dd869792ce4119d4bd984eac24367ea543d5..b07283f952815793a76dd7cdf5678f0021ecf388 100644
--- a/src/codegen/arm64/assembler-arm64.h
+++ b/src/codegen/arm64/assembler-arm64.h
@@ -2743,11 +2743,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
@@ -2744,11 +2744,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
return rm.code() << Rm_offset;
}
@ -55,7 +55,7 @@ index 431a1abba7a88a2c422cfb3103c5b56b57b98e30..decdee799f083ed2b62fb7f76c39511d
static Instr Ra(CPURegister ra) {
DCHECK_NE(ra.code(), kSPRegInternalCode);
@@ -2771,15 +2767,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
@@ -2772,15 +2768,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase {
// These encoding functions allow the stack pointer to be encoded, and
// disallow the zero register.

2
shell/browser/api/electron_api_safe_storage.cc
View file

@ -7,7 +7,7 @@
#include <string>
#include <vector>
#include "components/os_crypt/os_crypt.h"
#include "components/os_crypt/sync/os_crypt.h"
#include "shell/browser/browser.h"
#include "shell/common/gin_converters/base_converter.h"
#include "shell/common/gin_converters/callback_converter.h"

2
shell/browser/browser_process_impl.cc
View file

@ -14,7 +14,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "components/os_crypt/os_crypt.h"
#include "components/os_crypt/sync/os_crypt.h"
#include "components/prefs/in_memory_pref_store.h"
#include "components/prefs/json_pref_store.h"
#include "components/prefs/overlay_user_pref_store.h"

6
shell/browser/electron_browser_main_parts.cc
View file

@ -23,8 +23,8 @@
#include "chrome/browser/ui/color/chrome_color_mixers.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "components/os_crypt/key_storage_config_linux.h"
#include "components/os_crypt/os_crypt.h"
#include "components/os_crypt/sync/key_storage_config_linux.h"
#include "components/os_crypt/sync/os_crypt.h"
#include "content/browser/browser_main_loop.h" // nogncheck
#include "content/public/browser/browser_child_process_host_delegate.h"
#include "content/public/browser/browser_child_process_host_iterator.h"
@ -98,7 +98,7 @@
#endif
#if BUILDFLAG(IS_MAC)
#include "components/os_crypt/keychain_password_mac.h"
#include "components/os_crypt/sync/keychain_password_mac.h"
#include "shell/browser/ui/cocoa/views_delegate_mac.h"
#else
#include "shell/browser/ui/views/electron_views_delegate.h"

13
shell/browser/electron_permission_manager.cc
View file

@ -386,4 +386,17 @@ ElectronPermissionManager::GetPermissionStatusForWorker(
return GetPermissionStatus(permission, worker_origin, worker_origin);
}
blink::mojom::PermissionStatus
ElectronPermissionManager::GetPermissionStatusForEmbeddedRequester(
blink::PermissionType permission,
content::RenderFrameHost* render_frame_host,
const url::Origin& overridden_origin) {
if (render_frame_host->IsNestedWithinFencedFrame()) {
return blink::mojom::PermissionStatus::DENIED;
}
return GetPermissionStatus(
permission, overridden_origin.GetURL(),
render_frame_host->GetLastCommittedOrigin().GetURL());
}
} // namespace electron

4
shell/browser/electron_permission_manager.h
View file

@ -139,6 +139,10 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
blink::PermissionType permission,
content::RenderProcessHost* render_process_host,
const GURL& worker_origin) override;
blink::mojom::PermissionStatus GetPermissionStatusForEmbeddedRequester(
blink::PermissionType permission,
content::RenderFrameHost* render_frame_host,
const url::Origin& requesting_origin) override;
SubscriptionId SubscribePermissionStatusChange(
blink::PermissionType permission,
content::RenderProcessHost* render_process_host,

4
shell/browser/net/system_network_context_manager.cc
View file

@ -17,7 +17,7 @@
#include "chrome/common/chrome_features.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "components/os_crypt/os_crypt.h"
#include "components/os_crypt/sync/os_crypt.h"
#include "components/prefs/pref_service.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/network_service_instance.h"
@ -43,7 +43,7 @@
#include "url/gurl.h"
#if BUILDFLAG(IS_LINUX)
#include "components/os_crypt/key_storage_config_linux.h"
#include "components/os_crypt/sync/key_storage_config_linux.h"
#endif
namespace {