diff --git a/meta-chromium/recipes-browser/chromium/chromium-gn.inc b/meta-chromium/recipes-browser/chromium/chromium-gn.inc index 97f501847..78d151b6d 100644 --- a/meta-chromium/recipes-browser/chromium/chromium-gn.inc +++ b/meta-chromium/recipes-browser/chromium/chromium-gn.inc @@ -12,15 +12,13 @@ B = "${S}/${OUTPUT_DIR}" # Backported patches. SRC_URI += "\ - file://backport/IWYU-for-chrome-browser-ui-views-dark_mode_.patch \ - file://backport/IWYU-for-net-filter-zstd_source_stream.cc.patch \ - file://backport/IWYU-for-components-user_education-common-p.patch \ - file://backport/atspi-mark-possibly-unused-gn-variables.patch \ - file://backport/Revert-recent-C-20-usage-in-CFX_FillRenderO.patch \ file://backport/IWYU-for-chrome-browser-ui-tabs-organizatio.patch \ file://backport/IWYU-for-content-browser-generic_sensor-fra.patch \ file://backport/IWYU-for-g-c-service-shared_image-ozone_ima.patch \ file://backport/Make-toolchain_supports_rust_thin_lto-configurable.patch \ + file://backport/six-Update-vendored-copy-of-six-to-1.16.0.patch \ + file://backport/ToTLinux-Fix-some-narrowing-errors.patch \ + file://backport/Update-LegacyStatsCollector-to-conform-with.patch \ " # Non-specific patches. SRC_URI += "\ @@ -42,14 +40,14 @@ SRC_URI += "\ file://0016-Use-base-ranges-instead-of-std-ranges.patch \ file://0017-Use-the-correct-path-to-libclang_rt.builtins.a.patch \ file://0018-Adjust-the-Rust-build-to-our-needs.patch \ + file://0019-Don-t-require-profiler_builtins.rlib.patch \ " # ARM/AArch64-specific patches. SRC_URI:append:arm = "\ file://arm/0001-BUILD-do-not-specify-march-on-arm.patch \ - file://arm/0002-Fix-ARM-build-with-recent-glibc.patch \ - file://arm/0003-Fix-static_assert-failed-build-error-on-32-bit-ARM.patch \ + file://arm/0002-Fix-static_assert-failed-build-error-on-32-bit-ARM.patch \ " -SRC_URI:append:aarch64 = "${@bb.utils.contains('TUNE_FEATURES', 'crypto', '', ' file://arm/0004-Fix-AES-crypto-SIGILL-on-rpi4-64.patch', d)}" +SRC_URI:append:aarch64 = "${@bb.utils.contains('TUNE_FEATURES', 'crypto', '', ' file://arm/0003-Fix-AES-crypto-SIGILL-on-rpi4-64.patch', d)}" # musl-specific patches. SRC_URI:append:libc-musl = "\ diff --git a/meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_120.0.6099.224.bb b/meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_121.0.6167.184.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_120.0.6099.224.bb rename to meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_121.0.6167.184.bb diff --git a/meta-chromium/recipes-browser/chromium/chromium-x11_120.0.6099.224.bb b/meta-chromium/recipes-browser/chromium/chromium-x11_121.0.6167.184.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/chromium-x11_120.0.6099.224.bb rename to meta-chromium/recipes-browser/chromium/chromium-x11_121.0.6167.184.bb diff --git a/meta-chromium/recipes-browser/chromium/chromium.inc b/meta-chromium/recipes-browser/chromium/chromium.inc index 98455548b..3bf0e4762 100644 --- a/meta-chromium/recipes-browser/chromium/chromium.inc +++ b/meta-chromium/recipes-browser/chromium/chromium.inc @@ -4,7 +4,7 @@ HOMEPAGE = "https://www.chromium.org/Home" CVE_PRODUCT = "chromium:chromium google:chrome" SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz" -SRC_URI[sha256sum] = "850a85c8d8a01041a07dfaaea8289fa5f8294b4e375e6b77997b61434e0a2f1a" +SRC_URI[sha256sum] = "9fd6b82e7077ac26ec264bfcfc8ac8e0c2a0240378f035c9c0f34ad467aef09d" S = "${WORKDIR}/chromium-${PV}" @@ -71,7 +71,6 @@ LIC_FILES_CHKSUM = "\ file://${S}/base/third_party/superfasthash/LICENSE;md5=c66981f8ad23c9f279a5b9e07385128c \ file://${S}/base/third_party/symbolize/LICENSE;md5=17ae3b22fe8fa438966625593e2eea85 \ file://${S}/base/third_party/valgrind/LICENSE;md5=b95c9cb2560f157c60ea60ac1aa69469 \ - file://${S}/base/third_party/xdg_mime/LICENSE;md5=743a91118d40f173467c8ecfd8793c62 \ file://${S}/base/third_party/xdg_user_dirs/LICENSE;md5=d998f250c491c329a8254dd1ca62c647 \ file://${S}/chrome/browser/resources/chromeos/accessibility/chromevox/third_party/tamachiyomi/LICENSE;md5=15772cfcf7016e701ce54554516c0688 \ file://${S}/chrome/installer/mac/third_party/bsdiff/LICENSE;md5=0dbe7a50f028269750631fcbded3846a \ @@ -91,7 +90,6 @@ LIC_FILES_CHKSUM = "\ file://${S}/ios/third_party/motion_animator_objc/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/ios/third_party/motion_interchange_objc/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/ios/third_party/motion_transitioning_objc/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/native_client/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \ file://${S}/native_client_sdk/src/libraries/third_party/newlib-extras/README;md5=e944d73ca3817b7ca8656eafb9497fed \ file://${S}/net/third_party/mozilla_win/LICENSE;md5=9b13a17f35cae227ee726ee0108d72a2 \ file://${S}/net/third_party/nss/LICENSE;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ @@ -312,10 +310,11 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/libwebp/LICENSE;md5=72dceabd78c6f435bb304047aff1745a \ file://${S}/third_party/libx11/LICENSE;md5=28a27b3e1a66e95206d5645b787dad69 \ file://${S}/third_party/libxcb-keysyms/LICENSE;md5=5b0382211c6a98f8e4861daa0f3f4322 \ - file://${S}/third_party/libxml/src/Copyright;md5=2044417e2e5006b65a8b9067b683fcf1 \ + file://${S}/third_party/libxml/src/Copyright;md5=fec7ecfe714722b2bb0aaff7d200c701 \ file://${S}/third_party/libxslt/src/Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458 \ file://${S}/third_party/libyuv/LICENSE;md5=464282cfb405b005b9637f11103a7325 \ file://${S}/third_party/libzip/LICENSE;md5=6bb2408fd544544b86946e67ec2da9a0 \ + file://${S}/third_party/lit/LICENSE;md5=4b390b7b932ca7872d1de2c834797cad \ file://${S}/third_party/lottie/LICENSE;md5=827837648055a0bfb7782b91ab42eed1 \ file://${S}/third_party/lss/LICENSE;md5=dcd794613f580ae04e9633662024c7a2 \ file://${S}/third_party/lzma_sdk/LICENSE;md5=eceed1d308734c8051664bc3d1ca175e \ diff --git a/meta-chromium/recipes-browser/chromium/files/0001-Remove-the-GN-settings-done-for-clang-that-conflict-.patch b/meta-chromium/recipes-browser/chromium/files/0001-Remove-the-GN-settings-done-for-clang-that-conflict-.patch index 6c67c2b42..8adc26feb 100644 --- a/meta-chromium/recipes-browser/chromium/files/0001-Remove-the-GN-settings-done-for-clang-that-conflict-.patch +++ b/meta-chromium/recipes-browser/chromium/files/0001-Remove-the-GN-settings-done-for-clang-that-conflict-.patch @@ -21,10 +21,10 @@ Rebased-by: Randy MacLeod 1 file changed, 38 deletions(-) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 80bc79e..beeb116 100644 +index de1cd6e..38b8167 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1173,11 +1173,6 @@ config("compiler_cpu_abi") { +@@ -1175,11 +1175,6 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -36,7 +36,7 @@ index 80bc79e..beeb116 100644 if (!is_nacl) { cflags += [ "-march=$arm_arch", -@@ -1187,12 +1182,6 @@ config("compiler_cpu_abi") { +@@ -1189,12 +1184,6 @@ config("compiler_cpu_abi") { if (arm_tune != "") { cflags += [ "-mtune=$arm_tune" ] } @@ -49,7 +49,7 @@ index 80bc79e..beeb116 100644 } else if (current_cpu == "mipsel" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { -@@ -1200,9 +1189,6 @@ config("compiler_cpu_abi") { +@@ -1202,9 +1191,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mipsel-linux-android" ] ldflags += [ "--target=mipsel-linux-android" ] @@ -59,7 +59,7 @@ index 80bc79e..beeb116 100644 } } else { cflags += [ "-EL" ] -@@ -1282,8 +1268,6 @@ config("compiler_cpu_abi") { +@@ -1284,8 +1270,6 @@ config("compiler_cpu_abi") { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { if (is_clang) { @@ -68,7 +68,7 @@ index 80bc79e..beeb116 100644 } else { cflags += [ "-EB" ] ldflags += [ "-EB" ] -@@ -1331,9 +1315,6 @@ config("compiler_cpu_abi") { +@@ -1333,9 +1317,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mips64el-linux-android" ] ldflags += [ "--target=mips64el-linux-android" ] @@ -78,7 +78,7 @@ index 80bc79e..beeb116 100644 } } else { cflags += [ -@@ -1391,8 +1372,6 @@ config("compiler_cpu_abi") { +@@ -1393,8 +1374,6 @@ config("compiler_cpu_abi") { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { if (is_clang) { @@ -87,7 +87,7 @@ index 80bc79e..beeb116 100644 } else { cflags += [ "-EB", -@@ -1555,23 +1534,6 @@ config("compiler_deterministic") { +@@ -1557,23 +1536,6 @@ config("compiler_deterministic") { } } } diff --git a/meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch b/meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch index dc0ebe3b9..ef1880ebe 100644 --- a/meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch +++ b/meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch @@ -29,10 +29,10 @@ index 52504f4..40425d6 100644 "root_out_dir") + "/v8_context_snapshot_generator", diff --git a/v8/BUILD.gn b/v8/BUILD.gn -index 01159bc..b94a2ae 100644 +index f0976f9..99304bb 100644 --- a/v8/BUILD.gn +++ b/v8/BUILD.gn -@@ -2147,6 +2147,7 @@ template("run_torque") { +@@ -2162,6 +2162,7 @@ template("run_torque") { } args = [ @@ -40,7 +40,7 @@ index 01159bc..b94a2ae 100644 "./" + rebase_path( get_label_info(":torque($toolchain)", "root_out_dir") + "/torque", root_build_dir), -@@ -2304,6 +2305,7 @@ action("generate_bytecode_builtins_list") { +@@ -2319,6 +2320,7 @@ action("generate_bytecode_builtins_list") { outputs = [ "$target_gen_dir/builtins-generated/bytecodes-builtins-list.h" ] deps = [ ":bytecode_builtins_list_generator($v8_generator_toolchain)" ] args = [ @@ -48,7 +48,7 @@ index 01159bc..b94a2ae 100644 "./" + rebase_path( get_label_info( ":bytecode_builtins_list_generator($v8_generator_toolchain)", -@@ -2343,6 +2345,7 @@ template("run_mksnapshot") { +@@ -2358,6 +2360,7 @@ template("run_mksnapshot") { data = [] args = [ @@ -56,7 +56,7 @@ index 01159bc..b94a2ae 100644 "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)", "root_out_dir") + "/mksnapshot", root_build_dir), -@@ -7023,6 +7026,7 @@ if (v8_enable_i18n_support) { +@@ -7097,6 +7100,7 @@ if (v8_enable_i18n_support) { outputs = [ output_file ] args = [ diff --git a/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch b/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch index b16ad4e7e..8b3e1b844 100644 --- a/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch +++ b/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch @@ -13,10 +13,10 @@ Signed-off-by: Randy MacLeod 1 file changed, 5 insertions(+) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index beeb116..c19ac04 100644 +index 38b8167..93c9bfc 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1817,6 +1817,11 @@ config("default_warnings") { +@@ -1819,6 +1819,11 @@ config("default_warnings") { cflags += [ "-Wenum-compare-conditional", diff --git a/meta-chromium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch b/meta-chromium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch index efdb26d0b..ccb0f4574 100644 --- a/meta-chromium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch +++ b/meta-chromium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch @@ -18,10 +18,10 @@ Signed-off-by: Randy MacLeod 2 files changed, 4 insertions(+) diff --git a/base/BUILD.gn b/base/BUILD.gn -index 24f2397..b716e48 100644 +index 3d538b3..a7f353b 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -1105,7 +1105,9 @@ component("base") { +@@ -1098,7 +1098,9 @@ component("base") { # Needed for if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. diff --git a/meta-chromium/recipes-browser/chromium/files/0006-Revert-__attribute__-and-alignas-changes.patch b/meta-chromium/recipes-browser/chromium/files/0006-Revert-__attribute__-and-alignas-changes.patch index a5a99ae0a..9c5c5990c 100644 --- a/meta-chromium/recipes-browser/chromium/files/0006-Revert-__attribute__-and-alignas-changes.patch +++ b/meta-chromium/recipes-browser/chromium/files/0006-Revert-__attribute__-and-alignas-changes.patch @@ -86,7 +86,7 @@ index 30be67c..1788239 100644 #endif diff --git a/base/compiler_specific.h b/base/compiler_specific.h -index 26bf04f..105abd3 100644 +index 6e45f97..31cffde 100644 --- a/base/compiler_specific.h +++ b/base/compiler_specific.h @@ -42,7 +42,7 @@ @@ -98,7 +98,7 @@ index 26bf04f..105abd3 100644 #elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline) #define NOINLINE __attribute__((noinline)) #elif defined(COMPILER_MSVC) -@@ -52,7 +52,7 @@ +@@ -61,7 +61,7 @@ #endif #if defined(__clang__) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline) @@ -107,7 +107,7 @@ index 26bf04f..105abd3 100644 #elif defined(COMPILER_GCC) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline) #define ALWAYS_INLINE inline __attribute__((__always_inline__)) #elif defined(COMPILER_MSVC) && defined(NDEBUG) -@@ -82,14 +82,23 @@ +@@ -91,14 +91,23 @@ // // In most places you can use the C++11 keyword "alignas", which is preferred. // diff --git a/meta-chromium/recipes-browser/chromium/files/0007-Add-missing-typename-s.patch b/meta-chromium/recipes-browser/chromium/files/0007-Add-missing-typename-s.patch index 6d3cb1454..f8de11921 100644 --- a/meta-chromium/recipes-browser/chromium/files/0007-Add-missing-typename-s.patch +++ b/meta-chromium/recipes-browser/chromium/files/0007-Add-missing-typename-s.patch @@ -68,10 +68,10 @@ index 3fb1520..7d1723f 100644 IterMap& iter_map) { CHECK(iter != cache.end()); diff --git a/components/optimization_guide/core/tflite_model_executor.h b/components/optimization_guide/core/tflite_model_executor.h -index bbb5208..a256a85 100644 +index 5c65a65..d629125 100644 --- a/components/optimization_guide/core/tflite_model_executor.h +++ b/components/optimization_guide/core/tflite_model_executor.h -@@ -240,7 +240,7 @@ class TFLiteModelExecutor : public ModelExecutor { +@@ -241,7 +241,7 @@ class TFLiteModelExecutor : public ModelExecutor { void SendForBatchExecution( BatchExecutionCallback callback_on_complete, base::TimeTicks start_time, @@ -80,7 +80,7 @@ index bbb5208..a256a85 100644 override { DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -262,7 +262,7 @@ class TFLiteModelExecutor : public ModelExecutor { +@@ -263,7 +263,7 @@ class TFLiteModelExecutor : public ModelExecutor { // Starts the synchronous execution of the model. Returns model outputs. // Model needs to be loaded. Synchronous calls do not load or unload model. std::vector> SendForBatchExecutionSync( @@ -89,7 +89,7 @@ index bbb5208..a256a85 100644 override { DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -417,7 +417,7 @@ class TFLiteModelExecutor : public ModelExecutor { +@@ -421,7 +421,7 @@ class TFLiteModelExecutor : public ModelExecutor { // executes it on the model execution thread. void LoadModelFileAndBatchExecute( BatchExecutionCallback callback_on_complete, @@ -98,7 +98,7 @@ index bbb5208..a256a85 100644 DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -434,7 +434,7 @@ class TFLiteModelExecutor : public ModelExecutor { +@@ -438,7 +438,7 @@ class TFLiteModelExecutor : public ModelExecutor { // Batch executes the loaded model for inputs. void BatchExecuteLoadedModel( @@ -107,7 +107,7 @@ index bbb5208..a256a85 100644 std::vector>* outputs) { DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -494,7 +494,7 @@ class TFLiteModelExecutor : public ModelExecutor { +@@ -498,7 +498,7 @@ class TFLiteModelExecutor : public ModelExecutor { // Unloads the model if needed. void BatchExecuteLoadedModelAndRunCallback( BatchExecutionCallback callback_on_complete, @@ -117,10 +117,10 @@ index bbb5208..a256a85 100644 DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); diff --git a/components/supervised_user/core/browser/proto_fetcher.cc b/components/supervised_user/core/browser/proto_fetcher.cc -index 26a121a..802fb92 100644 +index e9a7aa7..432cc61 100644 --- a/components/supervised_user/core/browser/proto_fetcher.cc +++ b/components/supervised_user/core/browser/proto_fetcher.cc -@@ -526,7 +526,7 @@ class RetryingFetcherImpl final : public DeferredFetcherImpl { +@@ -528,7 +528,7 @@ class RetryingFetcherImpl final : public DeferredFetcherImpl { RetryingFetcherImpl(const RetryingFetcherImpl&) = delete; RetryingFetcherImpl& operator=(const RetryingFetcherImpl&) = delete; @@ -129,7 +129,7 @@ index 26a121a..802fb92 100644 callback_ = std::move(callback); Retry(); } -@@ -564,7 +564,7 @@ class RetryingFetcherImpl final : public DeferredFetcherImpl { +@@ -566,7 +566,7 @@ class RetryingFetcherImpl final : public DeferredFetcherImpl { } // Client callback. @@ -138,7 +138,7 @@ index 26a121a..802fb92 100644 // Retry controls. base::OneShotTimer timer_; -@@ -707,7 +707,7 @@ ParallelFetchManager::ParallelFetchManager( +@@ -709,7 +709,7 @@ ParallelFetchManager::ParallelFetchManager( template void ParallelFetchManager::Fetch( const Request& request, @@ -148,7 +148,7 @@ index 26a121a..802fb92 100644 KeyType key = requests_in_flight_.Add(MakeFetcher(request)); requests_in_flight_.Lookup(key)->Start( diff --git a/components/supervised_user/core/browser/proto_fetcher.h b/components/supervised_user/core/browser/proto_fetcher.h -index 8266c99d7..9c41978 100644 +index 1650e77..ad9832d 100644 --- a/components/supervised_user/core/browser/proto_fetcher.h +++ b/components/supervised_user/core/browser/proto_fetcher.h @@ -165,10 +165,10 @@ class ParallelFetchManager { @@ -205,7 +205,7 @@ index b4f3b0d..4fff750 100644 }; diff --git a/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc b/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc -index 83ef203e..b211f43 100644 +index 04b38ac..9457bff 100644 --- a/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc +++ b/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc @@ -172,7 +172,7 @@ class HTMLFastPathParser { diff --git a/meta-chromium/recipes-browser/chromium/files/0008-Don-t-pass-unknown-LLVM-options.patch b/meta-chromium/recipes-browser/chromium/files/0008-Don-t-pass-unknown-LLVM-options.patch index a9164e18a..ee34107f9 100644 --- a/meta-chromium/recipes-browser/chromium/files/0008-Don-t-pass-unknown-LLVM-options.patch +++ b/meta-chromium/recipes-browser/chromium/files/0008-Don-t-pass-unknown-LLVM-options.patch @@ -18,7 +18,7 @@ Signed-off-by: Max Ihlenfeldt 1 file changed, 25 deletions(-) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 80bc79e..715bffc 100644 +index 93c9bfc..94e40fa 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -616,24 +616,6 @@ config("compiler") { diff --git a/meta-chromium/recipes-browser/chromium/files/0009-Avoid-capturing-structured-bindings.patch b/meta-chromium/recipes-browser/chromium/files/0009-Avoid-capturing-structured-bindings.patch index b58d00b63..126138b77 100644 --- a/meta-chromium/recipes-browser/chromium/files/0009-Avoid-capturing-structured-bindings.patch +++ b/meta-chromium/recipes-browser/chromium/files/0009-Avoid-capturing-structured-bindings.patch @@ -16,10 +16,10 @@ Signed-off-by: Max Ihlenfeldt 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/content/browser/service_worker/service_worker_context_wrapper.cc b/content/browser/service_worker/service_worker_context_wrapper.cc -index 36e307e..2bdbb60 100644 +index 630b04c..8f2b834 100644 --- a/content/browser/service_worker/service_worker_context_wrapper.cc +++ b/content/browser/service_worker/service_worker_context_wrapper.cc -@@ -1456,9 +1456,10 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingWarmUpRequest() { +@@ -1473,9 +1473,10 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingWarmUpRequest() { auto [document_url, key, callback] = std::move(*request); DCHECK(document_url.is_valid()); @@ -32,7 +32,7 @@ index 36e307e..2bdbb60 100644 context_core_->registry()->FindRegistrationForClientUrl( ServiceWorkerRegistry::Purpose::kNotForNavigation, diff --git a/media/base/cdm_promise_adapter.cc b/media/base/cdm_promise_adapter.cc -index f013809a..144809b 100644 +index f013809..144809b 100644 --- a/media/base/cdm_promise_adapter.cc +++ b/media/base/cdm_promise_adapter.cc @@ -94,12 +94,12 @@ void CdmPromiseAdapter::RejectPromise(uint32_t promise_id, @@ -53,13 +53,13 @@ index f013809a..144809b 100644 promises_.clear(); } diff --git a/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc b/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc -index 6091eade..95db975 100644 +index 33deaeb..3b283c6 100644 --- a/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc +++ b/third_party/blink/renderer/core/layout/grid/grid_layout_algorithm.cc -@@ -3447,7 +3447,9 @@ void GridLayoutAlgorithm::PlaceGridItems( +@@ -3527,7 +3527,9 @@ void GridLayoutAlgorithm::PlaceGridItems( DCHECK(out_row_break_between); - const auto& container_space = ConstraintSpace(); + const auto& container_space = GetConstraintSpace(); - const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData(); + const auto& grid_items = sizing_tree.TreeRootData().grid_items; + const auto& layout_data = sizing_tree.TreeRootData().layout_data; @@ -67,10 +67,10 @@ index 6091eade..95db975 100644 const auto* cached_layout_subtree = container_space.GetGridLayoutSubtree(); const auto container_writing_direction = -@@ -3611,7 +3613,9 @@ void GridLayoutAlgorithm::PlaceGridItemsForFragmentation( +@@ -3691,7 +3693,9 @@ void GridLayoutAlgorithm::PlaceGridItemsForFragmentation( // TODO(ikilpatrick): Update |SetHasSeenAllChildren| and early exit if true. - const auto& constraint_space = ConstraintSpace(); + const auto& constraint_space = GetConstraintSpace(); - const auto& [grid_items, layout_data, tree_size] = sizing_tree.TreeRootData(); + const auto& grid_items = sizing_tree.TreeRootData().grid_items; + const auto& layout_data = sizing_tree.TreeRootData().layout_data; diff --git a/meta-chromium/recipes-browser/chromium/files/0010-Revert-Reland-Reland-mte-refactor-the-tagging-functi.patch b/meta-chromium/recipes-browser/chromium/files/0010-Revert-Reland-Reland-mte-refactor-the-tagging-functi.patch index 6c70f1a22..06994f628 100644 --- a/meta-chromium/recipes-browser/chromium/files/0010-Revert-Reland-Reland-mte-refactor-the-tagging-functi.patch +++ b/meta-chromium/recipes-browser/chromium/files/0010-Revert-Reland-Reland-mte-refactor-the-tagging-functi.patch @@ -29,7 +29,7 @@ Signed-off-by: Max Ihlenfeldt 4 files changed, 48 insertions(+), 15 deletions(-) diff --git a/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc b/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc -index a0e8d36..3d732f8 100644 +index 5943a76..c1081d9 100644 --- a/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc +++ b/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc @@ -963,6 +963,10 @@ void PartitionRoot::Init(PartitionOptions opts) { @@ -44,7 +44,7 @@ index a0e8d36..3d732f8 100644 // Reserve address space for partition alloc. internal::PartitionAddressSpace::Init(); diff --git a/base/allocator/partition_allocator/src/partition_alloc/tagging.cc b/base/allocator/partition_allocator/src/partition_alloc/tagging.cc -index 9b44119..a6589af 100644 +index 7590ba0..5edcb7b 100644 --- a/base/allocator/partition_allocator/src/partition_alloc/tagging.cc +++ b/base/allocator/partition_allocator/src/partition_alloc/tagging.cc @@ -12,9 +12,7 @@ @@ -140,7 +140,7 @@ index 9b44119..a6589af 100644 TagViolationReportingMode GetMemoryTaggingModeForCurrentThread() { #if PA_CONFIG(HAS_MEMORY_TAGGING) diff --git a/base/allocator/partition_allocator/src/partition_alloc/tagging.h b/base/allocator/partition_allocator/src/partition_alloc/tagging.h -index 12ad5e9..19c904c 100644 +index 5e261fa..5c5669c 100644 --- a/base/allocator/partition_allocator/src/partition_alloc/tagging.h +++ b/base/allocator/partition_allocator/src/partition_alloc/tagging.h @@ -60,23 +60,39 @@ void ChangeMemoryTaggingModeForAllThreadsPerProcess(TagViolationReportingMode); @@ -213,7 +213,7 @@ index 12ad5e9..19c904c 100644 return ptr; #endif diff --git a/base/allocator/partition_allocator/src/partition_alloc/tagging_unittest.cc b/base/allocator/partition_allocator/src/partition_alloc/tagging_unittest.cc -index c0d0f84..07869a8 100644 +index 7aa5b9b..8bdd138 100644 --- a/base/allocator/partition_allocator/src/partition_alloc/tagging_unittest.cc +++ b/base/allocator/partition_allocator/src/partition_alloc/tagging_unittest.cc @@ -16,6 +16,7 @@ namespace partition_alloc::internal { diff --git a/meta-chromium/recipes-browser/chromium/files/0011-Avoid-parenthesized-initialization-of-aggregates.patch b/meta-chromium/recipes-browser/chromium/files/0011-Avoid-parenthesized-initialization-of-aggregates.patch index a09e3b839..510dd1e0b 100644 --- a/meta-chromium/recipes-browser/chromium/files/0011-Avoid-parenthesized-initialization-of-aggregates.patch +++ b/meta-chromium/recipes-browser/chromium/files/0011-Avoid-parenthesized-initialization-of-aggregates.patch @@ -76,10 +76,10 @@ index dd3b5db..3049638 100644 void TraceLog::OnStart(const perfetto::DataSourceBase::StartArgs&) { diff --git a/chrome/browser/content_settings/one_time_permission_provider.h b/chrome/browser/content_settings/one_time_permission_provider.h -index a1d0f44..2f3b4f0 100644 +index c01abdb..7dafb7c 100644 --- a/chrome/browser/content_settings/one_time_permission_provider.h +++ b/chrome/browser/content_settings/one_time_permission_provider.h -@@ -94,6 +94,7 @@ class OneTimePermissionProvider +@@ -101,6 +101,7 @@ class OneTimePermissionProvider ContentSettingsType type; ContentSettingsPattern primary_pattern; ContentSettingsPattern secondary_pattern; @@ -120,10 +120,10 @@ index 8fa4739..ec4a7b8 100644 if (browser_) { auto navigation = chrome::OpenCurrentURL(browser_); diff --git a/chrome/browser/ui/safety_hub/menu_notification_service.cc b/chrome/browser/ui/safety_hub/menu_notification_service.cc -index db022ca..1f0ee67 100644 +index 674ef96..378fb1f 100644 --- a/chrome/browser/ui/safety_hub/menu_notification_service.cc +++ b/chrome/browser/ui/safety_hub/menu_notification_service.cc -@@ -148,8 +148,8 @@ SafetyHubMenuNotificationService::GetNotificationToShow() { +@@ -158,8 +158,8 @@ SafetyHubMenuNotificationService::GetNotificationToShow() { // The information related to showing the notification needs to be persisted // as well. SaveNotificationsToPrefs(); @@ -135,10 +135,10 @@ index db022ca..1f0ee67 100644 absl::optional diff --git a/chrome/browser/ui/views/permissions/embedded_permission_prompt_ask_view.cc b/chrome/browser/ui/views/permissions/embedded_permission_prompt_ask_view.cc -index fe86415..70af55d 100644 +index b750171..98b7450 100644 --- a/chrome/browser/ui/views/permissions/embedded_permission_prompt_ask_view.cc +++ b/chrome/browser/ui/views/permissions/embedded_permission_prompt_ask_view.cc -@@ -45,8 +45,8 @@ EmbeddedPermissionPromptAskView::GetRequestLinesConfiguration() const { +@@ -49,8 +49,8 @@ EmbeddedPermissionPromptAskView::GetRequestLinesConfiguration() const { std::vector lines; for (auto* request : delegate()->Requests()) { @@ -149,7 +149,7 @@ index fe86415..70af55d 100644 } return lines; } -@@ -55,12 +55,12 @@ std::vector +@@ -59,12 +59,12 @@ std::vector EmbeddedPermissionPromptAskView::GetButtonsConfiguration() const { std::vector buttons; if (base::FeatureList::IsEnabled(permissions::features::kOneTimePermission)) { @@ -160,14 +160,14 @@ index fe86415..70af55d 100644 + ButtonType::kAllowThisTime, ui::ButtonStyle::kTonal}); } - buttons.emplace_back(l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW), -- ButtonType::kAllow, ui::ButtonStyle::kTonal); +- ButtonType::kAllow, ui::ButtonStyle::kTonal, kAllowId); + buttons.push_back(ButtonConfiguration {l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW), -+ ButtonType::kAllow, ui::ButtonStyle::kTonal}); ++ ButtonType::kAllow, ui::ButtonStyle::kTonal, kAllowId}); return buttons; } diff --git a/chrome/browser/ui/views/permissions/embedded_permission_prompt_policy_view.cc b/chrome/browser/ui/views/permissions/embedded_permission_prompt_policy_view.cc -index 4bfc22e..cbb108d 100644 +index 31c9296..5ade1f5 100644 --- a/chrome/browser/ui/views/permissions/embedded_permission_prompt_policy_view.cc +++ b/chrome/browser/ui/views/permissions/embedded_permission_prompt_policy_view.cc @@ -40,7 +40,7 @@ void EmbeddedPermissionPromptPolicyView::RunButtonCallback(int button_id) { @@ -191,10 +191,10 @@ index 4bfc22e..cbb108d 100644 } diff --git a/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_denied_view.cc b/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_denied_view.cc -index d0e056c..ff974ab 100644 +index 2de5d47..61f5158 100644 --- a/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_denied_view.cc +++ b/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_denied_view.cc -@@ -63,18 +63,18 @@ EmbeddedPermissionPromptPreviouslyDeniedView::GetRequestLinesConfiguration() +@@ -66,17 +66,17 @@ EmbeddedPermissionPromptPreviouslyDeniedView::GetRequestLinesConfiguration() std::vector EmbeddedPermissionPromptPreviouslyDeniedView::GetButtonsConfiguration() const { std::vector buttons; @@ -208,22 +208,21 @@ index d0e056c..ff974ab 100644 - buttons.emplace_back( + buttons.push_back(ButtonConfiguration { l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW_THIS_TIME), -- ButtonType::kAllowThisTime, ui::ButtonStyle::kTonal); -+ ButtonType::kAllowThisTime, ui::ButtonStyle::kTonal}); +- ButtonType::kAllowThisTime, ui::ButtonStyle::kTonal, kAllowThisTimeId); ++ ButtonType::kAllowThisTime, ui::ButtonStyle::kTonal, kAllowThisTimeId}); } else { -- buttons.emplace_back( -+ buttons.push_back(ButtonConfiguration { - l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW_THIS_TIME), -- ButtonType::kAllow, ui::ButtonStyle::kTonal); -+ ButtonType::kAllow, ui::ButtonStyle::kTonal}); +- buttons.emplace_back(l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW), +- ButtonType::kAllow, ui::ButtonStyle::kTonal); ++ buttons.push_back(ButtonConfiguration {l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW), ++ ButtonType::kAllow, ui::ButtonStyle::kTonal}); } return buttons; } diff --git a/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_granted_view.cc b/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_granted_view.cc -index eb1fdab..d29c875 100644 +index 44454db..f2cb045 100644 --- a/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_granted_view.cc +++ b/chrome/browser/ui/views/permissions/embedded_permission_prompt_previously_granted_view.cc -@@ -57,13 +57,13 @@ EmbeddedPermissionPromptPreviouslyGrantedView::GetRequestLinesConfiguration() +@@ -61,13 +61,13 @@ EmbeddedPermissionPromptPreviouslyGrantedView::GetRequestLinesConfiguration() std::vector EmbeddedPermissionPromptPreviouslyGrantedView::GetButtonsConfiguration() const { std::vector buttons; @@ -236,8 +235,8 @@ index eb1fdab..d29c875 100644 - buttons.emplace_back( + buttons.push_back(ButtonConfiguration { l10n_util::GetStringUTF16(IDS_EMBEDDED_PROMPT_STOP_ALLOWING), -- ButtonType::kStopAllowing, ui::ButtonStyle::kTonal); -+ ButtonType::kStopAllowing, ui::ButtonStyle::kTonal}); +- ButtonType::kStopAllowing, ui::ButtonStyle::kTonal, kStopAllowingId); ++ ButtonType::kStopAllowing, ui::ButtonStyle::kTonal, kStopAllowingId}); return buttons; } @@ -254,7 +253,7 @@ index 8c13bd3..42dc1ac 100644 // User-Agent Client Hints diff --git a/components/autofill/core/browser/contact_info_sync_util.cc b/components/autofill/core/browser/contact_info_sync_util.cc -index cd64ad7..5a2059d 100644 +index ad9f3a2..f4aa0f3 100644 --- a/components/autofill/core/browser/contact_info_sync_util.cc +++ b/components/autofill/core/browser/contact_info_sync_util.cc @@ -197,9 +197,9 @@ class ContactInfoProfileSetter { @@ -271,10 +270,10 @@ index cd64ad7..5a2059d 100644 } } diff --git a/components/autofill/core/browser/webdata/autofill_table.cc b/components/autofill/core/browser/webdata/autofill_table.cc -index 1556b59..7f49f90 100644 +index be722d3..f3b3779 100644 --- a/components/autofill/core/browser/webdata/autofill_table.cc +++ b/components/autofill/core/browser/webdata/autofill_table.cc -@@ -1763,10 +1763,10 @@ std::unique_ptr AutofillTable::GetAutofillProfile( +@@ -1736,10 +1736,10 @@ std::unique_ptr AutofillTable::GetAutofillProfile( } base::span observations_data = s.ColumnBlob(3); @@ -288,23 +287,23 @@ index 1556b59..7f49f90 100644 if (type == ADDRESS_HOME_COUNTRY) { country_code = base::UTF16ToUTF8(s.ColumnString16(1)); diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc -index 87fcc61..3ecbe08 100644 +index 85006f2..1b11173 100644 --- a/components/password_manager/core/browser/password_manager.cc +++ b/components/password_manager/core/browser/password_manager.cc -@@ -630,7 +630,7 @@ void PasswordManager::OnUserModifiedNonPasswordField( - // |driver| might be empty on iOS or in tests. - int driver_id = driver ? driver->GetId() : 0; - possible_usernames_.Put( -- PossibleUsernameFieldIdentifier(driver_id, renderer_id), -+ PossibleUsernameFieldIdentifier {driver_id, renderer_id}, - PossibleUsernameData(GetSignonRealm(driver->GetLastCommittedURL()), - renderer_id, value, base::Time::Now(), driver_id, - autocomplete_attribute_has_username, is_likely_otp)); +@@ -666,7 +666,7 @@ void PasswordManager::OnUserModifiedNonPasswordField( + it->second.last_change = base::Time::Now(); + } else { + possible_usernames_.Put( +- PossibleUsernameFieldIdentifier(driver_id, renderer_id), ++ PossibleUsernameFieldIdentifier {driver_id, renderer_id}, + PossibleUsernameData(GetSignonRealm(driver->GetLastCommittedURL()), + renderer_id, value, base::Time::Now(), driver_id, + autocomplete_attribute_has_username, diff --git a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc -index 17718f3..7a2e637 100644 +index 9c9330a..3d44fbc 100644 --- a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc +++ b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc -@@ -1567,7 +1567,7 @@ void SkiaOutputSurfaceImplOnGpu::CopyOutputNV12( +@@ -1564,7 +1564,7 @@ void SkiaOutputSurfaceImplOnGpu::CopyOutputNV12( // Issue readbacks from the surfaces: for (size_t i = 0; i < CopyOutputResult::kNV12MaxPlanes; ++i) { @@ -329,10 +328,10 @@ index 5bd4ca1..6e44c89 100644 download::DownloadSaveItemData::AttachItemData(download_, std::move(files)); } diff --git a/content/browser/interest_group/interest_group_storage.cc b/content/browser/interest_group/interest_group_storage.cc -index 22a183f..c5faf4e 100644 +index 5910acf..13714dc 100644 --- a/content/browser/interest_group/interest_group_storage.cc +++ b/content/browser/interest_group/interest_group_storage.cc -@@ -3002,10 +3002,10 @@ DoGetKAnonymityData(sql::Database& db, +@@ -3179,10 +3179,10 @@ DoGetKAnonymityData(sql::Database& db, std::vector k_anon_data; while (interest_group_kanon_query.Step()) { @@ -346,43 +345,43 @@ index 22a183f..c5faf4e 100644 if (!interest_group_kanon_query.Succeeded()) { return absl::nullopt; diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc -index c1a7128..e5a80e7 100644 +index 17683fa..d92fa21 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -8685,7 +8685,7 @@ void RenderFrameHostImpl::SendFencedFrameReportingBeacon( +@@ -8561,7 +8561,7 @@ void RenderFrameHostImpl::SendFencedFrameReportingBeacon( for (const blink::FencedFrame::ReportingDestination& destination : destinations) { SendFencedFrameReportingBeaconInternal( - DestinationEnumEvent(event_type, event_data), destination, + DestinationEnumEvent {event_type, event_data}, destination, - /*from_renderer=*/true, attribution_reporting_runtime_features); + attribution_reporting_runtime_features); } } -@@ -8720,7 +8720,7 @@ void RenderFrameHostImpl::SendFencedFrameReportingBeaconToCustomURL( +@@ -8593,7 +8593,7 @@ void RenderFrameHostImpl::SendFencedFrameReportingBeaconToCustomURL( } SendFencedFrameReportingBeaconInternal( - DestinationURLEvent(destination_url), + DestinationURLEvent {destination_url}, blink::FencedFrame::ReportingDestination::kBuyer, - /*from_renderer=*/true, attribution_reporting_runtime_features); + attribution_reporting_runtime_features); } -@@ -8820,7 +8820,7 @@ void RenderFrameHostImpl::MaybeSendFencedFrameAutomaticReportingBeacon( +@@ -8730,7 +8730,7 @@ void RenderFrameHostImpl::MaybeSendFencedFrameAutomaticReportingBeacon( data = info->data; } initiator_rfh->SendFencedFrameReportingBeaconInternal( - AutomaticBeaconEvent(event_type, data), destination, + AutomaticBeaconEvent {event_type, data}, destination, - /*from_renderer=*/false, attribution_reporting_features, - navigation_request.GetNavigationId()); + attribution_reporting_features, navigation_request.GetNavigationId()); } -@@ -8832,7 +8832,7 @@ void RenderFrameHostImpl::MaybeSendFencedFrameAutomaticReportingBeacon( + } else { +@@ -8741,7 +8741,7 @@ void RenderFrameHostImpl::MaybeSendFencedFrameAutomaticReportingBeacon( for (blink::FencedFrame::ReportingDestination destination : info->destinations) { initiator_rfh->SendFencedFrameReportingBeaconInternal( - AutomaticBeaconEvent(event_type, info->data), destination, + AutomaticBeaconEvent {event_type, info->data}, destination, - /*from_renderer=*/false, info->attribution_reporting_runtime_features, + info->attribution_reporting_runtime_features, navigation_request.GetNavigationId()); } diff --git a/net/dns/host_resolver_cache.cc b/net/dns/host_resolver_cache.cc @@ -418,10 +417,10 @@ index fb635d9..46c7f89 100644 default: NOTREACHED(); diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc -index b3624fc..ade6d05 100644 +index 848ede9..5b4775b 100644 --- a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc +++ b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope.cc -@@ -2791,9 +2791,9 @@ void ServiceWorkerGlobalScope::InsertNewItemToRaceNetworkRequests( +@@ -2792,9 +2792,9 @@ void ServiceWorkerGlobalScope::InsertNewItemToRaceNetworkRequests( url_loader_factory, const KURL& request_url) { auto race_network_request_token = String(token.ToString()); diff --git a/meta-chromium/recipes-browser/chromium/files/0012-Fix-constexpr-variable-cannot-have-non-literal-type-.patch b/meta-chromium/recipes-browser/chromium/files/0012-Fix-constexpr-variable-cannot-have-non-literal-type-.patch index 08e15cbe8..ae9a15371 100644 --- a/meta-chromium/recipes-browser/chromium/files/0012-Fix-constexpr-variable-cannot-have-non-literal-type-.patch +++ b/meta-chromium/recipes-browser/chromium/files/0012-Fix-constexpr-variable-cannot-have-non-literal-type-.patch @@ -45,10 +45,10 @@ index b8f0b48..e24c144 100644 switch (type) { case SensorType::AMBIENT_LIGHT: diff --git a/ui/base/wayland/color_manager_util.h b/ui/base/wayland/color_manager_util.h -index 2efa825..49ec648 100644 +index 6496db3..d804fed 100644 --- a/ui/base/wayland/color_manager_util.h +++ b/ui/base/wayland/color_manager_util.h -@@ -48,7 +48,7 @@ struct RangeVersion { +@@ -53,7 +53,7 @@ struct RangeVersion { // A map from the zcr_color_manager_v1 chromaticity_names enum values // representing well-known chromaticities, to their equivalent PrimaryIDs. // See components/exo/wayland/protocol/chrome-color-management.xml @@ -57,7 +57,7 @@ index 2efa825..49ec648 100644 zcr_color_manager_v1_chromaticity_names, PrimaryVersion>( {{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT601_525_LINE, -@@ -103,7 +103,7 @@ constexpr auto kChromaticityMap = base::MakeFixedFlatMap< +@@ -108,7 +108,7 @@ constexpr auto kChromaticityMap = base::MakeFixedFlatMap< // A map from the zcr_color_manager_v1 eotf_names enum values // representing well-known EOTFs, to their equivalent TransferIDs. // See components/exo/wayland/protocol/chrome-color-management.xml @@ -66,7 +66,7 @@ index 2efa825..49ec648 100644 zcr_color_manager_v1_eotf_names, TransferVersion>({ {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR, -@@ -174,7 +174,7 @@ constexpr auto kEotfMap = base::MakeFixedFlatMap< +@@ -179,7 +179,7 @@ constexpr auto kEotfMap = base::MakeFixedFlatMap< // A map from the SDR zcr_color_manager_v1 eotf_names enum values // representing well-known EOTFs, to their equivalent transfer functions. // See components/exo/wayland/protocol/chrome-color-management.xml @@ -75,7 +75,7 @@ index 2efa825..49ec648 100644 base::MakeFixedFlatMap({ {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR, TransferFnVersion(SkNamedTransferFn::kLinear, kDefaultSinceVersion)}, -@@ -194,7 +194,7 @@ constexpr auto kTransferMap = +@@ -199,7 +199,7 @@ constexpr auto kTransferMap = // A map from the HDR zcr_color_manager_v1 eotf_names enum values // representing well-known EOTFs, to their equivalent transfer functions. // See components/exo/wayland/protocol/chrome-color-management.xml @@ -84,7 +84,7 @@ index 2efa825..49ec648 100644 base::MakeFixedFlatMap( {{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR, TransferFnVersion(SkNamedTransferFn::kLinear, kDefaultSinceVersion)}, -@@ -214,7 +214,7 @@ constexpr auto kHDRTransferMap = +@@ -219,7 +219,7 @@ constexpr auto kHDRTransferMap = // A map from zcr_color_manager_v1 matrix_names enum values to // gfx::ColorSpace::MatrixIDs. @@ -93,7 +93,7 @@ index 2efa825..49ec648 100644 base::MakeFixedFlatMap( {{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_RGB, MatrixVersion(gfx::ColorSpace::MatrixID::RGB, kDefaultSinceVersion)}, -@@ -251,7 +251,7 @@ constexpr auto kMatrixMap = +@@ -256,7 +256,7 @@ constexpr auto kMatrixMap = // A map from zcr_color_manager_v1 range_names enum values to // gfx::ColorSpace::RangeIDs. diff --git a/meta-chromium/recipes-browser/chromium/files/0013-Fix-undefined-symbol-PaintOpWriter-SerializedSize-un.patch b/meta-chromium/recipes-browser/chromium/files/0013-Fix-undefined-symbol-PaintOpWriter-SerializedSize-un.patch index c2511daba..28b22a647 100644 --- a/meta-chromium/recipes-browser/chromium/files/0013-Fix-undefined-symbol-PaintOpWriter-SerializedSize-un.patch +++ b/meta-chromium/recipes-browser/chromium/files/0013-Fix-undefined-symbol-PaintOpWriter-SerializedSize-un.patch @@ -19,7 +19,7 @@ Signed-off-by: Max Ihlenfeldt 1 file changed, 8 insertions(+) diff --git a/cc/paint/paint_op_writer.h b/cc/paint/paint_op_writer.h -index 26bb335..08c1532 100644 +index f9d2356..59e39ca 100644 --- a/cc/paint/paint_op_writer.h +++ b/cc/paint/paint_op_writer.h @@ -130,6 +130,9 @@ class CC_PAINT_EXPORT PaintOpWriter { diff --git a/meta-chromium/recipes-browser/chromium/files/0014-Fix-implicitly-deleted-default-constructor-build-err.patch b/meta-chromium/recipes-browser/chromium/files/0014-Fix-implicitly-deleted-default-constructor-build-err.patch index a92f4f13b..82f704f05 100644 --- a/meta-chromium/recipes-browser/chromium/files/0014-Fix-implicitly-deleted-default-constructor-build-err.patch +++ b/meta-chromium/recipes-browser/chromium/files/0014-Fix-implicitly-deleted-default-constructor-build-err.patch @@ -15,21 +15,19 @@ Signed-off-by: Max Ihlenfeldt 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/browser/interest_group/header_direct_from_seller_signals.h b/content/browser/interest_group/header_direct_from_seller_signals.h -index 59c695e..6dcbc2d 100644 +index 5d65455..4f23909 100644 --- a/content/browser/interest_group/header_direct_from_seller_signals.h +++ b/content/browser/interest_group/header_direct_from_seller_signals.h -@@ -97,11 +97,11 @@ class CONTENT_EXPORT HeaderDirectFromSellerSignals { - } +@@ -69,9 +69,9 @@ class CONTENT_EXPORT HeaderDirectFromSellerSignals { + friend class base::RefCounted; + ~Result(); - private: -- const absl::optional seller_signals_; -+ const absl::optional seller_signals_ = absl::nullopt; +- const absl::optional seller_signals_; +- const absl::optional auction_signals_; +- const base::flat_map per_buyer_signals_; ++ const absl::optional seller_signals_ = absl::nullopt; ++ const absl::optional auction_signals_ = absl::nullopt; ++ const base::flat_map per_buyer_signals_ = {}; + }; -- const absl::optional auction_signals_; -+ const absl::optional auction_signals_ = absl::nullopt; - -- const base::flat_map per_buyer_signals_; -+ const base::flat_map per_buyer_signals_ = {}; - }; - - } // namespace content + // Returns the result. The HeaderDirectFromSellerSignals::Result pointer will diff --git a/meta-chromium/recipes-browser/chromium/files/0015-Don-t-delete-CrashKeyWithName-dtor.patch b/meta-chromium/recipes-browser/chromium/files/0015-Don-t-delete-CrashKeyWithName-dtor.patch index aa032c2b9..d9994d67e 100644 --- a/meta-chromium/recipes-browser/chromium/files/0015-Don-t-delete-CrashKeyWithName-dtor.patch +++ b/meta-chromium/recipes-browser/chromium/files/0015-Don-t-delete-CrashKeyWithName-dtor.patch @@ -19,7 +19,7 @@ Signed-off-by: Max Ihlenfeldt 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/common/crash_keys.cc b/chrome/common/crash_keys.cc -index 680c8ec..a8e4bcc 100644 +index 2f69ae8..64d0e38 100644 --- a/chrome/common/crash_keys.cc +++ b/chrome/common/crash_keys.cc @@ -45,7 +45,7 @@ class CrashKeyWithName { diff --git a/meta-chromium/recipes-browser/chromium/files/0016-Use-base-ranges-instead-of-std-ranges.patch b/meta-chromium/recipes-browser/chromium/files/0016-Use-base-ranges-instead-of-std-ranges.patch index a546aefde..99ef4ed9c 100644 --- a/meta-chromium/recipes-browser/chromium/files/0016-Use-base-ranges-instead-of-std-ranges.patch +++ b/meta-chromium/recipes-browser/chromium/files/0016-Use-base-ranges-instead-of-std-ranges.patch @@ -13,15 +13,15 @@ Signed-off-by: Max Ihlenfeldt 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/autofill/core/browser/payments/iban_save_manager.cc b/components/autofill/core/browser/payments/iban_save_manager.cc -index a1a9c8f..830935c 100644 +index c9840dc..0b9a9bc 100644 --- a/components/autofill/core/browser/payments/iban_save_manager.cc +++ b/components/autofill/core/browser/payments/iban_save_manager.cc -@@ -123,7 +123,7 @@ bool IbanSaveManager::ShouldOfferUploadSave( +@@ -118,7 +118,7 @@ bool IbanSaveManager::MatchesExistingLocalIban( - // Offer server save for this IBAN if it doesn't already match an existing - // server IBAN. -- return std::ranges::none_of( -+ return base::ranges::none_of( + bool IbanSaveManager::MatchesExistingServerIban( + const Iban& import_candidate) const { +- return std::ranges::any_of( ++ return base::ranges::any_of( personal_data_manager_->GetServerIbans(), - [&iban_import_candidate](const auto& iban) { - return iban->MatchesPrefixSuffixAndLength(iban_import_candidate); + [&import_candidate](const auto& iban) { + return iban->MatchesPrefixSuffixAndLength(import_candidate); diff --git a/meta-chromium/recipes-browser/chromium/files/0017-Use-the-correct-path-to-libclang_rt.builtins.a.patch b/meta-chromium/recipes-browser/chromium/files/0017-Use-the-correct-path-to-libclang_rt.builtins.a.patch index 197472278..dff24d9d3 100644 --- a/meta-chromium/recipes-browser/chromium/files/0017-Use-the-correct-path-to-libclang_rt.builtins.a.patch +++ b/meta-chromium/recipes-browser/chromium/files/0017-Use-the-correct-path-to-libclang_rt.builtins.a.patch @@ -21,10 +21,10 @@ Signed-off-by: Max Ihlenfeldt 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn -index 46f4de0..ad3bfc4 100644 +index d4de2e0..0dd4d3b 100644 --- a/build/config/clang/BUILD.gn +++ b/build/config/clang/BUILD.gn -@@ -122,14 +122,15 @@ template("clang_lib") { +@@ -128,14 +128,15 @@ template("clang_lib") { } else if (is_apple) { _dir = "darwin" } else if (is_linux || is_chromeos) { diff --git a/meta-chromium/recipes-browser/chromium/files/0018-Adjust-the-Rust-build-to-our-needs.patch b/meta-chromium/recipes-browser/chromium/files/0018-Adjust-the-Rust-build-to-our-needs.patch index f6cea74d0..e711b5bbe 100644 --- a/meta-chromium/recipes-browser/chromium/files/0018-Adjust-the-Rust-build-to-our-needs.patch +++ b/meta-chromium/recipes-browser/chromium/files/0018-Adjust-the-Rust-build-to-our-needs.patch @@ -23,7 +23,7 @@ Signed-off-by: Max Ihlenfeldt 4 files changed, 54 insertions(+), 17 deletions(-) diff --git a/build/config/rust.gni b/build/config/rust.gni -index b82ac38..702353e 100644 +index 814c455..c6b675d 100644 --- a/build/config/rust.gni +++ b/build/config/rust.gni @@ -76,6 +76,11 @@ declare_args() { @@ -38,7 +38,7 @@ index b82ac38..702353e 100644 } # Use a separate declare_args so these variables' defaults can depend on the -@@ -189,12 +194,19 @@ if (enable_rust) { +@@ -185,12 +190,19 @@ if (enable_rust) { # other toolchains. rust_abi_target = "" if (is_linux || is_chromeos) { @@ -61,7 +61,7 @@ index b82ac38..702353e 100644 } else if (current_cpu == "arm") { if (arm_float_abi == "hard") { float_suffix = "hf" -@@ -203,13 +215,13 @@ if (is_linux || is_chromeos) { +@@ -199,13 +211,13 @@ if (is_linux || is_chromeos) { } if (arm_arch == "armv7-a" || arm_arch == "armv7") { # No way to inform Rust about the -a suffix. @@ -79,10 +79,10 @@ index b82ac38..702353e 100644 } else if (is_android) { import("//build/config/android/abi.gni") diff --git a/build/rust/rustc_wrapper.py b/build/rust/rustc_wrapper.py -index 1c61e9f..5f9556b 100755 +index b8e490d..d22cf08 100755 --- a/build/rust/rustc_wrapper.py +++ b/build/rust/rustc_wrapper.py -@@ -158,6 +158,7 @@ def main(): +@@ -160,6 +160,7 @@ def main(): rustc_args = remaining_args[:ldflags_separator] ldflags = remaining_args[ldflags_separator + 1:rustenv_separator] rustenv = remaining_args[rustenv_separator + 1:sources_separator] diff --git a/meta-chromium/recipes-browser/chromium/files/0019-Don-t-require-profiler_builtins.rlib.patch b/meta-chromium/recipes-browser/chromium/files/0019-Don-t-require-profiler_builtins.rlib.patch new file mode 100644 index 000000000..fa2a47680 --- /dev/null +++ b/meta-chromium/recipes-browser/chromium/files/0019-Don-t-require-profiler_builtins.rlib.patch @@ -0,0 +1,27 @@ +From 7f9a0877029aa3492fd381313886d9c80efbb752 Mon Sep 17 00:00:00 2001 +From: Max Ihlenfeldt +Date: Wed, 7 Feb 2024 11:58:30 +0000 +Subject: [PATCH] Don't require profiler_builtins.rlib + +This library is only needed for profiling builds, which we don't do. +Including it leads to compile errors on with OE's current master branch +because they disabled building the library, so just skip it. + +Upstream-Status: Inappropriate [specific to our build setup] +Signed-off-by: Max Ihlenfeldt +--- + build/rust/std/BUILD.gn | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn +index 77f4b8c..3078de8 100644 +--- a/build/rust/std/BUILD.gn ++++ b/build/rust/std/BUILD.gn +@@ -100,7 +100,6 @@ if (toolchain_has_rust) { + # don't need to pass to the C++ linker because they're used for specialized + # purposes. + skip_stdlib_files = [ +- "profiler_builtins", + "rustc_std_workspace_alloc", + "rustc_std_workspace_core", + "rustc_std_workspace_std", diff --git a/meta-chromium/recipes-browser/chromium/files/arm/0001-BUILD-do-not-specify-march-on-arm.patch b/meta-chromium/recipes-browser/chromium/files/arm/0001-BUILD-do-not-specify-march-on-arm.patch index 8183d36eb..632533f09 100644 --- a/meta-chromium/recipes-browser/chromium/files/arm/0001-BUILD-do-not-specify-march-on-arm.patch +++ b/meta-chromium/recipes-browser/chromium/files/arm/0001-BUILD-do-not-specify-march-on-arm.patch @@ -19,10 +19,10 @@ Signed-off-by: Khem Raj 1 file changed, 10 deletions(-) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index c7bf296..75ad03b 100644 +index 94e40fa..72088cf 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1175,16 +1175,6 @@ config("compiler_cpu_abi") { +@@ -1149,16 +1149,6 @@ config("compiler_cpu_abi") { "-msse3", ] } diff --git a/meta-chromium/recipes-browser/chromium/files/arm/0002-Fix-ARM-build-with-recent-glibc.patch b/meta-chromium/recipes-browser/chromium/files/arm/0002-Fix-ARM-build-with-recent-glibc.patch deleted file mode 100644 index a104bff23..000000000 --- a/meta-chromium/recipes-browser/chromium/files/arm/0002-Fix-ARM-build-with-recent-glibc.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ad900d1ee33daaaa09d4284e2804cd5f9db0c07e Mon Sep 17 00:00:00 2001 -From: Max Ihlenfeldt -Date: Tue, 4 Jul 2023 10:05:09 +0000 -Subject: [PATCH] Fix ARM build with recent glibc - -For some reason zlib #undefs _FILE_OFFSET_BITS which doesn't play well -with glibc 2.34's bminor/glibc@47f24c2 and the newly-introduced checks -in features-time64.h. This is because OE defines _TIME_BITS only for -32-bit ARM (ignoring architectures that we don't support), see its -meta/conf/distro/include/time64.inc. - -See also madler/zlib#447. - -Upstream-Status: Inappropriate -Signed-off-by: Raphael Kubo da Costa ---- - third_party/zlib/gzguts.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/third_party/zlib/gzguts.h b/third_party/zlib/gzguts.h -index e23f831..5b85ef7 100644 ---- a/third_party/zlib/gzguts.h -+++ b/third_party/zlib/gzguts.h -@@ -9,6 +9,7 @@ - # endif - # ifdef _FILE_OFFSET_BITS - # undef _FILE_OFFSET_BITS -+# undef _TIME_BITS - # endif - #endif - diff --git a/meta-chromium/recipes-browser/chromium/files/arm/0003-Fix-static_assert-failed-build-error-on-32-bit-ARM.patch b/meta-chromium/recipes-browser/chromium/files/arm/0002-Fix-static_assert-failed-build-error-on-32-bit-ARM.patch similarity index 98% rename from meta-chromium/recipes-browser/chromium/files/arm/0003-Fix-static_assert-failed-build-error-on-32-bit-ARM.patch rename to meta-chromium/recipes-browser/chromium/files/arm/0002-Fix-static_assert-failed-build-error-on-32-bit-ARM.patch index cfad62018..7926f51d6 100644 --- a/meta-chromium/recipes-browser/chromium/files/arm/0003-Fix-static_assert-failed-build-error-on-32-bit-ARM.patch +++ b/meta-chromium/recipes-browser/chromium/files/arm/0002-Fix-static_assert-failed-build-error-on-32-bit-ARM.patch @@ -22,7 +22,7 @@ Signed-off-by: Max Ihlenfeldt 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v8/src/maglev/maglev-code-generator.cc b/v8/src/maglev/maglev-code-generator.cc -index 138eba4..2571b89 100644 +index f30f8ae..d43f661 100644 --- a/v8/src/maglev/maglev-code-generator.cc +++ b/v8/src/maglev/maglev-code-generator.cc @@ -420,7 +420,7 @@ class ParallelMoveResolver { diff --git a/meta-chromium/recipes-browser/chromium/files/arm/0004-Fix-AES-crypto-SIGILL-on-rpi4-64.patch b/meta-chromium/recipes-browser/chromium/files/arm/0003-Fix-AES-crypto-SIGILL-on-rpi4-64.patch similarity index 92% rename from meta-chromium/recipes-browser/chromium/files/arm/0004-Fix-AES-crypto-SIGILL-on-rpi4-64.patch rename to meta-chromium/recipes-browser/chromium/files/arm/0003-Fix-AES-crypto-SIGILL-on-rpi4-64.patch index 79b393ec2..1bf35bebb 100644 --- a/meta-chromium/recipes-browser/chromium/files/arm/0004-Fix-AES-crypto-SIGILL-on-rpi4-64.patch +++ b/meta-chromium/recipes-browser/chromium/files/arm/0003-Fix-AES-crypto-SIGILL-on-rpi4-64.patch @@ -15,10 +15,10 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn -index 321a2dc..4ff35fb 100644 +index bd39797..2bc84d6 100644 --- a/third_party/boringssl/BUILD.gn +++ b/third_party/boringssl/BUILD.gn -@@ -118,7 +118,7 @@ if (enable_rust_boringssl) { +@@ -120,7 +120,7 @@ if (enable_rust_boringssl) { } } diff --git a/meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-chrome-browser-ui-tabs-organizatio.patch b/meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-chrome-browser-ui-tabs-organizatio.patch index 9bb03840f..4bfa8cfa3 100644 --- a/meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-chrome-browser-ui-tabs-organizatio.patch +++ b/meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-chrome-browser-ui-tabs-organizatio.patch @@ -14,7 +14,7 @@ Signed-off-by: Max Ihlenfeldt 1 file changed, 1 insertion(+) diff --git a/chrome/browser/ui/tabs/organization/trigger_observer.h b/chrome/browser/ui/tabs/organization/trigger_observer.h -index ffa5481..2d8c001 100644 +index 41b306b..6a1f010 100644 --- a/chrome/browser/ui/tabs/organization/trigger_observer.h +++ b/chrome/browser/ui/tabs/organization/trigger_observer.h @@ -6,6 +6,7 @@ diff --git a/meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-chrome-browser-ui-views-dark_mode_.patch b/meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-chrome-browser-ui-views-dark_mode_.patch deleted file mode 100644 index e2c1c320e..000000000 --- a/meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-chrome-browser-ui-views-dark_mode_.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 63c4d0becc9e1aedcae4ffd0956fd1999b58b15a Mon Sep 17 00:00:00 2001 -From: Max Ihlenfeldt -Date: Tue, 7 Nov 2023 15:09:30 +0000 -Subject: [PATCH] Backport "IWYU for - chrome/browser/ui/views/dark_mode_manager_linux.h" - -This fixes some build errors due to missing imports. The patch will be -included in upstream's 121 release. - -Upstream-Status: Backport [https://crrev.com/c/5013111] -Signed-off-by: Max Ihlenfeldt ---- - chrome/browser/ui/views/dark_mode_manager_linux.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/chrome/browser/ui/views/dark_mode_manager_linux.h b/chrome/browser/ui/views/dark_mode_manager_linux.h -index f9bcd03..621b67b 100644 ---- a/chrome/browser/ui/views/dark_mode_manager_linux.h -+++ b/chrome/browser/ui/views/dark_mode_manager_linux.h -@@ -6,11 +6,13 @@ - #define CHROME_BROWSER_UI_VIEWS_DARK_MODE_MANAGER_LINUX_H_ - - #include -+#include - - #include "base/gtest_prod_util.h" - #include "base/memory/scoped_refptr.h" - #include "base/memory/weak_ptr.h" - #include "base/scoped_observation.h" -+#include "ui/native_theme/native_theme.h" - #include "ui/native_theme/native_theme_observer.h" - - namespace dbus { diff --git a/meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-components-user_education-common-p.patch b/meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-components-user_education-common-p.patch deleted file mode 100644 index fdd04ab2d..000000000 --- a/meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-components-user_education-common-p.patch +++ /dev/null @@ -1,27 +0,0 @@ -From cab1f77315350d10640a899dd7647cc80c6de956 Mon Sep 17 00:00:00 2001 -From: Max Ihlenfeldt -Date: Fri, 10 Nov 2023 12:43:41 +0000 -Subject: [PATCH] Backport "IWYU for - components/user_education/common/product_messaging_controller.cc" - -This fixes a build error due to a missing header include. The patch will -be included in upstream's 121 release. - -Upstream-Status: Backport [https://crrev.com/c/5030000] -Signed-off-by: Max Ihlenfeldt ---- - components/user_education/common/product_messaging_controller.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/components/user_education/common/product_messaging_controller.cc b/components/user_education/common/product_messaging_controller.cc -index 787cbb8..0e428a4 100644 ---- a/components/user_education/common/product_messaging_controller.cc -+++ b/components/user_education/common/product_messaging_controller.cc -@@ -6,6 +6,7 @@ - - #include - #include -+#include - - #include "base/containers/contains.h" - #include "base/functional/callback.h" diff --git a/meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-content-browser-generic_sensor-fra.patch b/meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-content-browser-generic_sensor-fra.patch index d96063862..972381047 100644 --- a/meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-content-browser-generic_sensor-fra.patch +++ b/meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-content-browser-generic_sensor-fra.patch @@ -14,7 +14,7 @@ Signed-off-by: Max Ihlenfeldt 1 file changed, 2 insertions(+) diff --git a/content/browser/generic_sensor/frame_sensor_provider_proxy.cc b/content/browser/generic_sensor/frame_sensor_provider_proxy.cc -index b8f0b48..3387e2f 100644 +index e24c144..dfb417a 100644 --- a/content/browser/generic_sensor/frame_sensor_provider_proxy.cc +++ b/content/browser/generic_sensor/frame_sensor_provider_proxy.cc @@ -4,6 +4,8 @@ diff --git a/meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-g-c-service-shared_image-ozone_ima.patch b/meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-g-c-service-shared_image-ozone_ima.patch index 652fc0eec..73e3bed65 100644 --- a/meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-g-c-service-shared_image-ozone_ima.patch +++ b/meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-g-c-service-shared_image-ozone_ima.patch @@ -14,7 +14,7 @@ Signed-off-by: Max Ihlenfeldt 1 file changed, 1 insertion(+) diff --git a/gpu/command_buffer/service/shared_image/ozone_image_gl_textures_holder.h b/gpu/command_buffer/service/shared_image/ozone_image_gl_textures_holder.h -index bb82853..a49b666 100644 +index d44037e..ca94e99 100644 --- a/gpu/command_buffer/service/shared_image/ozone_image_gl_textures_holder.h +++ b/gpu/command_buffer/service/shared_image/ozone_image_gl_textures_holder.h @@ -6,6 +6,7 @@ diff --git a/meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-net-filter-zstd_source_stream.cc.patch b/meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-net-filter-zstd_source_stream.cc.patch deleted file mode 100644 index 4d67c0ccd..000000000 --- a/meta-chromium/recipes-browser/chromium/files/backport/IWYU-for-net-filter-zstd_source_stream.cc.patch +++ /dev/null @@ -1,26 +0,0 @@ -From cf79a8ee88a364a30b9f58acf32c237b4956b0c6 Mon Sep 17 00:00:00 2001 -From: Max Ihlenfeldt -Date: Tue, 7 Nov 2023 16:17:03 +0000 -Subject: [PATCH] Backport "IWYU for net/filter/zstd_source_stream.cc" - -This fixes a build error due to a missing header include. The patch will -be included in upstream's 121 release. - -Upstream-Status: Backport [https://crrev.com/c/5010396] -Signed-off-by: Max Ihlenfeldt ---- - net/filter/zstd_source_stream.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/net/filter/zstd_source_stream.cc b/net/filter/zstd_source_stream.cc -index bd337d1..551729a 100644 ---- a/net/filter/zstd_source_stream.cc -+++ b/net/filter/zstd_source_stream.cc -@@ -5,6 +5,7 @@ - #include "net/filter/zstd_source_stream.h" - - #include -+#include - #include - - #define ZSTD_STATIC_LINKING_ONLY diff --git a/meta-chromium/recipes-browser/chromium/files/backport/Make-toolchain_supports_rust_thin_lto-configurable.patch b/meta-chromium/recipes-browser/chromium/files/backport/Make-toolchain_supports_rust_thin_lto-configurable.patch index c8c39b653..28daa2ecd 100644 --- a/meta-chromium/recipes-browser/chromium/files/backport/Make-toolchain_supports_rust_thin_lto-configurable.patch +++ b/meta-chromium/recipes-browser/chromium/files/backport/Make-toolchain_supports_rust_thin_lto-configurable.patch @@ -14,10 +14,10 @@ Signed-off-by: Max Ihlenfeldt 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 80bc79e..7762292 100644 +index 72088cf..59a1880 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1033,7 +1033,7 @@ config("compiler") { +@@ -1008,7 +1008,7 @@ config("compiler") { if (rust_abi_target != "") { rustflags += [ "--target=$rust_abi_target" ] } @@ -27,7 +27,7 @@ index 80bc79e..7762292 100644 rustflags += [ "-Cembed-bitcode=no" ] } diff --git a/build/config/rust.gni b/build/config/rust.gni -index 702353e..72c076b3 100644 +index c6b675d..a20524d 100644 --- a/build/config/rust.gni +++ b/build/config/rust.gni @@ -55,6 +55,17 @@ declare_args() { @@ -48,7 +48,7 @@ index 702353e..72c076b3 100644 # Any extra std rlibs in your Rust toolchain, relative to the standard # Rust toolchain. Typically used with 'rust_sysroot_absolute' added_rust_stdlib_libs = [] -@@ -154,17 +165,6 @@ if (enable_rust) { +@@ -150,17 +161,6 @@ if (enable_rust) { # for gtests from the `//testing/test:test` template. can_build_rust_unit_tests = toolchain_has_rust && !is_android diff --git a/meta-chromium/recipes-browser/chromium/files/backport/Revert-recent-C-20-usage-in-CFX_FillRenderO.patch b/meta-chromium/recipes-browser/chromium/files/backport/Revert-recent-C-20-usage-in-CFX_FillRenderO.patch deleted file mode 100644 index 604fa574b..000000000 --- a/meta-chromium/recipes-browser/chromium/files/backport/Revert-recent-C-20-usage-in-CFX_FillRenderO.patch +++ /dev/null @@ -1,677 +0,0 @@ -From b58577f0164234a1bd3d6db7ed12856855695808 Mon Sep 17 00:00:00 2001 -From: Max Ihlenfeldt -Date: Mon, 11 Dec 2023 09:44:43 +0000 -Subject: [PATCH] Backport "Revert recent C++20 usage in CFX_FillRenderOptions" - -This fixes a build error due to C++20 features being used which aren't -supported by the versions of clang we use. The patch will be included in -upstream's 121 release. - -Upstream-Status: Backport [https://pdfium-review.googlesource.com/c/pdfium/+/113291] -Signed-off-by: Max Ihlenfeldt ---- - .../fpdfapi/render/cpdf_imagerenderer.cpp | 2 +- - .../fpdfapi/render/cpdf_rendershading.cpp | 11 +-- - .../core/fpdfapi/render/cpdf_renderstatus.cpp | 70 ++++++++++++------- - .../fxge/cfx_defaultrenderdevice_unittest.cpp | 8 ++- - .../pdfium/core/fxge/cfx_drawutils.cpp | 6 +- - .../pdfium/core/fxge/cfx_fillrenderoptions.h | 41 ++++++++--- - .../pdfium/core/fxge/cfx_renderdevice.cpp | 51 +++++++------- - .../cfx_windowsrenderdevice_embeddertest.cpp | 12 ++-- - .../fxge/skia/fx_skia_device_embeddertest.cpp | 4 +- - .../core/fxge/win32/cps_printer_driver.cpp | 5 +- - third_party/pdfium/fpdfsdk/cpdfsdk_widget.cpp | 2 +- - third_party/pdfium/fpdfsdk/pwl/cpwl_caret.cpp | 2 +- - .../pdfium/fpdfsdk/pwl/cpwl_cbbutton.cpp | 2 +- - third_party/pdfium/fpdfsdk/pwl/cpwl_edit.cpp | 6 +- - .../pdfium/fpdfsdk/pwl/cpwl_edit_impl.cpp | 5 +- - .../pdfium/fxbarcode/BC_TwoDimWriter.cpp | 8 +-- - .../pdfium/fxbarcode/oned/BC_OneDimWriter.cpp | 5 +- - .../xfa/fgas/graphics/cfgas_gegraphics.cpp | 2 +- - third_party/pdfium/xfa/fxfa/cxfa_ffwidget.cpp | 4 +- - 19 files changed, 138 insertions(+), 108 deletions(-) - -diff --git a/third_party/pdfium/core/fpdfapi/render/cpdf_imagerenderer.cpp b/third_party/pdfium/core/fpdfapi/render/cpdf_imagerenderer.cpp -index 1efa7e9..a5a2652 100644 ---- a/third_party/pdfium/core/fpdfapi/render/cpdf_imagerenderer.cpp -+++ b/third_party/pdfium/core/fpdfapi/render/cpdf_imagerenderer.cpp -@@ -483,7 +483,7 @@ bool CPDF_ImageRenderer::StartBitmapAlpha() { - ArgbEncode(0xff, m_BitmapAlpha, m_BitmapAlpha, m_BitmapAlpha); - m_pRenderStatus->GetRenderDevice()->DrawPath( - path, nullptr, nullptr, fill_color, 0, -- {.fill_type = CFX_FillRenderOptions::FillType::kWinding}); -+ CFX_FillRenderOptions::WindingOptions()); - return false; - } - RetainPtr pAlphaMask; -diff --git a/third_party/pdfium/core/fpdfapi/render/cpdf_rendershading.cpp b/third_party/pdfium/core/fpdfapi/render/cpdf_rendershading.cpp -index cf1ed01..4991d76 100644 ---- a/third_party/pdfium/core/fpdfapi/render/cpdf_rendershading.cpp -+++ b/third_party/pdfium/core/fpdfapi/render/cpdf_rendershading.cpp -@@ -710,11 +710,12 @@ struct PatchDrawer { - D2.GetPoints(points.subspan(3, 4)); - C2.GetPointsReverse(points.subspan(6, 4)); - D1.GetPointsReverse(points.subspan(9, 4)); -- const CFX_FillRenderOptions fill_options = { -- .fill_type = CFX_FillRenderOptions::FillType::kWinding, -- .aliased_path = bNoPathSmooth, -- .full_cover = true, -- }; -+ CFX_FillRenderOptions fill_options( -+ CFX_FillRenderOptions::WindingOptions()); -+ fill_options.full_cover = true; -+ if (bNoPathSmooth) { -+ fill_options.aliased_path = true; -+ } - pDevice->DrawPath( - path, nullptr, nullptr, - ArgbEncode(alpha, div_colors[0].comp[0], div_colors[0].comp[1], -diff --git a/third_party/pdfium/core/fpdfapi/render/cpdf_renderstatus.cpp b/third_party/pdfium/core/fpdfapi/render/cpdf_renderstatus.cpp -index d86c2f6..2da1ed2 100644 ---- a/third_party/pdfium/core/fpdfapi/render/cpdf_renderstatus.cpp -+++ b/third_party/pdfium/core/fpdfapi/render/cpdf_renderstatus.cpp -@@ -83,16 +83,25 @@ CFX_FillRenderOptions GetFillOptionsForDrawPathWithBlend( - CFX_FillRenderOptions::FillType fill_type, - bool is_stroke, - bool is_type3_char) { -- const bool rect_aa = (fill_type != CFX_FillRenderOptions::FillType::kNoFill && -- options.bRectAA); -- return { -- .fill_type = fill_type, -- .adjust_stroke = path_obj->m_GeneralState.GetStrokeAdjust(), -- .aliased_path = options.bNoPathSmooth, -- .rect_aa = rect_aa, -- .stroke = is_stroke, -- .text_mode = is_type3_char, -- }; -+ CFX_FillRenderOptions fill_options(fill_type); -+ if (fill_type != CFX_FillRenderOptions::FillType::kNoFill && -+ options.bRectAA) { -+ fill_options.rect_aa = true; -+ } -+ if (options.bNoPathSmooth) { -+ fill_options.aliased_path = true; -+ } -+ if (path_obj->m_GeneralState.GetStrokeAdjust()) { -+ fill_options.adjust_stroke = true; -+ } -+ if (is_stroke) { -+ fill_options.stroke = true; -+ } -+ if (is_type3_char) { -+ fill_options.text_mode = true; -+ } -+ -+ return fill_options; - } - - CFX_FillRenderOptions GetFillOptionsForDrawTextPath( -@@ -100,12 +109,19 @@ CFX_FillRenderOptions GetFillOptionsForDrawTextPath( - const CPDF_TextObject* text_obj, - bool is_stroke, - bool is_fill) { -- return { -- .adjust_stroke = text_obj->m_GeneralState.GetStrokeAdjust(), -- .aliased_path = options.bNoTextSmooth, -- .stroke = (is_stroke && is_fill), -- .stroke_text_mode = (is_stroke && is_fill), -- }; -+ CFX_FillRenderOptions fill_options; -+ if (is_stroke && is_fill) { -+ fill_options.stroke = true; -+ fill_options.stroke_text_mode = true; -+ } -+ if (text_obj->m_GeneralState.GetStrokeAdjust()) { -+ fill_options.adjust_stroke = true; -+ } -+ if (options.bNoTextSmooth) { -+ fill_options.aliased_path = true; -+ } -+ -+ return fill_options; - } - - FXDIB_Format GetFormatForLuminosity(bool is_luminosity) { -@@ -485,9 +501,8 @@ void CPDF_RenderStatus::ProcessClipPath(const CPDF_ClipPath& ClipPath, - if (pPath->GetPoints().empty()) { - CFX_Path empty_path; - empty_path.AppendRect(-1, -1, 0, 0); -- m_pDevice->SetClip_PathFill( -- empty_path, nullptr, -- {.fill_type = CFX_FillRenderOptions::FillType::kWinding}); -+ m_pDevice->SetClip_PathFill(empty_path, nullptr, -+ CFX_FillRenderOptions::WindingOptions()); - } else { - m_pDevice->SetClip_PathFill( - *pPath, &mtObj2Device, -@@ -512,13 +527,14 @@ void CPDF_RenderStatus::ProcessClipPath(const CPDF_ClipPath& ClipPath, - ProcessText(pText, mtObj2Device, pTextClippingPath.get()); - continue; - } -+ - if (!pTextClippingPath) - continue; - -- const CFX_FillRenderOptions fill_options = { -- .fill_type = CFX_FillRenderOptions::FillType::kWinding, -- .aliased_path = m_Options.GetOptions().bNoTextSmooth, -- }; -+ CFX_FillRenderOptions fill_options(CFX_FillRenderOptions::WindingOptions()); -+ if (m_Options.GetOptions().bNoTextSmooth) { -+ fill_options.aliased_path = true; -+ } - m_pDevice->SetClip_PathFill(*pTextClippingPath, nullptr, fill_options); - pTextClippingPath.reset(); - } -@@ -545,10 +561,10 @@ bool CPDF_RenderStatus::SelectClipPath(const CPDF_PathObject* path_obj, - &path_matrix, - path_obj->m_GraphState.GetObject()); - } -- const CFX_FillRenderOptions fill_options = { -- .fill_type = path_obj->filltype(), -- .aliased_path = m_Options.GetOptions().bNoPathSmooth, -- }; -+ CFX_FillRenderOptions fill_options(path_obj->filltype()); -+ if (m_Options.GetOptions().bNoPathSmooth) { -+ fill_options.aliased_path = true; -+ } - return m_pDevice->SetClip_PathFill(*path_obj->path().GetObject(), - &path_matrix, fill_options); - } -diff --git a/third_party/pdfium/core/fxge/cfx_defaultrenderdevice_unittest.cpp b/third_party/pdfium/core/fxge/cfx_defaultrenderdevice_unittest.cpp -index 11ed6db..9304a8c 100644 ---- a/third_party/pdfium/core/fxge/cfx_defaultrenderdevice_unittest.cpp -+++ b/third_party/pdfium/core/fxge/cfx_defaultrenderdevice_unittest.cpp -@@ -25,15 +25,17 @@ TEST(CFX_DefaultRenderDeviceTest, GetClipBox_PathFill) { - // Matrix that transposes and translates by 1 unit on each axis. - const CFX_Matrix object_to_device(0, 1, 1, 0, 1, -1); - -+ // Fill type cannot be none. -+ const CFX_FillRenderOptions fill_options( -+ CFX_FillRenderOptions::FillType::kEvenOdd); -+ - CFX_DefaultRenderDevice device; - ASSERT_TRUE(device.Create(/*width=*/16, /*height=*/16, FXDIB_Format::kArgb, - /*pBackdropBitmap=*/nullptr)); - - CFX_Path path; - path.AppendRect(2, 4, 14, 12); -- EXPECT_TRUE(device.SetClip_PathFill( -- path, &object_to_device, -- {.fill_type = CFX_FillRenderOptions::FillType::kEvenOdd})); -+ EXPECT_TRUE(device.SetClip_PathFill(path, &object_to_device, fill_options)); - - EXPECT_EQ(FX_RECT(5, 1, 13, 13), device.GetClipBox()); - } -diff --git a/third_party/pdfium/core/fxge/cfx_drawutils.cpp b/third_party/pdfium/core/fxge/cfx_drawutils.cpp -index 44d0db1..3591471 100644 ---- a/third_party/pdfium/core/fxge/cfx_drawutils.cpp -+++ b/third_party/pdfium/core/fxge/cfx_drawutils.cpp -@@ -35,7 +35,7 @@ void CFX_DrawUtils::DrawFocusRect(CFX_RenderDevice* render_device, - graph_state_data.m_DashPhase = 0; - graph_state_data.m_LineWidth = 1.0f; - -- render_device->DrawPath( -- path, &user_to_device, &graph_state_data, 0, ArgbEncode(255, 0, 0, 0), -- {.fill_type = CFX_FillRenderOptions::FillType::kEvenOdd}); -+ render_device->DrawPath(path, &user_to_device, &graph_state_data, 0, -+ ArgbEncode(255, 0, 0, 0), -+ CFX_FillRenderOptions::EvenOddOptions()); - } -diff --git a/third_party/pdfium/core/fxge/cfx_fillrenderoptions.h b/third_party/pdfium/core/fxge/cfx_fillrenderoptions.h -index 3c0a1ae..d123f72 100644 ---- a/third_party/pdfium/core/fxge/cfx_fillrenderoptions.h -+++ b/third_party/pdfium/core/fxge/cfx_fillrenderoptions.h -@@ -23,6 +23,29 @@ struct CFX_FillRenderOptions { - kWinding = 2, - }; - -+ static constexpr CFX_FillRenderOptions EvenOddOptions() { -+ return CFX_FillRenderOptions(FillType::kEvenOdd); -+ } -+ static constexpr CFX_FillRenderOptions WindingOptions() { -+ return CFX_FillRenderOptions(FillType::kWinding); -+ } -+ -+ constexpr CFX_FillRenderOptions() -+ : CFX_FillRenderOptions(FillType::kNoFill) {} -+ -+ // TODO(thestig): Switch to default member initializer for bit-fields when -+ // C++20 is available. -+ constexpr explicit CFX_FillRenderOptions(FillType fill_type) -+ : fill_type(fill_type), -+ adjust_stroke(false), -+ aliased_path(false), -+ full_cover(false), -+ rect_aa(false), -+ stroke(false), -+ stroke_text_mode(false), -+ text_mode(false), -+ zero_area(false) {} -+ - bool operator==(const CFX_FillRenderOptions& other) const { - return fill_type == other.fill_type && - adjust_stroke == other.adjust_stroke && -@@ -38,31 +61,31 @@ struct CFX_FillRenderOptions { - } - - // Fill type. -- FillType fill_type = FillType::kNoFill; -+ FillType fill_type; - - // Adjusted stroke rendering is enabled. -- bool adjust_stroke : 1 = false; -+ bool adjust_stroke : 1; - - // Whether anti aliasing is enabled for path rendering. -- bool aliased_path : 1 = false; -+ bool aliased_path : 1; - - // Fills with the sum of colors from both cover and source. -- bool full_cover : 1 = false; -+ bool full_cover : 1; - - // Rect paths use anti-aliasing. -- bool rect_aa : 1 = false; -+ bool rect_aa : 1; - - // Path is stroke. -- bool stroke : 1 = false; -+ bool stroke : 1; - - // Renders text by filling strokes. -- bool stroke_text_mode : 1 = false; -+ bool stroke_text_mode : 1; - - // Path is text. -- bool text_mode : 1 = false; -+ bool text_mode : 1; - - // Path encloses zero area. -- bool zero_area : 1 = false; -+ bool zero_area : 1; - }; - - #endif // CORE_FXGE_CFX_FILLRENDEROPTIONS_H_ -diff --git a/third_party/pdfium/core/fxge/cfx_renderdevice.cpp b/third_party/pdfium/core/fxge/cfx_renderdevice.cpp -index 0d5497f..ca2b08b 100644 ---- a/third_party/pdfium/core/fxge/cfx_renderdevice.cpp -+++ b/third_party/pdfium/core/fxge/cfx_renderdevice.cpp -@@ -578,11 +578,11 @@ bool CFX_RenderDevice::SetClip_PathStroke( - bool CFX_RenderDevice::SetClip_Rect(const FX_RECT& rect) { - CFX_Path path; - path.AppendRect(rect.left, rect.bottom, rect.right, rect.top); -- if (!SetClip_PathFill( -- path, nullptr, -- {.fill_type = CFX_FillRenderOptions::FillType::kWinding})) { -+ if (!SetClip_PathFill(path, nullptr, -+ CFX_FillRenderOptions::WindingOptions())) { - return false; - } -+ - UpdateClipBox(); - return true; - } -@@ -865,10 +865,10 @@ void CFX_RenderDevice::DrawZeroAreaPath( - if (matrix && !matrix->IsIdentity() && !set_identity) - new_matrix = matrix; - -- const CFX_FillRenderOptions path_options = { -- .aliased_path = aliased_path, -- .zero_area = true, -- }; -+ CFX_FillRenderOptions path_options; -+ path_options.zero_area = true; -+ path_options.aliased_path = aliased_path; -+ - m_pDeviceDriver->DrawPath(new_path, new_matrix, &graph_state, 0, stroke_color, - path_options, blend_type); - } -@@ -1081,9 +1081,8 @@ bool CFX_RenderDevice::DrawNormalText(pdfium::span pCharPos, - if (fabs(char2device.a) + fabs(char2device.b) > 50 * 1.0f || - GetDeviceType() == DeviceType::kPrinter) { - if (pFont->GetFaceRec()) { -- const CFX_FillRenderOptions path_options = { -- .aliased_path = !is_text_smooth, -- }; -+ CFX_FillRenderOptions path_options; -+ path_options.aliased_path = !is_text_smooth; - return DrawTextPath(pCharPos, pFont, font_size, mtText2Device, nullptr, - nullptr, fill_color, 0, nullptr, path_options); - } -@@ -1224,13 +1223,11 @@ bool CFX_RenderDevice::DrawTextPath(pdfium::span pCharPos, - CFX_Path transformed_path(*pPath); - transformed_path.Transform(matrix); - if (fill_color || stroke_color) { -- const CFX_FillRenderOptions::FillType fill_type = -- fill_color ? CFX_FillRenderOptions::FillType::kWinding -- : CFX_FillRenderOptions::FillType::kNoFill; -- const CFX_FillRenderOptions options = { -- .fill_type = fill_type, -- .text_mode = true, -- }; -+ CFX_FillRenderOptions options(fill_options); -+ if (fill_color) { -+ options.fill_type = CFX_FillRenderOptions::FillType::kWinding; -+ } -+ options.text_mode = true; - if (!DrawPathWithBlend(transformed_path, pUser2Device, pGraphState, - fill_color, stroke_color, options, - BlendMode::kNormal)) { -@@ -1249,7 +1246,7 @@ void CFX_RenderDevice::DrawFillRect(const CFX_Matrix* pUser2Device, - CFX_Path path; - path.AppendFloatRect(rect); - DrawPath(path, pUser2Device, nullptr, color, 0, -- {.fill_type = CFX_FillRenderOptions::FillType::kWinding}); -+ CFX_FillRenderOptions::WindingOptions()); - } - - void CFX_RenderDevice::DrawFillArea(const CFX_Matrix& mtUser2Device, -@@ -1262,7 +1259,7 @@ void CFX_RenderDevice::DrawFillArea(const CFX_Matrix& mtUser2Device, - path.AppendPoint(points[i], CFX_Path::Point::Type::kLine); - - DrawPath(path, &mtUser2Device, nullptr, color, 0, -- {.fill_type = CFX_FillRenderOptions::FillType::kEvenOdd}); -+ CFX_FillRenderOptions::EvenOddOptions()); - } - - void CFX_RenderDevice::DrawStrokeRect(const CFX_Matrix& mtUser2Device, -@@ -1275,7 +1272,7 @@ void CFX_RenderDevice::DrawStrokeRect(const CFX_Matrix& mtUser2Device, - CFX_Path path; - path.AppendFloatRect(rect); - DrawPath(path, &mtUser2Device, &gsd, 0, color, -- {.fill_type = CFX_FillRenderOptions::FillType::kEvenOdd}); -+ CFX_FillRenderOptions::EvenOddOptions()); - } - - void CFX_RenderDevice::DrawStrokeLine(const CFX_Matrix* pUser2Device, -@@ -1291,7 +1288,7 @@ void CFX_RenderDevice::DrawStrokeLine(const CFX_Matrix* pUser2Device, - gsd.m_LineWidth = fWidth; - - DrawPath(path, pUser2Device, &gsd, 0, color, -- {.fill_type = CFX_FillRenderOptions::FillType::kEvenOdd}); -+ CFX_FillRenderOptions::EvenOddOptions()); - } - - void CFX_RenderDevice::DrawFillRect(const CFX_Matrix* pUser2Device, -@@ -1357,7 +1354,7 @@ void CFX_RenderDevice::DrawBorder(const CFX_Matrix* pUser2Device, - path.AppendRect(fLeft + fWidth, fBottom + fWidth, fRight - fWidth, - fTop - fWidth); - DrawPath(path, pUser2Device, nullptr, color.ToFXColor(nTransparency), 0, -- {.fill_type = CFX_FillRenderOptions::FillType::kEvenOdd}); -+ CFX_FillRenderOptions::EvenOddOptions()); - break; - } - case BorderStyle::kDash: { -@@ -1378,7 +1375,7 @@ void CFX_RenderDevice::DrawBorder(const CFX_Matrix* pUser2Device, - path.AppendPoint(CFX_PointF(fLeft + fHalfWidth, fBottom + fHalfWidth), - CFX_Path::Point::Type::kLine); - DrawPath(path, pUser2Device, &gsd, 0, color.ToFXColor(nTransparency), -- {.fill_type = CFX_FillRenderOptions::FillType::kWinding}); -+ CFX_FillRenderOptions::WindingOptions()); - break; - } - case BorderStyle::kBeveled: -@@ -1407,7 +1404,7 @@ void CFX_RenderDevice::DrawBorder(const CFX_Matrix* pUser2Device, - CFX_Path::Point::Type::kLine); - DrawPath(path_left_top, pUser2Device, &gsd, - crLeftTop.ToFXColor(nTransparency), 0, -- {.fill_type = CFX_FillRenderOptions::FillType::kEvenOdd}); -+ CFX_FillRenderOptions::EvenOddOptions()); - - CFX_Path path_right_bottom; - path_right_bottom.AppendPoint( -@@ -1432,14 +1429,14 @@ void CFX_RenderDevice::DrawBorder(const CFX_Matrix* pUser2Device, - CFX_Path::Point::Type::kLine); - DrawPath(path_right_bottom, pUser2Device, &gsd, - crRightBottom.ToFXColor(nTransparency), 0, -- {.fill_type = CFX_FillRenderOptions::FillType::kEvenOdd}); -+ CFX_FillRenderOptions::EvenOddOptions()); - - CFX_Path path; - path.AppendRect(fLeft, fBottom, fRight, fTop); - path.AppendRect(fLeft + fHalfWidth, fBottom + fHalfWidth, - fRight - fHalfWidth, fTop - fHalfWidth); - DrawPath(path, pUser2Device, &gsd, color.ToFXColor(nTransparency), 0, -- {.fill_type = CFX_FillRenderOptions::FillType::kEvenOdd}); -+ CFX_FillRenderOptions::EvenOddOptions()); - break; - } - case BorderStyle::kUnderline: { -@@ -1452,7 +1449,7 @@ void CFX_RenderDevice::DrawBorder(const CFX_Matrix* pUser2Device, - path.AppendPoint(CFX_PointF(fRight, fBottom + fHalfWidth), - CFX_Path::Point::Type::kLine); - DrawPath(path, pUser2Device, &gsd, 0, color.ToFXColor(nTransparency), -- {.fill_type = CFX_FillRenderOptions::FillType::kEvenOdd}); -+ CFX_FillRenderOptions::EvenOddOptions()); - break; - } - } -diff --git a/third_party/pdfium/core/fxge/cfx_windowsrenderdevice_embeddertest.cpp b/third_party/pdfium/core/fxge/cfx_windowsrenderdevice_embeddertest.cpp -index 6c4063e..b637b46 100644 ---- a/third_party/pdfium/core/fxge/cfx_windowsrenderdevice_embeddertest.cpp -+++ b/third_party/pdfium/core/fxge/cfx_windowsrenderdevice_embeddertest.cpp -@@ -57,8 +57,7 @@ TEST_F(CFX_WindowsRenderDeviceTest, SimpleClipTriangle) { - path_data.AppendLine(p3, p1); - path_data.ClosePath(); - EXPECT_TRUE(m_driver->SetClip_PathFill( -- path_data, &kIdentityMatrix, -- {.fill_type = CFX_FillRenderOptions::FillType::kWinding})); -+ path_data, &kIdentityMatrix, CFX_FillRenderOptions::WindingOptions())); - } - - TEST_F(CFX_WindowsRenderDeviceTest, SimpleClipRect) { -@@ -67,8 +66,7 @@ TEST_F(CFX_WindowsRenderDeviceTest, SimpleClipRect) { - path_data.AppendRect(0.0f, 100.0f, 200.0f, 0.0f); - path_data.ClosePath(); - EXPECT_TRUE(m_driver->SetClip_PathFill( -- path_data, &kIdentityMatrix, -- {.fill_type = CFX_FillRenderOptions::FillType::kWinding})); -+ path_data, &kIdentityMatrix, CFX_FillRenderOptions::WindingOptions())); - } - - TEST_F(CFX_WindowsRenderDeviceTest, GargantuanClipRect) { -@@ -82,8 +80,7 @@ TEST_F(CFX_WindowsRenderDeviceTest, GargantuanClipRect) { - // however they do not because the GDI API IntersectClipRect() errors out and - // affect subsequent imaging. crbug.com/1019026 - EXPECT_FALSE(m_driver->SetClip_PathFill( -- path_data, &kIdentityMatrix, -- {.fill_type = CFX_FillRenderOptions::FillType::kWinding})); -+ path_data, &kIdentityMatrix, CFX_FillRenderOptions::WindingOptions())); - } - - TEST_F(CFX_WindowsRenderDeviceTest, GargantuanClipRectWithBaseClip) { -@@ -97,6 +94,5 @@ TEST_F(CFX_WindowsRenderDeviceTest, GargantuanClipRectWithBaseClip) { - // Use of a reasonable base clip ensures that we avoid getting an error back - // from GDI API IntersectClipRect(). - EXPECT_TRUE(m_driver->SetClip_PathFill( -- path_data, &kIdentityMatrix, -- {.fill_type = CFX_FillRenderOptions::FillType::kWinding})); -+ path_data, &kIdentityMatrix, CFX_FillRenderOptions::WindingOptions())); - } -diff --git a/third_party/pdfium/core/fxge/skia/fx_skia_device_embeddertest.cpp b/third_party/pdfium/core/fxge/skia/fx_skia_device_embeddertest.cpp -index 5aa9a76..d904230 100644 ---- a/third_party/pdfium/core/fxge/skia/fx_skia_device_embeddertest.cpp -+++ b/third_party/pdfium/core/fxge/skia/fx_skia_device_embeddertest.cpp -@@ -92,7 +92,7 @@ void CommonTest(CFX_SkiaDeviceDriver* driver, const State& state) { - driver->SetClip_PathFill(clipPath, &clipMatrix, CFX_FillRenderOptions()); - if (state.m_graphic == State::Graphic::kPath) { - driver->DrawPath(path1, &matrix, &graphState, 0xFF112233, 0, -- {.fill_type = CFX_FillRenderOptions::FillType::kWinding}, -+ CFX_FillRenderOptions::WindingOptions(), - BlendMode::kNormal); - } else if (state.m_graphic == State::Graphic::kText) { - driver->DrawDeviceText(charPos, &font, matrix, fontSize, 0xFF445566, -@@ -116,7 +116,7 @@ void CommonTest(CFX_SkiaDeviceDriver* driver, const State& state) { - driver->SetClip_PathFill(clipPath, &clipMatrix2, CFX_FillRenderOptions()); - if (state.m_graphic == State::Graphic::kPath) { - driver->DrawPath(path2, &matrix2, &graphState, 0xFF112233, 0, -- {.fill_type = CFX_FillRenderOptions::FillType::kWinding}, -+ CFX_FillRenderOptions::WindingOptions(), - BlendMode::kNormal); - } else if (state.m_graphic == State::Graphic::kText) { - driver->DrawDeviceText(charPos, &font, matrix2, fontSize, 0xFF445566, -diff --git a/third_party/pdfium/core/fxge/win32/cps_printer_driver.cpp b/third_party/pdfium/core/fxge/win32/cps_printer_driver.cpp -index b687945..f30b80d 100644 ---- a/third_party/pdfium/core/fxge/win32/cps_printer_driver.cpp -+++ b/third_party/pdfium/core/fxge/win32/cps_printer_driver.cpp -@@ -81,9 +81,8 @@ CPSPrinterDriver::CPSPrinterDriver(HDC hDC, - static_cast(pRect->right), - static_cast(pRect->top)); - } -- m_PSRenderer.SetClip_PathFill( -- path, nullptr, -- {.fill_type = CFX_FillRenderOptions::FillType::kWinding}); -+ m_PSRenderer.SetClip_PathFill(path, nullptr, -+ CFX_FillRenderOptions::WindingOptions()); - } - } - } -diff --git a/third_party/pdfium/fpdfsdk/cpdfsdk_widget.cpp b/third_party/pdfium/fpdfsdk/cpdfsdk_widget.cpp -index 331bc51..162502c 100644 ---- a/third_party/pdfium/fpdfsdk/cpdfsdk_widget.cpp -+++ b/third_party/pdfium/fpdfsdk/cpdfsdk_widget.cpp -@@ -923,7 +923,7 @@ void CPDFSDK_Widget::DrawAppearance(CFX_RenderDevice* pDevice, - CFX_Path path; - path.AppendFloatRect(GetRect()); - pDevice->DrawPath(path, &mtUser2Device, &gsd, 0, 0xFFAAAAAA, -- {.fill_type = CFX_FillRenderOptions::FillType::kEvenOdd}); -+ CFX_FillRenderOptions::EvenOddOptions()); - } else { - CPDFSDK_BAAnnot::DrawAppearance(pDevice, mtUser2Device, mode); - } -diff --git a/third_party/pdfium/fpdfsdk/pwl/cpwl_caret.cpp b/third_party/pdfium/fpdfsdk/pwl/cpwl_caret.cpp -index 2507f4b..47f7864 100644 ---- a/third_party/pdfium/fpdfsdk/pwl/cpwl_caret.cpp -+++ b/third_party/pdfium/fpdfsdk/pwl/cpwl_caret.cpp -@@ -50,7 +50,7 @@ void CPWL_Caret::DrawThisAppearance(CFX_RenderDevice* pDevice, - CFX_GraphStateData gsd; - gsd.m_LineWidth = m_fWidth; - pDevice->DrawPath(path, &mtUser2Device, &gsd, 0, ArgbEncode(255, 0, 0, 0), -- {.fill_type = CFX_FillRenderOptions::FillType::kEvenOdd}); -+ CFX_FillRenderOptions::EvenOddOptions()); - } - - void CPWL_Caret::OnTimerFired() { -diff --git a/third_party/pdfium/fpdfsdk/pwl/cpwl_cbbutton.cpp b/third_party/pdfium/fpdfsdk/pwl/cpwl_cbbutton.cpp -index 0cec527..de248ce 100644 ---- a/third_party/pdfium/fpdfsdk/pwl/cpwl_cbbutton.cpp -+++ b/third_party/pdfium/fpdfsdk/pwl/cpwl_cbbutton.cpp -@@ -55,7 +55,7 @@ void CPWL_CBButton::DrawThisAppearance(CFX_RenderDevice* pDevice, - - pDevice->DrawPath(path, &mtUser2Device, nullptr, - kDefaultBlackColor.ToFXColor(GetTransparency()), 0, -- {.fill_type = CFX_FillRenderOptions::FillType::kEvenOdd}); -+ CFX_FillRenderOptions::EvenOddOptions()); - } - - bool CPWL_CBButton::OnLButtonDown(Mask nFlag, -diff --git a/third_party/pdfium/fpdfsdk/pwl/cpwl_edit.cpp b/third_party/pdfium/fpdfsdk/pwl/cpwl_edit.cpp -index c4b0270..3657b88 100644 ---- a/third_party/pdfium/fpdfsdk/pwl/cpwl_edit.cpp -+++ b/third_party/pdfium/fpdfsdk/pwl/cpwl_edit.cpp -@@ -199,9 +199,9 @@ void CPWL_Edit::DrawThisAppearance(CFX_RenderDevice* pDevice, - path.AppendPoint(top, CFX_Path::Point::Type::kLine); - } - if (!path.GetPoints().empty()) { -- pDevice->DrawPath( -- path, &mtUser2Device, &gsd, 0, GetBorderColor().ToFXColor(255), -- {.fill_type = CFX_FillRenderOptions::FillType::kEvenOdd}); -+ pDevice->DrawPath(path, &mtUser2Device, &gsd, 0, -+ GetBorderColor().ToFXColor(255), -+ CFX_FillRenderOptions::EvenOddOptions()); - } - } - -diff --git a/third_party/pdfium/fpdfsdk/pwl/cpwl_edit_impl.cpp b/third_party/pdfium/fpdfsdk/pwl/cpwl_edit_impl.cpp -index 30b78ef..ba4f43d 100644 ---- a/third_party/pdfium/fpdfsdk/pwl/cpwl_edit_impl.cpp -+++ b/third_party/pdfium/fpdfsdk/pwl/cpwl_edit_impl.cpp -@@ -642,9 +642,8 @@ void CPWL_EditImpl::DrawEdit(CFX_RenderDevice* pDevice, - word.ptWord.x + word.fWidth, - line.ptLine.y + line.fLineAscent); - -- pDevice->DrawPath( -- pathSelBK, &mtUser2Device, nullptr, crSelBK, 0, -- {.fill_type = CFX_FillRenderOptions::FillType::kWinding}); -+ pDevice->DrawPath(pathSelBK, &mtUser2Device, nullptr, crSelBK, 0, -+ CFX_FillRenderOptions::WindingOptions()); - } - } - if (bContinuous) { -diff --git a/third_party/pdfium/fxbarcode/BC_TwoDimWriter.cpp b/third_party/pdfium/fxbarcode/BC_TwoDimWriter.cpp -index 708699a..56be5ce 100644 ---- a/third_party/pdfium/fxbarcode/BC_TwoDimWriter.cpp -+++ b/third_party/pdfium/fxbarcode/BC_TwoDimWriter.cpp -@@ -89,8 +89,7 @@ void CBC_TwoDimWriter::RenderDeviceResult(CFX_RenderDevice* device, - CFX_Path path; - path.AppendRect(0, 0, m_Width, m_Height); - device->DrawPath(path, &matrix, &stateData, kBackgroundColor, -- kBackgroundColor, -- {.fill_type = CFX_FillRenderOptions::FillType::kEvenOdd}); -+ kBackgroundColor, CFX_FillRenderOptions::EvenOddOptions()); - int32_t leftPos = m_leftPadding; - int32_t topPos = m_topPadding; - -@@ -119,9 +118,8 @@ void CBC_TwoDimWriter::RenderDeviceResult(CFX_RenderDevice* device, - topPos + start_y_output * m_multiY, - leftPos + end_x_output * m_multiX, - topPos + end_y_output * m_multiY); -- device->DrawPath( -- rect, &matri, &data, kBarColor, 0, -- {.fill_type = CFX_FillRenderOptions::FillType::kWinding}); -+ device->DrawPath(rect, &matri, &data, kBarColor, 0, -+ CFX_FillRenderOptions::WindingOptions()); - } - } - } -diff --git a/third_party/pdfium/fxbarcode/oned/BC_OneDimWriter.cpp b/third_party/pdfium/fxbarcode/oned/BC_OneDimWriter.cpp -index 7c2604a..3320c47 100644 ---- a/third_party/pdfium/fxbarcode/oned/BC_OneDimWriter.cpp -+++ b/third_party/pdfium/fxbarcode/oned/BC_OneDimWriter.cpp -@@ -237,15 +237,14 @@ bool CBC_OneDimWriter::RenderDeviceResult(CFX_RenderDevice* device, - path.AppendRect(0, 0, static_cast(m_Width), - static_cast(m_Height)); - device->DrawPath(path, &matrix, &stateData, kBackgroundColor, -- kBackgroundColor, -- {.fill_type = CFX_FillRenderOptions::FillType::kEvenOdd}); -+ kBackgroundColor, CFX_FillRenderOptions::EvenOddOptions()); - CFX_Matrix scaledMatrix(m_outputHScale, 0.0, 0.0, - static_cast(m_Height), 0.0, 0.0); - scaledMatrix.Concat(matrix); - for (const auto& rect : m_output) { - CFX_GraphStateData data; - device->DrawPath(rect, &scaledMatrix, &data, kBarColor, 0, -- {.fill_type = CFX_FillRenderOptions::FillType::kWinding}); -+ CFX_FillRenderOptions::WindingOptions()); - } - - return m_locTextLoc == BC_TEXT_LOC::kNone || !contents.Contains(' ') || -diff --git a/third_party/pdfium/xfa/fgas/graphics/cfgas_gegraphics.cpp b/third_party/pdfium/xfa/fgas/graphics/cfgas_gegraphics.cpp -index ecac51a..6f255d6 100644 ---- a/third_party/pdfium/xfa/fgas/graphics/cfgas_gegraphics.cpp -+++ b/third_party/pdfium/xfa/fgas/graphics/cfgas_gegraphics.cpp -@@ -221,7 +221,7 @@ void CFGAS_GEGraphics::RenderDeviceFillPath( - CFX_Matrix m = m_info.CTM; - m.Concat(matrix); - -- const CFX_FillRenderOptions fill_options = {.fill_type = fill_type}; -+ const CFX_FillRenderOptions fill_options(fill_type); - switch (m_info.fillColor.GetType()) { - case CFGAS_GEColor::Solid: - m_renderDevice->DrawPath(path.GetPath(), &m, &m_info.graphState, -diff --git a/third_party/pdfium/xfa/fxfa/cxfa_ffwidget.cpp b/third_party/pdfium/xfa/fxfa/cxfa_ffwidget.cpp -index 0a456dd..74b1cb2 100644 ---- a/third_party/pdfium/xfa/fxfa/cxfa_ffwidget.cpp -+++ b/third_party/pdfium/xfa/fxfa/cxfa_ffwidget.cpp -@@ -120,8 +120,8 @@ void XFA_DrawImage(CFGAS_GEGraphics* pGS, - CFX_RenderDevice::StateRestorer restorer(pRenderDevice); - CFX_Path path; - path.AppendRect(rtImage.left, rtImage.bottom(), rtImage.right(), rtImage.top); -- pRenderDevice->SetClip_PathFill( -- path, &matrix, {.fill_type = CFX_FillRenderOptions::FillType::kWinding}); -+ pRenderDevice->SetClip_PathFill(path, &matrix, -+ CFX_FillRenderOptions::WindingOptions()); - - CFX_Matrix mtImage(1, 0, 0, -1, 0, 1); - mtImage.Concat( diff --git a/meta-chromium/recipes-browser/chromium/files/backport/ToTLinux-Fix-some-narrowing-errors.patch b/meta-chromium/recipes-browser/chromium/files/backport/ToTLinux-Fix-some-narrowing-errors.patch new file mode 100644 index 000000000..5d036ab92 --- /dev/null +++ b/meta-chromium/recipes-browser/chromium/files/backport/ToTLinux-Fix-some-narrowing-errors.patch @@ -0,0 +1,53 @@ +From b90c3695c7ecb15dd982118a2cc28a46c23c7c2f Mon Sep 17 00:00:00 2001 +From: Max Ihlenfeldt +Date: Wed, 13 Mar 2024 10:37:53 +0000 +Subject: [PATCH 2/2] Backport "[ToTLinux] Fix some narrowing errors" + +This patch error fixes build errors with clang 18. It will be included +in upstream's 122 release. + +Upstream-Status: Backport [https://crrev.com/c/5150303] +Signed-off-by: Max Ihlenfeldt +--- + cc/layers/mirror_layer_impl.h | 4 +++- + components/power_metrics/energy_metrics_provider_linux.cc | 4 ++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/cc/layers/mirror_layer_impl.h b/cc/layers/mirror_layer_impl.h +index e68b1f6..b1355f8 100644 +--- a/cc/layers/mirror_layer_impl.h ++++ b/cc/layers/mirror_layer_impl.h +@@ -5,6 +5,7 @@ + #ifndef CC_LAYERS_MIRROR_LAYER_IMPL_H_ + #define CC_LAYERS_MIRROR_LAYER_IMPL_H_ + ++#include + #include + + #include "base/memory/ptr_util.h" +@@ -56,7 +57,8 @@ class CC_EXPORT MirrorLayerImpl : public LayerImpl { + private: + const char* LayerTypeAsString() const override; + viz::CompositorRenderPassId mirrored_layer_render_pass_id() const { +- return viz::CompositorRenderPassId{mirrored_layer_id()}; ++ return viz::CompositorRenderPassId{ ++ static_cast(mirrored_layer_id())}; + } + + int mirrored_layer_id_ = 0; +diff --git a/components/power_metrics/energy_metrics_provider_linux.cc b/components/power_metrics/energy_metrics_provider_linux.cc +index 0c0b097..e1ae8f8 100644 +--- a/components/power_metrics/energy_metrics_provider_linux.cc ++++ b/components/power_metrics/energy_metrics_provider_linux.cc +@@ -61,9 +61,9 @@ bool ReadDoubleFromFile(base::FilePath path, double* output) { + // value of less than 1. Here, we only consider cpu0. See details in + // https://man7.org/linux/man-pages/man2/perf_event_open.2.html. + base::ScopedFD OpenPerfEvent(perf_event_attr* perf_attr) { +- base::ScopedFD perf_fd{syscall(__NR_perf_event_open, perf_attr, /*pid=*/-1, ++ base::ScopedFD perf_fd(syscall(__NR_perf_event_open, perf_attr, /*pid=*/-1, + /*cpu=*/0, /*group_fd=*/-1, +- PERF_FLAG_FD_CLOEXEC)}; ++ static_cast(PERF_FLAG_FD_CLOEXEC))); + return perf_fd; + } + diff --git a/meta-chromium/recipes-browser/chromium/files/backport/Update-LegacyStatsCollector-to-conform-with.patch b/meta-chromium/recipes-browser/chromium/files/backport/Update-LegacyStatsCollector-to-conform-with.patch new file mode 100644 index 000000000..b6b43fd71 --- /dev/null +++ b/meta-chromium/recipes-browser/chromium/files/backport/Update-LegacyStatsCollector-to-conform-with.patch @@ -0,0 +1,115 @@ +From 16f6a7ce45683f3270e998e32c306e2f9beba25e Mon Sep 17 00:00:00 2001 +From: Max Ihlenfeldt +Date: Wed, 13 Mar 2024 10:34:20 +0000 +Subject: [PATCH 1/2] Backport "Update LegacyStatsCollector to conform with + Wc++11-narrowing" + +This patch error fixes build errors with clang 18. It will be included +in upstream's 122 release. + +Upstream-Status: Backport [https://webrtc-review.googlesource.com/c/src/+/332240] +Signed-off-by: Max Ihlenfeldt +--- + .../webrtc/pc/legacy_stats_collector.cc | 51 ++++++++++++------- + 1 file changed, 32 insertions(+), 19 deletions(-) + +diff --git a/third_party/webrtc/pc/legacy_stats_collector.cc b/third_party/webrtc/pc/legacy_stats_collector.cc +index 98b7cb9..a6a6945 100644 +--- a/third_party/webrtc/pc/legacy_stats_collector.cc ++++ b/third_party/webrtc/pc/legacy_stats_collector.cc +@@ -188,9 +188,10 @@ void ExtractStats(const cricket::VoiceReceiverInfo& info, + {StatsReport::kStatsValueNameAccelerateRate, info.accelerate_rate}, + {StatsReport::kStatsValueNamePreemptiveExpandRate, + info.preemptive_expand_rate}, +- {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_output_energy}, ++ {StatsReport::kStatsValueNameTotalAudioEnergy, ++ static_cast(info.total_output_energy)}, + {StatsReport::kStatsValueNameTotalSamplesDuration, +- info.total_output_duration}}; ++ static_cast(info.total_output_duration)}}; + + const IntForAdd ints[] = { + {StatsReport::kStatsValueNameCurrentDelayMs, info.delay_estimate_ms}, +@@ -244,9 +245,10 @@ void ExtractStats(const cricket::VoiceSenderInfo& info, + SetAudioProcessingStats(report, info.apm_statistics); + + const FloatForAdd floats[] = { +- {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_input_energy}, ++ {StatsReport::kStatsValueNameTotalAudioEnergy, ++ static_cast(info.total_input_energy)}, + {StatsReport::kStatsValueNameTotalSamplesDuration, +- info.total_input_duration}}; ++ static_cast(info.total_input_duration)}}; + + RTC_DCHECK_GE(info.audio_level, 0); + const IntForAdd ints[] = { +@@ -340,7 +342,8 @@ void ExtractStats(const cricket::VideoReceiverInfo& info, + {StatsReport::kStatsValueNamePlisSent, info.plis_sent}, + {StatsReport::kStatsValueNameRenderDelayMs, info.render_delay_ms}, + {StatsReport::kStatsValueNameTargetDelayMs, info.target_delay_ms}, +- {StatsReport::kStatsValueNameFramesDecoded, info.frames_decoded}, ++ {StatsReport::kStatsValueNameFramesDecoded, ++ static_cast(info.frames_decoded)}, + }; + + for (const auto& i : ints) +@@ -383,15 +386,19 @@ void ExtractStats(const cricket::VideoSenderInfo& info, + info.encode_usage_percent}, + {StatsReport::kStatsValueNameFirsReceived, info.firs_received}, + {StatsReport::kStatsValueNameFrameHeightSent, info.send_frame_height}, +- {StatsReport::kStatsValueNameFrameRateInput, round(info.framerate_input)}, ++ {StatsReport::kStatsValueNameFrameRateInput, ++ static_cast(round(info.framerate_input))}, + {StatsReport::kStatsValueNameFrameRateSent, info.framerate_sent}, + {StatsReport::kStatsValueNameFrameWidthSent, info.send_frame_width}, +- {StatsReport::kStatsValueNameNacksReceived, info.nacks_received}, ++ {StatsReport::kStatsValueNameNacksReceived, ++ static_cast(info.nacks_received)}, + {StatsReport::kStatsValueNamePacketsLost, info.packets_lost}, + {StatsReport::kStatsValueNamePacketsSent, info.packets_sent}, + {StatsReport::kStatsValueNamePlisReceived, info.plis_received}, +- {StatsReport::kStatsValueNameFramesEncoded, info.frames_encoded}, +- {StatsReport::kStatsValueNameHugeFramesSent, info.huge_frames_sent}, ++ {StatsReport::kStatsValueNameFramesEncoded, ++ static_cast(info.frames_encoded)}, ++ {StatsReport::kStatsValueNameHugeFramesSent, ++ static_cast(info.huge_frames_sent)}, + }; + + for (const auto& i : ints) +@@ -778,19 +785,25 @@ StatsReport* LegacyStatsCollector::AddConnectionInfoReport( + AddCandidateReport(remote_candidate_stats, false)->id()); + + const Int64ForAdd int64s[] = { +- {StatsReport::kStatsValueNameBytesReceived, info.recv_total_bytes}, +- {StatsReport::kStatsValueNameBytesSent, info.sent_total_bytes}, +- {StatsReport::kStatsValueNamePacketsSent, info.sent_total_packets}, +- {StatsReport::kStatsValueNameRtt, info.rtt}, ++ {StatsReport::kStatsValueNameBytesReceived, ++ static_cast(info.recv_total_bytes)}, ++ {StatsReport::kStatsValueNameBytesSent, ++ static_cast(info.sent_total_bytes)}, ++ {StatsReport::kStatsValueNamePacketsSent, ++ static_cast(info.sent_total_packets)}, ++ {StatsReport::kStatsValueNameRtt, static_cast(info.rtt)}, + {StatsReport::kStatsValueNameSendPacketsDiscarded, +- info.sent_discarded_packets}, ++ static_cast(info.sent_discarded_packets)}, + {StatsReport::kStatsValueNameSentPingRequestsTotal, +- info.sent_ping_requests_total}, ++ static_cast(info.sent_ping_requests_total)}, + {StatsReport::kStatsValueNameSentPingRequestsBeforeFirstResponse, +- info.sent_ping_requests_before_first_response}, +- {StatsReport::kStatsValueNameSentPingResponses, info.sent_ping_responses}, +- {StatsReport::kStatsValueNameRecvPingRequests, info.recv_ping_requests}, +- {StatsReport::kStatsValueNameRecvPingResponses, info.recv_ping_responses}, ++ static_cast(info.sent_ping_requests_before_first_response)}, ++ {StatsReport::kStatsValueNameSentPingResponses, ++ static_cast(info.sent_ping_responses)}, ++ {StatsReport::kStatsValueNameRecvPingRequests, ++ static_cast(info.recv_ping_requests)}, ++ {StatsReport::kStatsValueNameRecvPingResponses, ++ static_cast(info.recv_ping_responses)}, + }; + for (const auto& i : int64s) + report->AddInt64(i.name, i.value); diff --git a/meta-chromium/recipes-browser/chromium/files/backport/atspi-mark-possibly-unused-gn-variables.patch b/meta-chromium/recipes-browser/chromium/files/backport/atspi-mark-possibly-unused-gn-variables.patch deleted file mode 100644 index bd5342617..000000000 --- a/meta-chromium/recipes-browser/chromium/files/backport/atspi-mark-possibly-unused-gn-variables.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 6725b4f6171bc491a435f4302af2c5c59b82f700 Mon Sep 17 00:00:00 2001 -From: Elly -Date: Thu, 2 Nov 2023 22:46:35 +0000 -Subject: [PATCH] Backport "atspi: mark possibly unused gn variables" - -This fixes an error in the do_configure task that occurs if the atspi -version is >= 2.49.90. The patch will be included in upstream's 121 -release. - -Upstream-Status: Backport [https://crrev.com/c/5001687] -Signed-off-by: Max Ihlenfeldt ---- - build/config/linux/atspi2/BUILD.gn | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/build/config/linux/atspi2/BUILD.gn b/build/config/linux/atspi2/BUILD.gn -index d162920..30bc77f 100644 ---- a/build/config/linux/atspi2/BUILD.gn -+++ b/build/config/linux/atspi2/BUILD.gn -@@ -21,10 +21,21 @@ if (use_atk) { - minor = atspi_version[1] - micro = atspi_version[2] - -+ # These aren't necessarily used if atspi is not old enough to require them. -+ # Also, gn considers variables unused if the only use of them is -+ # short-circuited away, so for example if major == 2 and minor == 48, micro -+ # would be unused. -+ not_needed([ -+ "major", -+ "minor", -+ "micro", -+ ]) -+ - # ATSPI 2.49.90 now defines these for us and it's an error for us to - # redefine them on the compiler command line. - # See ATSPI 927344a34cd5bf81fc64da4968241735ecb4f03b -- if (minor < 49 || (minor == 49 && micro < 90)) { -+ if (major < 2 || (major == 2 && minor < 49) || -+ (major == 2 && minor == 49 && micro < 90)) { - defines = [ - "ATSPI_MAJOR_VERSION=$major", - "ATSPI_MINOR_VERSION=$minor", diff --git a/meta-chromium/recipes-browser/chromium/files/backport/six-Update-vendored-copy-of-six-to-1.16.0.patch b/meta-chromium/recipes-browser/chromium/files/backport/six-Update-vendored-copy-of-six-to-1.16.0.patch new file mode 100644 index 000000000..c47cad83d --- /dev/null +++ b/meta-chromium/recipes-browser/chromium/files/backport/six-Update-vendored-copy-of-six-to-1.16.0.patch @@ -0,0 +1,168 @@ +From 37c29d37b43c7c15705c2ec82c6af1c0ae56b669 Mon Sep 17 00:00:00 2001 +From: Max Ihlenfeldt +Date: Wed, 14 Feb 2024 12:36:56 +0000 +Subject: [PATCH] Backport "[six] Update vendored copy of six to 1.16.0." + +This is needed to fix the build with Python 3.12, which OE master +already uses. The patch will be included in upstream's 122 release. + +Upstream-Status: Backport [https://crrev.com/c/5092950] +Signed-off-by: Max Ihlenfeldt +--- + third_party/catapult/third_party/six/CHANGES | 10 ++++++++-- + third_party/catapult/third_party/six/PKG-INFO | 2 +- + third_party/catapult/third_party/six/README | 17 ++++------------- + .../catapult/third_party/six/README.chromium | 4 ++-- + .../third_party/six/six.egg-info/PKG-INFO | 2 +- + third_party/catapult/third_party/six/six.py | 18 +++++++++++++++++- + 6 files changed, 33 insertions(+), 20 deletions(-) + +diff --git a/third_party/catapult/third_party/six/CHANGES b/third_party/catapult/third_party/six/CHANGES +index ad4cbaa..f3bf6a4 100644 +--- a/third_party/catapult/third_party/six/CHANGES ++++ b/third_party/catapult/third_party/six/CHANGES +@@ -3,6 +3,12 @@ Changelog for six + + This file lists the changes in each six version. + ++1.16.0 ++------ ++ ++- Pull request #343, issue #341, pull request #349: Port _SixMetaPathImporter to ++ Python 3.10. ++ + 1.15.0 + ------ + +@@ -100,7 +106,7 @@ This file lists the changes in each six version. + + - Issue #98: Fix `six.moves` race condition in multi-threaded code. + +-- Pull request #51: Add `six.view(keys|values|itmes)`, which provide dictionary ++- Pull request #51: Add `six.view(keys|values|items)`, which provide dictionary + views on Python 2.7+. + + - Issue #112: `six.moves.reload_module` now uses the importlib module on +@@ -227,7 +233,7 @@ This file lists the changes in each six version. + - Issue #40: Add import mapping for the Python 2 gdbm module. + + - Issue #35: On Python versions less than 2.7, print_ now encodes unicode +- strings when outputing to standard streams. (Python 2.7 handles this ++ strings when outputting to standard streams. (Python 2.7 handles this + automatically.) + + 1.4.1 +diff --git a/third_party/catapult/third_party/six/PKG-INFO b/third_party/catapult/third_party/six/PKG-INFO +index 75aba67..1e57620 100644 +--- a/third_party/catapult/third_party/six/PKG-INFO ++++ b/third_party/catapult/third_party/six/PKG-INFO +@@ -1,6 +1,6 @@ + Metadata-Version: 1.2 + Name: six +-Version: 1.15.0 ++Version: 1.16.0 + Summary: Python 2 and 3 compatibility utilities + Home-page: https://github.com/benjaminp/six + Author: Benjamin Peterson +diff --git a/third_party/catapult/third_party/six/README b/third_party/catapult/third_party/six/README +index ee628a9..560a773 100644 +--- a/third_party/catapult/third_party/six/README ++++ b/third_party/catapult/third_party/six/README +@@ -1,16 +1,7 @@ +-Six is a Python 2 and 3 compatibility library. It provides utility functions +-for smoothing over the differences between the Python versions with the goal of +-writing Python code that is compatible on both Python versions. See the +-documentation for more information on what is provided. ++Six is a Python 2 and 3 compatibility library. It provides utility functions for smoothing over the differences between the Python versions with the goal of writing Python code that is compatible on both Python versions. See the documentation for more information on what is provided. + +-Six supports every Python version since 2.6. It is contained in only one Python +-file, so it can be easily copied into your project. (The copyright and license +-notice must be retained.) ++Six supports Python 2.7 and 3.3+. It is contained in only one Python file, so it can be easily copied into your project. (The copyright and license notice must be retained.) + +-Online documentation is at https://pythonhosted.org/six/. ++Online documentation is at https://six.readthedocs.io/. + +-Bugs can be reported to https://bitbucket.org/gutworth/six. The code can also +-be found there. +- +-For questions about six or porting in general, email the python-porting mailing +-list: https://mail.python.org/mailman/listinfo/python-porting ++Bugs can be reported to https://github.com/benjaminp/six. The code can also be found there. +\ No newline at end of file +diff --git a/third_party/catapult/third_party/six/README.chromium b/third_party/catapult/third_party/six/README.chromium +index 6f7a9cb..3021912 100644 +--- a/third_party/catapult/third_party/six/README.chromium ++++ b/third_party/catapult/third_party/six/README.chromium +@@ -1,7 +1,7 @@ + Name: six + URL: https://pypi.org/project/six/ +-Version: 1.15.0 +-Date: 2021-03-02 ++Version: 1.16.0 ++Date: 2021-05-05 + License: MIT + License File: LICENSE + Security Critical: no +diff --git a/third_party/catapult/third_party/six/six.egg-info/PKG-INFO b/third_party/catapult/third_party/six/six.egg-info/PKG-INFO +index 75aba67..1e57620 100644 +--- a/third_party/catapult/third_party/six/six.egg-info/PKG-INFO ++++ b/third_party/catapult/third_party/six/six.egg-info/PKG-INFO +@@ -1,6 +1,6 @@ + Metadata-Version: 1.2 + Name: six +-Version: 1.15.0 ++Version: 1.16.0 + Summary: Python 2 and 3 compatibility utilities + Home-page: https://github.com/benjaminp/six + Author: Benjamin Peterson +diff --git a/third_party/catapult/third_party/six/six.py b/third_party/catapult/third_party/six/six.py +index 83f6978..4e15675 100644 +--- a/third_party/catapult/third_party/six/six.py ++++ b/third_party/catapult/third_party/six/six.py +@@ -29,7 +29,7 @@ import sys + import types + + __author__ = "Benjamin Peterson " +-__version__ = "1.15.0" ++__version__ = "1.16.0" + + + # Useful for very coarse version differentiation. +@@ -71,6 +71,11 @@ else: + MAXSIZE = int((1 << 63) - 1) + del X + ++if PY34: ++ from importlib.util import spec_from_loader ++else: ++ spec_from_loader = None ++ + + def _add_doc(func, doc): + """Add documentation to a function.""" +@@ -186,6 +191,11 @@ class _SixMetaPathImporter(object): + return self + return None + ++ def find_spec(self, fullname, path, target=None): ++ if fullname in self.known_modules: ++ return spec_from_loader(fullname, self) ++ return None ++ + def __get_module(self, fullname): + try: + return self.known_modules[fullname] +@@ -223,6 +233,12 @@ class _SixMetaPathImporter(object): + return None + get_source = get_code # same as get_code + ++ def create_module(self, spec): ++ return self.load_module(spec.name) ++ ++ def exec_module(self, module): ++ pass ++ + _importer = _SixMetaPathImporter(__name__) + + diff --git a/meta-chromium/recipes-browser/chromium/gn-native_120.0.6099.224.bb b/meta-chromium/recipes-browser/chromium/gn-native_121.0.6167.184.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/gn-native_120.0.6099.224.bb rename to meta-chromium/recipes-browser/chromium/gn-native_121.0.6167.184.bb