diff --git a/x11-packages/electron-host-tools-for-code-oss/build.sh b/x11-packages/electron-host-tools-for-code-oss/build.sh index 6a532674c4..52c7663095 100644 --- a/x11-packages/electron-host-tools-for-code-oss/build.sh +++ b/x11-packages/electron-host-tools-for-code-oss/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://github.com/electron/electron TERMUX_PKG_DESCRIPTION="Build cross-platform desktop apps with JavaScript, HTML, and CSS (Used by Code-OSS, Host Tools)" TERMUX_PKG_LICENSE="MIT, BSD 3-Clause" TERMUX_PKG_MAINTAINER="@licy183" -_CHROMIUM_VERSION=138.0.7204.251 -TERMUX_PKG_VERSION=37.7.0 +_CHROMIUM_VERSION=142.0.7444.175 +TERMUX_PKG_VERSION=39.2.3 TERMUX_PKG_SRCURL=git+https://github.com/electron/electron TERMUX_PKG_DEPENDS="atk, cups, dbus, fontconfig, gtk3, krb5, libc++, libevdev, libxkbcommon, libminizip, libnss, libx11, mesa, openssl, pango, pulseaudio, zlib" TERMUX_PKG_BUILD_DEPENDS="libnotify, libffi-static" @@ -204,6 +204,7 @@ use_bundled_fontconfig = false use_system_freetype = false use_custom_libcxx = false use_custom_libcxx_for_host = true +use_clang_modules = false use_allocator_shim = false use_partition_alloc_as_malloc = false enable_backup_ref_ptr_slow_checks = false @@ -214,22 +215,22 @@ enable_backup_ref_ptr_support = false enable_pointer_compression_support = false use_nss_certs = true use_udev = false -use_alsa = false -use_libpci = false -use_pulseaudio = true use_ozone = true ozone_auto_platforms = false ozone_platform = \"x11\" ozone_platform_x11 = true +# TODO: Enable wayland ozone_platform_wayland = false ozone_platform_headless = true angle_enable_vulkan = true angle_enable_swiftshader = true angle_enable_abseil = false +use_libpci = false +use_alsa = false +use_pulseaudio = true rtc_use_pipewire = false use_vaapi = false # See comments on Chromium package -enable_nacl = false is_cfi = false use_cfi_icall = false use_thin_lto = false @@ -238,7 +239,7 @@ build_tflite_with_opencl = false build_tflite_with_nnapi = true # Enable rust custom_target_rust_abi_target = \"$CARGO_TARGET_NAME\" -llvm_android_mainline = true +clang_warning_suppression_file = \"\" exclude_unwind_tables = false # Enable jumbo build (unified build) use_jumbo_build = true diff --git a/x11-packages/electron-host-tools-for-code-oss/cr-patches/0001-compiler-use-android-target.patch b/x11-packages/electron-host-tools-for-code-oss/cr-patches/0001-compiler-use-android-target.patch index 0bf85d36dd..6ddf6c11fd 100644 --- a/x11-packages/electron-host-tools-for-code-oss/cr-patches/0001-compiler-use-android-target.patch +++ b/x11-packages/electron-host-tools-for-code-oss/cr-patches/0001-compiler-use-android-target.patch @@ -1,42 +1,42 @@ --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1233,7 +1233,7 @@ +@@ -1278,7 +1278,7 @@ + # CPU architecture. We may or may not be doing a cross compile now, so for # simplicity we always explicitly set the architecture. if (current_cpu == "x64") { - if (is_clang && !is_android && !is_nacl && !is_fuchsia && -- !is_chromeos_device) { -+ !is_chromeos_device && false) { +- if (is_clang && !is_android && !is_fuchsia && !is_chromeos_device) { ++ if (is_clang && !is_android && !is_fuchsia && !is_chromeos_device && false) { cflags += [ "--target=x86_64-unknown-linux-gnu" ] ldflags += [ "--target=x86_64-unknown-linux-gnu" ] } else { -@@ -1242,7 +1242,7 @@ +@@ -1287,7 +1287,7 @@ } cflags += [ "-msse3" ] } else if (current_cpu == "x86") { -- if (is_clang && !is_android && !is_nacl && !is_chromeos_device) { -+ if (is_clang && !is_android && !is_nacl && !is_chromeos_device && false) { +- if (is_clang && !is_android && !is_chromeos_device) { ++ if (is_clang && !is_android && !is_chromeos_device && false) { cflags += [ "--target=i386-unknown-linux-gnu" ] ldflags += [ "--target=i386-unknown-linux-gnu" ] } else { -@@ -1257,8 +1257,8 @@ - } +@@ -1300,8 +1300,8 @@ + ] } else if (current_cpu == "arm") { - if (is_clang && !is_android && !is_nacl && !is_chromeos_device) { + if (is_clang && !is_android && !is_chromeos_device) { - cflags += [ "--target=arm-linux-gnueabihf" ] - ldflags += [ "--target=arm-linux-gnueabihf" ] -+ cflags += [ "--target=armv7a-linux-android24" ] -+ ldflags += [ "--target=armv7a-linux-android24" ] ++ cflags += [ "--target=armv7a-linux-androideabi24" ] ++ ldflags += [ "--target=armv7a-linux-androideabi24" ] + } + cflags += [ + "-march=$arm_arch", +@@ -1312,8 +1312,8 @@ } - if (!is_nacl) { - cflags += [ -@@ -1272,8 +1272,8 @@ } else if (current_cpu == "arm64") { - if (is_clang && !is_android && !is_nacl && !is_fuchsia && - !is_chromeos_device) { + if (is_clang && !is_android && !is_fuchsia && !is_chromeos_device) { - cflags += [ "--target=aarch64-linux-gnu" ] - ldflags += [ "--target=aarch64-linux-gnu" ] + cflags += [ "--target=aarch64-linux-android24" ] + ldflags += [ "--target=aarch64-linux-android24" ] } - } else if (current_cpu == "mipsel" && !is_nacl) { + } else if (current_cpu == "mipsel") { ldflags += [ "-Wl,--hash-style=sysv" ] diff --git a/x11-packages/electron-host-tools-for-code-oss/cr-patches/0003-compiler-use-custom-libcxx-for-v8.patch b/x11-packages/electron-host-tools-for-code-oss/cr-patches/0003-compiler-use-custom-libcxx-for-v8.patch index 52468979a1..4f26d2e9dd 100644 --- a/x11-packages/electron-host-tools-for-code-oss/cr-patches/0003-compiler-use-custom-libcxx-for-v8.patch +++ b/x11-packages/electron-host-tools-for-code-oss/cr-patches/0003-compiler-use-custom-libcxx-for-v8.patch @@ -1,7 +1,7 @@ --- a/build/config/c++/c++.gni +++ b/build/config/c++/c++.gni @@ -6,6 +6,8 @@ - import("//build/config/sanitizers/sanitizers.gni") + import("//build/toolchain/rbe.gni") import("//build_overrides/build.gni") +import("//v8/gni/snapshot_toolchain.gni") @@ -9,12 +9,12 @@ declare_args() { # Use in-tree libc++ (buildtools/third_party/libc++ and # buildtools/third_party/libc++abi) instead of the system C++ library for C++ -@@ -42,6 +44,8 @@ +@@ -52,6 +54,8 @@ use_custom_libcxx = use_custom_libcxx || (use_custom_libcxx_for_host && !is_a_target_toolchain) +use_custom_libcxx = + use_custom_libcxx || (use_custom_libcxx_for_host && current_toolchain == v8_snapshot_toolchain) - use_custom_libcxx = use_custom_libcxx && !is_nacl declare_args() { + # WARNING: Setting this to a non-default value is highly discouraged. diff --git a/x11-packages/electron-host-tools-for-code-oss/cr-patches/0004-compiler-clang-lib-dir.patch b/x11-packages/electron-host-tools-for-code-oss/cr-patches/0004-compiler-clang-lib-dir.patch index ea83a4f962..c6549283e4 100644 --- a/x11-packages/electron-host-tools-for-code-oss/cr-patches/0004-compiler-clang-lib-dir.patch +++ b/x11-packages/electron-host-tools-for-code-oss/cr-patches/0004-compiler-clang-lib-dir.patch @@ -1,9 +1,9 @@ --- a/build/config/clang/clang.gni +++ b/build/config/clang/clang.gni -@@ -35,6 +35,9 @@ - # Set to true to enable output of ThinLTO index and import files used for - # creating a Chromium MLGO corpus in the ThinLTO case. - lld_emit_indexes_and_imports = false +@@ -95,6 +95,9 @@ + clang_modules_platform_supported && using_tested_sysroot && + # reclient and icecc don't handle headers in modulemap config. + !use_reclient && !is_cronet_for_aosp_build && cc_wrapper != "icecc" + + custom_toolchain_clang_base_path = "" + custom_toolchain_clang_version = "" @@ -12,19 +12,18 @@ # We don't really need to collect a corpus for the host tools, just for the target. --- a/build/config/clang/BUILD.gn +++ b/build/config/clang/BUILD.gn -@@ -5,6 +5,8 @@ +@@ -4,6 +4,7 @@ + + import("//build/config/pch.gni") import("//build/config/rust.gni") - import("clang.gni") - +import("//v8/gni/snapshot_toolchain.gni") -+ + import("clang.gni") + if (is_ios) { - import("//build/config/ios/config.gni") # For `target_environment` - } -@@ -236,6 +236,20 @@ - assert(false) # Unhandled target platform +@@ -216,6 +217,19 @@ } + _clang_lib_dir = "$clang_base_path/lib/clang/$clang_version/lib" + if (is_a_target_toolchain && current_toolchain != v8_snapshot_toolchain) { + _dir = "linux" + _clang_lib_dir = "$custom_toolchain_clang_base_path/lib/clang/$custom_toolchain_clang_version/lib" @@ -38,7 +37,6 @@ + assert(false) # Unhandled cpu type + } + } -+ _lib_file = "${_prefix}clang_rt.${_libname}${_suffix}.${_ext}" libs = [ "$_clang_lib_dir/$_dir/$_lib_file" ] - + } diff --git a/x11-packages/electron-host-tools-for-code-oss/cr-patches/0006-compiler-fix-rust-deps.patch b/x11-packages/electron-host-tools-for-code-oss/cr-patches/0006-compiler-fix-rust-deps.patch new file mode 100644 index 0000000000..98f370f81d --- /dev/null +++ b/x11-packages/electron-host-tools-for-code-oss/cr-patches/0006-compiler-fix-rust-deps.patch @@ -0,0 +1,11 @@ +--- a/build/rust/std/rules/BUILD.gn ++++ b/build/rust/std/rules/BUILD.gn +@@ -1900,7 +1900,7 @@ + "//build/rust/std:profiler_builtins_group", + "//build/rust/std:std_build_deps", + ] +- if (is_android) { ++ if (true) { + deps += [ + ":alloc", + ":libc", diff --git a/x11-packages/electron-host-tools-for-code-oss/cr-patches/0007-compiler-disable-elf-crel.patch b/x11-packages/electron-host-tools-for-code-oss/cr-patches/0007-compiler-disable-elf-crel.patch new file mode 100644 index 0000000000..0ae4c3bdab --- /dev/null +++ b/x11-packages/electron-host-tools-for-code-oss/cr-patches/0007-compiler-disable-elf-crel.patch @@ -0,0 +1,11 @@ +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -685,7 +685,7 @@ + # TODO(crbug.com/376278218): This causes segfault on Linux ARM builds. + # It also causes segfault on Linux s390x: + # https://github.com/llvm/llvm-project/issues/149511 +- if (is_linux && use_lld && current_cpu != "arm" && current_cpu != "s390x") { ++ if (is_linux && use_lld && current_cpu != "arm" && current_cpu != "s390x" && false) { + cflags += [ "-Wa,--crel,--allow-experimental-crel" ] + } + } diff --git a/x11-packages/electron-host-tools-for-code-oss/cr-patches/1001-chromium-disable-sandbox.patch b/x11-packages/electron-host-tools-for-code-oss/cr-patches/1001-chromium-disable-sandbox.patch index aa60cf2f62..5dacd98ee0 100644 --- a/x11-packages/electron-host-tools-for-code-oss/cr-patches/1001-chromium-disable-sandbox.patch +++ b/x11-packages/electron-host-tools-for-code-oss/cr-patches/1001-chromium-disable-sandbox.patch @@ -29,12 +29,13 @@ // TODO(crbug.com/40188745): Implement crash reporter integration for Fuchsia. --- a/chrome/browser/ui/startup/bad_flags_prompt.cc +++ b/chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -67,10 +67,12 @@ +@@ -74,11 +74,13 @@ switches::kHostRules, // These flags disable sandbox-related security. +#ifndef __TERMUX__ sandbox::policy::switches::kDisableGpuSandbox, + sandbox::policy::switches::kDisableLandlockSandbox, sandbox::policy::switches::kDisableSeccompFilterSandbox, sandbox::policy::switches::kDisableSetuidSandbox, sandbox::policy::switches::kNoSandbox, diff --git a/x11-packages/electron-host-tools-for-code-oss/cr-patches/1008-chromium-no-futimes.patch b/x11-packages/electron-host-tools-for-code-oss/cr-patches/1008-chromium-no-futimes.patch index 01ea41171f..ef0e9452fa 100644 --- a/x11-packages/electron-host-tools-for-code-oss/cr-patches/1008-chromium-no-futimes.patch +++ b/x11-packages/electron-host-tools-for-code-oss/cr-patches/1008-chromium-no-futimes.patch @@ -1,9 +1,9 @@ --- a/base/files/file_posix.cc +++ b/base/files/file_posix.cc -@@ -50,7 +50,7 @@ +@@ -115,7 +115,7 @@ } - int CallFutimes(PlatformFile file, const struct timeval times[2]) { + int CallFutimes(PlatformFile file, const std::array times) { -#ifdef __USE_XOPEN2K8 +#if defined(__USE_XOPEN2K8) || (defined(__ANDROID__) && __ANDROID_API__ < 26) // futimens should be available, but futimes might not be diff --git a/x11-packages/electron-host-tools-for-code-oss/cr-patches/1020-chromium-debug-build-stack_trace.patch b/x11-packages/electron-host-tools-for-code-oss/cr-patches/1010-chromium-debug-build-stack_trace.patch similarity index 100% rename from x11-packages/electron-host-tools-for-code-oss/cr-patches/1020-chromium-debug-build-stack_trace.patch rename to x11-packages/electron-host-tools-for-code-oss/cr-patches/1010-chromium-debug-build-stack_trace.patch diff --git a/x11-packages/electron-host-tools-for-code-oss/cr-patches/1010-chromium-partition-allocator-memfd.patch b/x11-packages/electron-host-tools-for-code-oss/cr-patches/1010-chromium-partition-allocator-memfd.patch deleted file mode 100644 index 03afa6f97e..0000000000 --- a/x11-packages/electron-host-tools-for-code-oss/cr-patches/1010-chromium-partition-allocator-memfd.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/base/allocator/partition_allocator/src/partition_alloc/partition_address_space.cc -+++ b/base/allocator/partition_allocator/src/partition_alloc/partition_address_space.cc -@@ -36,6 +36,11 @@ - #include - #endif - -+#if defined(__ANDROID__) && __ANDROID_API__ < 30 -+#include -+#define memfd_create(name,flags) syscall(SYS_memfd_create,name,flags) -+#endif -+ - namespace partition_alloc::internal { - - #if PA_BUILDFLAG(HAS_64_BIT_POINTERS) ---- a/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc -+++ b/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc -@@ -51,6 +51,11 @@ - #endif // PA_CONFIG(ENABLE_SHADOW_METADATA) - #endif // PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) - -+#if defined(__ANDROID__) && __ANDROID_API__ < 30 -+#include -+#define memfd_create(name,flags) syscall(SYS_memfd_create,name,flags) -+#endif -+ - namespace partition_alloc::internal { - - #if PA_BUILDFLAG(RECORD_ALLOC_INFO) diff --git a/x11-packages/electron-host-tools-for-code-oss/cr-patches/1011-chromium-no-set-process-title.patch b/x11-packages/electron-host-tools-for-code-oss/cr-patches/1011-chromium-no-set-process-title.patch index bc386f78cf..d8f6b1cedf 100644 --- a/x11-packages/electron-host-tools-for-code-oss/cr-patches/1011-chromium-no-set-process-title.patch +++ b/x11-packages/electron-host-tools-for-code-oss/cr-patches/1011-chromium-no-set-process-title.patch @@ -4,8 +4,8 @@ // TODO(jrg): Find out if setproctitle or equivalent is available on Android. #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_SOLARIS) && \ -- !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_NACL) -+ !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_NACL) && !defined(__TERMUX__) +- !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA) ++ !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA) && !defined(__TERMUX__) void SetProcessTitleFromCommandLine(const char** main_argv) { // Build a single string which consists of all the arguments separated diff --git a/x11-packages/electron-host-tools-for-code-oss/cr-patches/1019-chromium-dummy-hid-service.patch b/x11-packages/electron-host-tools-for-code-oss/cr-patches/1019-chromium-dummy-hid-service.patch index c72634a060..b11c3c81a7 100644 --- a/x11-packages/electron-host-tools-for-code-oss/cr-patches/1019-chromium-dummy-hid-service.patch +++ b/x11-packages/electron-host-tools-for-code-oss/cr-patches/1019-chromium-dummy-hid-service.patch @@ -6,7 +6,7 @@ #include "services/device/hid/hid_service_fuchsia.h" +#elif defined(__TERMUX__) + -+#include "base/notreached.h" ++#include "base/notimplemented.h" +#include "services/device/hid/hid_connection.h" + +namespace device { diff --git a/x11-packages/electron-host-tools-for-code-oss/cr-patches/1020-chromium-base-no-pthread-mutexattr-protocol.patch b/x11-packages/electron-host-tools-for-code-oss/cr-patches/1020-chromium-base-no-pthread-mutexattr-protocol.patch new file mode 100644 index 0000000000..6d6cd4cdda --- /dev/null +++ b/x11-packages/electron-host-tools-for-code-oss/cr-patches/1020-chromium-base-no-pthread-mutexattr-protocol.patch @@ -0,0 +1,11 @@ +--- a/base/synchronization/lock_impl_posix.cc ++++ b/base/synchronization/lock_impl_posix.cc +@@ -92,7 +92,7 @@ + // Lock::PriorityInheritanceAvailable still must be checked as the code may + // compile but the underlying platform still may not correctly support priority + // inheritance locks. +-#if BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_FUCHSIA) || defined(__TERMUX__) + #define PRIORITY_INHERITANCE_LOCKS_POSSIBLE() 0 + #else + #define PRIORITY_INHERITANCE_LOCKS_POSSIBLE() 1 diff --git a/x11-packages/electron-host-tools-for-code-oss/cr-patches/1703-swiftshader-no-android.patch b/x11-packages/electron-host-tools-for-code-oss/cr-patches/1703-swiftshader-no-android.patch index 45d0444e4c..27ed3ac63f 100644 --- a/x11-packages/electron-host-tools-for-code-oss/cr-patches/1703-swiftshader-no-android.patch +++ b/x11-packages/electron-host-tools-for-code-oss/cr-patches/1703-swiftshader-no-android.patch @@ -220,7 +220,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift { { VK_KHR_SURFACE_EXTENSION_NAME, VK_KHR_SURFACE_SPEC_VERSION } }, { { VK_EXT_SURFACE_MAINTENANCE_1_EXTENSION_NAME, VK_EXT_SURFACE_MAINTENANCE_1_SPEC_VERSION } }, { { VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME, VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION } }, -@@ -376,7 +376,7 @@ +@@ -378,7 +378,7 @@ // Only 1.1 core version of this is supported. The extension has additional requirements //{{ VK_KHR_VARIABLE_POINTERS_EXTENSION_NAME, VK_KHR_VARIABLE_POINTERS_SPEC_VERSION }}, { { VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME, VK_EXT_QUEUE_FAMILY_FOREIGN_SPEC_VERSION } }, @@ -229,16 +229,16 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift // We fully support the KHR_swapchain v70 additions, so just track the spec version. { { VK_KHR_SWAPCHAIN_EXTENSION_NAME, VK_KHR_SWAPCHAIN_SPEC_VERSION } }, #else -@@ -449,7 +449,7 @@ - { { VK_KHR_VULKAN_MEMORY_MODEL_EXTENSION_NAME, VK_KHR_VULKAN_MEMORY_MODEL_SPEC_VERSION } }, +@@ -458,7 +458,7 @@ { { VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME, VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_SPEC_VERSION } }, { { VK_KHR_PIPELINE_LIBRARY_EXTENSION_NAME, VK_KHR_PIPELINE_LIBRARY_SPEC_VERSION } }, + { { VK_KHR_UNIFIED_IMAGE_LAYOUTS_EXTENSION_NAME, VK_KHR_UNIFIED_IMAGE_LAYOUTS_SPEC_VERSION } }, -#ifndef __ANDROID__ +#if !(defined(__ANDROID__) && !defined(__TERMUX__)) { { VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_EXTENSION_NAME, VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_SPEC_VERSION } }, { { VK_EXT_SWAPCHAIN_MAINTENANCE_1_EXTENSION_NAME, VK_EXT_SWAPCHAIN_MAINTENANCE_1_SPEC_VERSION } }, #endif -@@ -2038,7 +2038,7 @@ +@@ -2066,7 +2066,7 @@ const VkBaseInStructure *extensionCreateInfo = reinterpret_cast(pCreateInfo->pNext); @@ -247,7 +247,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift vk::BackingMemory backmem; bool swapchainImage = false; #endif -@@ -2049,7 +2049,7 @@ +@@ -2077,7 +2077,7 @@ // VK_STRUCTURE_TYPE_NATIVE_BUFFER_ANDROID, are not enumerated in the official Vulkan headers. switch((int)(extensionCreateInfo->sType)) { @@ -256,7 +256,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift case VK_STRUCTURE_TYPE_SWAPCHAIN_IMAGE_CREATE_INFO_ANDROID: { const VkSwapchainImageCreateInfoANDROID *swapImageCreateInfo = reinterpret_cast(extensionCreateInfo); -@@ -2109,7 +2109,7 @@ +@@ -2137,7 +2137,7 @@ VkResult result = vk::Image::Create(pAllocator, pCreateInfo, pImage, vk::Cast(device)); @@ -265,7 +265,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift if(swapchainImage) { if(result != VK_SUCCESS) -@@ -2147,7 +2147,7 @@ +@@ -2175,7 +2175,7 @@ TRACE("(VkDevice device = %p, VkImage image = %p, const VkAllocationCallbacks* pAllocator = %p)", device, static_cast(image), pAllocator); @@ -274,7 +274,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift vk::Image *img = vk::Cast(image); if(img && img->hasExternalMemory()) { -@@ -3573,7 +3573,7 @@ +@@ -3615,7 +3615,7 @@ /* Do nothing */ break; @@ -283,7 +283,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift case VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHR: { const auto *swapchainInfo = reinterpret_cast(extInfo); -@@ -3783,7 +3783,7 @@ +@@ -3825,7 +3825,7 @@ vk::Cast(physicalDevice)->getProperties(properties); } break; @@ -292,7 +292,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENTATION_PROPERTIES_ANDROID: { auto *properties = reinterpret_cast(extensionProperties); -@@ -4002,7 +4002,7 @@ +@@ -4044,7 +4044,7 @@ VkBaseOutStructure *extensionProperties = reinterpret_cast(pImageFormatProperties->pNext); @@ -301,7 +301,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift bool hasAHBUsage = false; #endif -@@ -4036,7 +4036,7 @@ +@@ -4078,7 +4078,7 @@ properties->identicalMemoryLayout = VK_TRUE; } break; @@ -310,7 +310,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift case VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_USAGE_ANDROID: { auto *properties = reinterpret_cast(extensionProperties); -@@ -4066,7 +4066,7 @@ +@@ -4108,7 +4108,7 @@ vk::Cast(physicalDevice)->getImageFormatProperties(format, type, tiling, usage, flags, &pImageFormatProperties->imageFormatProperties); @@ -319,7 +319,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift if(hasAHBUsage) { // AHardwareBuffer_lock may only be called with a single layer. -@@ -4189,7 +4189,7 @@ +@@ -4231,7 +4231,7 @@ { switch(extInfo->sType) { @@ -328,7 +328,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift case VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_ANDROID: break; #endif -@@ -4703,7 +4703,7 @@ +@@ -4745,7 +4745,7 @@ return vk::HeadlessSurfaceKHR::Create(pAllocator, pCreateInfo, pSurface); } @@ -337,7 +337,7 @@ diff -uNr a/third_party/swiftshader/src/Vulkan/libVulkan.cpp b/third_party/swift VKAPI_ATTR void VKAPI_CALL vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, const VkAllocationCallbacks *pAllocator) { TRACE("(VkInstance instance = %p, VkSurfaceKHR surface = %p, const VkAllocationCallbacks* pAllocator = %p)", -@@ -4921,7 +4921,7 @@ +@@ -4971,7 +4971,7 @@ #endif // ! __ANDROID__ diff --git a/x11-packages/electron-host-tools-for-code-oss/cr-patches/6001-add-missing-include-guard.patch b/x11-packages/electron-host-tools-for-code-oss/cr-patches/6001-add-missing-include-guard.patch deleted file mode 100644 index 7be84c2e6c..0000000000 --- a/x11-packages/electron-host-tools-for-code-oss/cr-patches/6001-add-missing-include-guard.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://github.com/chromium/chromium/commit/574a7eb053a0ca3ae94872a0cac72e0ba76ecd6d - ---- a/third_party/blink/renderer/core/html/forms/select_mutation_observer.h -+++ b/third_party/blink/renderer/core/html/forms/select_mutation_observer.h -@@ -2,6 +2,9 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_HTML_FORMS_SELECT_MUTATION_OBSERVER_H_ -+#define THIRD_PARTY_BLINK_RENDERER_CORE_HTML_FORMS_SELECT_MUTATION_OBSERVER_H_ -+ - #include "third_party/blink/renderer/core/dom/mutation_observer.h" - #include "third_party/blink/renderer/core/html/forms/html_select_element.h" - #include "third_party/blink/renderer/core/inspector/inspector_audits_issue.h" -@@ -56,3 +59,5 @@ class SelectMutationObserver : public MutationObserver::Delegate { - }; - - } // namespace blink -+ -+#endif // THIRD_PARTY_BLINK_RENDERER_CORE_HTML_FORMS_SELECT_MUTATION_OBSERVER_H_ diff --git a/x11-packages/electron-host-tools-for-code-oss/electron-patches/9009-fix-include-in-file_dialog.h.patch b/x11-packages/electron-host-tools-for-code-oss/electron-patches/9009-fix-include-in-file_dialog.h.patch new file mode 100644 index 0000000000..523e5e3ca9 --- /dev/null +++ b/x11-packages/electron-host-tools-for-code-oss/electron-patches/9009-fix-include-in-file_dialog.h.patch @@ -0,0 +1,11 @@ +--- a/electron/shell/browser/ui/file_dialog.h ++++ b/electron/shell/browser/ui/file_dialog.h +@@ -13,7 +13,7 @@ + #include "base/files/file_path.h" + #include "base/memory/raw_ptr_exclusion.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) && defined(__GLIBC__) + #include + #endif + diff --git a/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0001-scripts.patch b/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0001-scripts.patch index d852e469dc..1d65cb0d6f 100644 --- a/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0001-scripts.patch +++ b/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0001-scripts.patch @@ -4,24 +4,22 @@ Date: Wed, 16 Apr 2025 01:01:04 +0800 Subject: [PATCH] reland jumbo scripts --- - build/config/jumbo.gni | 287 ++++++++++++++++++++++++++++++++ - build/config/merge_for_jumbo.py | 145 ++++++++++++++++ - 2 files changed, 432 insertions(+) + build/config/jumbo.gni | 280 ++++++++++++++++++++++++++++++++ + build/config/merge_for_jumbo.py | 145 +++++++++++++++++ + 2 files changed, 425 insertions(+) create mode 100644 build/config/jumbo.gni create mode 100644 build/config/merge_for_jumbo.py diff --git a/build/config/jumbo.gni b/build/config/jumbo.gni new file mode 100644 -index 0000000000..3d07646aee +index 0000000000..8d880662cb --- /dev/null +++ b/build/config/jumbo.gni -@@ -0,0 +1,287 @@ +@@ -0,0 +1,280 @@ +# Copyright 2017 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + -+import("//build/config/nacl/config.gni") # To see if jumbo should be turned off -+ +declare_args() { + # If true, use a jumbo build (files compiled together) to speed up + # compilation. @@ -91,11 +89,6 @@ index 0000000000..3d07646aee + if (defined(invoker.never_build_jumbo) && invoker.never_build_jumbo) { + use_jumbo_build_for_target = false + } -+ if (is_nacl_irt) { -+ # The code is barely compatible with the nacl toolchain anymore and we -+ # don't want to stress it further with jumbo compilation units. -+ use_jumbo_build_for_target = false -+ } + + foreach(excluded_target, jumbo_build_excluded) { + if (excluded_target == target_name || diff --git a/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0101-group-base.patch b/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0101-group-base.patch index b8f87809b0..f3c81693cb 100644 --- a/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0101-group-base.patch +++ b/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0101-group-base.patch @@ -7,6 +7,7 @@ Enable jumbo build for the following component(s)/source_set(s): - //base:base - //base:i18n +# - //cc/slim:slim # Used in Android Enable jumbo build for the following template(s): @@ -21,6 +22,7 @@ Enable jumbo build for the following template(s): .../sampling_heap_profiler.cc | 9 ++++++++- base/task/sequenced_task_runner.cc | 4 ++++ base/task/single_thread_task_runner.cc | 4 ++++ + base/threading/platform_thread_metrics_linux.cc | 4 ++++ cc/cc.gni | 5 +++-- .../viz/service/display/occlusion_culler.cc | 4 ++++ .../service/display/overlay_candidate_factory.cc | 4 ++++ @@ -28,10 +30,10 @@ Enable jumbo build for the following template(s): .../viz/service/display/software_renderer.cc | 4 ++++ .../service/frame_sinks/frame_sink_manager_impl.h | 3 +++ components/viz/viz.gni | 7 ++++--- - 12 files changed, 63 insertions(+), 9 deletions(-) + 13 files changed, 67 insertions(+), 9 deletions(-) diff --git a/base/BUILD.gn b/base/BUILD.gn -index 5b41b3d805..0ad5a8724c 100644 +index f73ed42f84..f9e71f34c7 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -28,6 +28,7 @@ import("//build/config/cast.gni") @@ -40,9 +42,9 @@ index 5b41b3d805..0ad5a8724c 100644 import("//build/config/dcheck_always_on.gni") +import("//build/config/jumbo.gni") import("//build/config/logging.gni") - import("//build/config/nacl/config.gni") import("//build/config/profiling/profiling.gni") -@@ -177,7 +178,7 @@ use_epoll = is_linux || is_chromeos || is_android + import("//build/config/rust.gni") +@@ -173,7 +174,7 @@ use_epoll = is_linux || is_chromeos || is_android # base compilation units to be linked in where they wouldn't have otherwise. # This does not include test code (test support and anything in the test # directory) which should use source_set as is recommended for GN targets). @@ -51,7 +53,7 @@ index 5b41b3d805..0ad5a8724c 100644 sources = [ "allocator/allocator_check.cc", "allocator/allocator_check.h", -@@ -987,6 +988,10 @@ component("base") { +@@ -985,6 +986,10 @@ component("base") { ] } @@ -62,7 +64,7 @@ index 5b41b3d805..0ad5a8724c 100644 if (is_linux || is_chromeos) { sources += [ "debug/proc_maps_linux.cc", -@@ -1005,6 +1010,7 @@ component("base") { +@@ -1004,6 +1009,7 @@ component("base") { "threading/thread_type_delegate.cc", "threading/thread_type_delegate.h", ] @@ -70,7 +72,7 @@ index 5b41b3d805..0ad5a8724c 100644 } if (is_chromeos) { -@@ -1982,6 +1988,11 @@ component("base") { +@@ -1944,6 +1950,11 @@ component("base") { "win/wrapped_window_proc.h", ] @@ -82,7 +84,7 @@ index 5b41b3d805..0ad5a8724c 100644 deps += [ "//base/win:base_win_buildflags" ] if (com_init_check_hook_disabled) { -@@ -2880,7 +2891,7 @@ if (enable_rust_translit) { +@@ -2838,7 +2849,7 @@ if (enable_rust_translit) { } } @@ -92,10 +94,10 @@ index 5b41b3d805..0ad5a8724c 100644 sources = [ "i18n/base_i18n_export.h", diff --git a/base/sampling_heap_profiler/poisson_allocation_sampler.cc b/base/sampling_heap_profiler/poisson_allocation_sampler.cc -index 1bd644d7ab..473f84cb1a 100644 +index c093e98ee2..2f5a25fb44 100644 --- a/base/sampling_heap_profiler/poisson_allocation_sampler.cc +++ b/base/sampling_heap_profiler/poisson_allocation_sampler.cc -@@ -19,6 +19,8 @@ +@@ -20,6 +20,8 @@ #include "base/rand_util.h" #include "build/build_config.h" @@ -104,7 +106,7 @@ index 1bd644d7ab..473f84cb1a 100644 namespace base { namespace { -@@ -60,7 +62,7 @@ struct ThreadLocalData { +@@ -65,7 +67,7 @@ struct ThreadLocalData { // Returns an object storing thread-local state. This does NOT use // base::ThreadLocalStorage, so it's safe to call from hooks in the // base::ThreadLocalStorage implementation. @@ -113,7 +115,7 @@ index 1bd644d7ab..473f84cb1a 100644 #if USE_LOCAL_TLS_EMULATION() // If available, use ThreadLocalStorage to bypass dependencies introduced by // Clang's implementation of thread_local. -@@ -96,6 +98,8 @@ ThreadLocalData* GetThreadLocalData() { +@@ -101,6 +103,8 @@ ThreadLocalData* GetThreadLocalData() { } // namespace @@ -122,7 +124,7 @@ index 1bd644d7ab..473f84cb1a 100644 PoissonAllocationSamplerStats::PoissonAllocationSamplerStats( size_t address_cache_hits, size_t address_cache_misses, -@@ -498,3 +502,6 @@ void PoissonAllocationSampler::RemoveSamplesObserver( +@@ -505,3 +509,6 @@ void PoissonAllocationSampler::RemoveSamplesObserver( } } // namespace base @@ -168,11 +170,11 @@ index 60e96b0081..de29c802f6 100644 +#undef ThreadLocalData +#undef GetThreadLocalData diff --git a/base/task/sequenced_task_runner.cc b/base/task/sequenced_task_runner.cc -index 833b9c5dc6..d46ef2df9b 100644 +index 16bd753e47..d6c6178311 100644 --- a/base/task/sequenced_task_runner.cc +++ b/base/task/sequenced_task_runner.cc -@@ -10,6 +10,8 @@ - #include "base/task/default_delayed_task_handle_delegate.h" +@@ -11,6 +11,8 @@ + #include "base/task/thread_pool/thread_pool_instance.h" #include "base/time/time.h" +#define current_default_handle current_default_handle_sequenced_task_runner @@ -180,7 +182,7 @@ index 833b9c5dc6..d46ef2df9b 100644 namespace base { namespace { -@@ -138,3 +140,5 @@ OnTaskRunnerDeleter& OnTaskRunnerDeleter::operator=(OnTaskRunnerDeleter&&) = +@@ -144,3 +146,5 @@ OnTaskRunnerDeleter& OnTaskRunnerDeleter::operator=(OnTaskRunnerDeleter&&) = default; } // namespace base @@ -205,6 +207,25 @@ index 651267a81a..179bdf2010 100644 } // namespace base + +#undef current_default_handle +diff --git a/base/threading/platform_thread_metrics_linux.cc b/base/threading/platform_thread_metrics_linux.cc +index 13f0eb30a8..3935f876c5 100644 +--- a/base/threading/platform_thread_metrics_linux.cc ++++ b/base/threading/platform_thread_metrics_linux.cc +@@ -18,6 +18,8 @@ + #include "base/time/time.h" + #include "base/trace_event/trace_event.h" + ++#define ParseTotalCPUTimeFromStats ParseTotalCPUTimeFromStats_PlatformThreadMetricsLinux ++ + namespace base { + + namespace { +@@ -61,3 +63,5 @@ std::optional PlatformThreadMetrics::GetCumulativeCPUUsage() { + } + + } // namespace base ++ ++#undef ParseTotalCPUTimeFromStats diff --git a/cc/cc.gni b/cc/cc.gni index 090420c902..6b0e76bf21 100644 --- a/cc/cc.gni @@ -236,7 +257,7 @@ index 090420c902..6b0e76bf21 100644 if (defined(invoker.configs)) { configs += invoker.configs diff --git a/components/viz/service/display/occlusion_culler.cc b/components/viz/service/display/occlusion_culler.cc -index 9174b4f92d..4409926784 100644 +index 10d1bba2ce..b895d3a63f 100644 --- a/components/viz/service/display/occlusion_culler.cc +++ b/components/viz/service/display/occlusion_culler.cc @@ -26,6 +26,8 @@ @@ -248,7 +269,7 @@ index 9174b4f92d..4409926784 100644 namespace viz { namespace { -@@ -537,3 +539,5 @@ bool OcclusionCuller::CanSplitDrawQuad( +@@ -536,3 +538,5 @@ bool OcclusionCuller::CanSplitDrawQuad( } } // namespace viz @@ -274,10 +295,10 @@ index 898652d4d8..696a784ff1 100644 + +#undef kEpsilon diff --git a/components/viz/service/display/skia_renderer.cc b/components/viz/service/display/skia_renderer.cc -index 038e79c73b..2b43438c9b 100644 +index 16de85a38b..2e699dd26e 100644 --- a/components/viz/service/display/skia_renderer.cc +++ b/components/viz/service/display/skia_renderer.cc -@@ -108,6 +108,8 @@ +@@ -110,6 +110,8 @@ #include "components/viz/service/display/overlay_processor_surface_control.h" #endif @@ -293,7 +314,7 @@ index 038e79c73b..2b43438c9b 100644 + +#undef MakeOpacityFilter diff --git a/components/viz/service/display/software_renderer.cc b/components/viz/service/display/software_renderer.cc -index 8740f6a0ce..0dee55b0a0 100644 +index 2d952f903f..fab2724532 100644 --- a/components/viz/service/display/software_renderer.cc +++ b/components/viz/service/display/software_renderer.cc @@ -53,6 +53,8 @@ @@ -312,7 +333,7 @@ index 8740f6a0ce..0dee55b0a0 100644 + +#undef MakeOpacityFilter diff --git a/components/viz/service/frame_sinks/frame_sink_manager_impl.h b/components/viz/service/frame_sinks/frame_sink_manager_impl.h -index 83ddb1856b..b6979f6f1f 100644 +index 3ebefa4b63..1350f5c75f 100644 --- a/components/viz/service/frame_sinks/frame_sink_manager_impl.h +++ b/components/viz/service/frame_sinks/frame_sink_manager_impl.h @@ -5,6 +5,9 @@ @@ -365,10 +386,10 @@ index 191ddca368..a4008193b5 100644 if (defined(invoker.configs)) { configs += invoker.configs diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn -index 1ce3faf14e..bf158da4a6 100644 +index 9f18a00af5..870c7dbae4 100644 --- a/components/viz/service/BUILD.gn +++ b/components/viz/service/BUILD.gn -@@ -279,6 +279,14 @@ viz_component("service") { +@@ -273,6 +273,14 @@ viz_component("service") { "transitions/transferable_resource_tracker.cc", "transitions/transferable_resource_tracker.h", ] diff --git a/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0102-group-crypto.patch b/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0102-group-crypto.patch index d8281de7cc..b82a65e036 100644 --- a/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0102-group-crypto.patch +++ b/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0102-group-crypto.patch @@ -32,13 +32,12 @@ Enable jumbo build for the following component(s)/source_set(s): headless/BUILD.gn | 6 ++++- ipc/BUILD.gn | 5 ++-- ipc/ipc_sync_channel.cc | 4 +++ - ipc/ipc_sync_message_filter.cc | 4 +++ sql/BUILD.gn | 3 ++- url/BUILD.gn | 3 ++- - 18 files changed, 94 insertions(+), 11 deletions(-) + 17 files changed, 90 insertions(+), 11 deletions(-) diff --git a/crypto/BUILD.gn b/crypto/BUILD.gn -index 5b2eda4c29..355216a937 100644 +index 57db821..b3ff801 100644 --- a/crypto/BUILD.gn +++ b/crypto/BUILD.gn @@ -3,6 +3,7 @@ @@ -46,10 +45,10 @@ index 5b2eda4c29..355216a937 100644 import("//build/buildflag_header.gni") +import("//build/config/jumbo.gni") - import("//components/nacl/toolchain.gni") import("//crypto/features.gni") import("//testing/test.gni") -@@ -16,7 +17,7 @@ buildflag_header("buildflags") { + +@@ -15,7 +16,7 @@ buildflag_header("buildflags") { flags = [ "USE_NSS_CERTS=$use_nss_certs" ] } @@ -59,7 +58,7 @@ index 5b2eda4c29..355216a937 100644 sources = [ "aead.cc", diff --git a/crypto/unexportable_key.cc b/crypto/unexportable_key.cc -index 88fba4f13e..cb0bd640e6 100644 +index 88fba4f..cb0bd64 100644 --- a/crypto/unexportable_key.cc +++ b/crypto/unexportable_key.cc @@ -7,6 +7,8 @@ @@ -78,7 +77,7 @@ index 88fba4f13e..cb0bd640e6 100644 + +#undef g_mock_provider diff --git a/crypto/user_verifying_key.cc b/crypto/user_verifying_key.cc -index 279a7a1431..668fd49c77 100644 +index 279a7a1..668fd49 100644 --- a/crypto/user_verifying_key.cc +++ b/crypto/user_verifying_key.cc @@ -6,6 +6,8 @@ @@ -97,7 +96,7 @@ index 279a7a1431..668fd49c77 100644 + +#undef g_mock_provider diff --git a/dbus/BUILD.gn b/dbus/BUILD.gn -index 5cca90ac7c..105d4c4ce0 100644 +index 5cca90a..105d4c4 100644 --- a/dbus/BUILD.gn +++ b/dbus/BUILD.gn @@ -3,13 +3,14 @@ @@ -117,7 +116,7 @@ index 5cca90ac7c..105d4c4ce0 100644 "bus.cc", "bus.h", diff --git a/gin/BUILD.gn b/gin/BUILD.gn -index f01c47bd51..7f3f4cf7c7 100644 +index 44f8c84..ef288ce 100644 --- a/gin/BUILD.gn +++ b/gin/BUILD.gn @@ -6,11 +6,12 @@ if (is_android) { @@ -134,7 +133,7 @@ index f01c47bd51..7f3f4cf7c7 100644 sources = [ "arguments.cc", "arguments.h", -@@ -78,6 +79,9 @@ component("gin") { +@@ -81,6 +82,9 @@ component("gin") { "wrappable.h", "wrapper_info.cc", ] @@ -145,7 +144,7 @@ index f01c47bd51..7f3f4cf7c7 100644 if (use_partition_alloc) { sources += [ diff --git a/gin/per_isolate_data.cc b/gin/per_isolate_data.cc -index 5bd5ed3a93..10777d497a 100644 +index 9670f9f..9b61b4b 100644 --- a/gin/per_isolate_data.cc +++ b/gin/per_isolate_data.cc @@ -41,7 +41,7 @@ namespace gin { @@ -158,7 +157,7 @@ index 5bd5ed3a93..10777d497a 100644 scoped_refptr task_runner, scoped_refptr user_visible_task_runner, diff --git a/google_apis/BUILD.gn b/google_apis/BUILD.gn -index 64d9c9bbf5..f894a4efe9 100644 +index 6ae1463..603f821 100644 --- a/google_apis/BUILD.gn +++ b/google_apis/BUILD.gn @@ -5,6 +5,7 @@ @@ -179,7 +178,7 @@ index 64d9c9bbf5..f894a4efe9 100644 "api_key_cache.cc", "api_key_cache.h", diff --git a/google_apis/gaia/oauth2_access_token_fetcher_impl.cc b/google_apis/gaia/oauth2_access_token_fetcher_impl.cc -index c6f8f991d3..867044d39e 100644 +index c6f8f99..867044d 100644 --- a/google_apis/gaia/oauth2_access_token_fetcher_impl.cc +++ b/google_apis/gaia/oauth2_access_token_fetcher_impl.cc @@ -27,6 +27,9 @@ @@ -200,7 +199,7 @@ index c6f8f991d3..867044d39e 100644 +#undef kAccessTokenKey +#undef kExpiresInKey diff --git a/google_apis/gaia/oauth2_mint_token_flow.cc b/google_apis/gaia/oauth2_mint_token_flow.cc -index 9a3d097a81..49f3ee1772 100644 +index 8c84c35..fbf4796 100644 --- a/google_apis/gaia/oauth2_mint_token_flow.cc +++ b/google_apis/gaia/oauth2_mint_token_flow.cc @@ -38,6 +38,9 @@ @@ -213,7 +212,7 @@ index 9a3d097a81..49f3ee1772 100644 namespace { constexpr char kValueFalse[] = "false"; -@@ -675,3 +678,6 @@ OAuth2MintTokenFlow::GetNetworkTrafficAnnotationTag() { +@@ -665,3 +668,6 @@ OAuth2MintTokenFlow::GetNetworkTrafficAnnotationTag() { } })"); } @@ -221,7 +220,7 @@ index 9a3d097a81..49f3ee1772 100644 +#undef kAccessTokenKey +#undef kExpiresInKey diff --git a/google_apis/gcm/BUILD.gn b/google_apis/gcm/BUILD.gn -index 9529e50d10..69d8ebffcc 100644 +index b207dd6..457389d 100644 --- a/google_apis/gcm/BUILD.gn +++ b/google_apis/gcm/BUILD.gn @@ -2,10 +2,11 @@ @@ -238,7 +237,7 @@ index 9529e50d10..69d8ebffcc 100644 "base/gcm_constants.cc", "base/gcm_constants.h", diff --git a/google_apis/gcm/engine/instance_id_delete_token_request_handler.cc b/google_apis/gcm/engine/instance_id_delete_token_request_handler.cc -index 787a63648d..a791ec85d8 100644 +index 787a636..a791ec8 100644 --- a/google_apis/gcm/engine/instance_id_delete_token_request_handler.cc +++ b/google_apis/gcm/engine/instance_id_delete_token_request_handler.cc @@ -10,6 +10,13 @@ @@ -267,7 +266,7 @@ index 787a63648d..a791ec85d8 100644 +#undef kExtraScopeKey +#undef kTokenPrefix diff --git a/google_apis/gcm/engine/unregistration_request.cc b/google_apis/gcm/engine/unregistration_request.cc -index c9a605d451..26c759fcad 100644 +index c9a605d..26c759f 100644 --- a/google_apis/gcm/engine/unregistration_request.cc +++ b/google_apis/gcm/engine/unregistration_request.cc @@ -25,6 +25,19 @@ @@ -308,7 +307,7 @@ index c9a605d451..26c759fcad 100644 +#undef kDeviceRegistrationError +#undef GetStatusFromError diff --git a/headless/BUILD.gn b/headless/BUILD.gn -index 18636003d3..bd123b47c1 100644 +index 58810cc..601d03e 100644 --- a/headless/BUILD.gn +++ b/headless/BUILD.gn @@ -4,6 +4,7 @@ @@ -328,7 +327,7 @@ index 18636003d3..bd123b47c1 100644 sources = [ "lib/browser/command_line_handler.cc", "lib/browser/command_line_handler.h", -@@ -301,6 +302,9 @@ component("headless_non_renderer") { +@@ -304,6 +305,9 @@ component("headless_non_renderer") { "public/internal/value_conversions.h", "public/switches.h", ] @@ -339,27 +338,26 @@ index 18636003d3..bd123b47c1 100644 configs += [ "//build/config/compiler:wexit_time_destructors" ] diff --git a/ipc/BUILD.gn b/ipc/BUILD.gn -index 3cd4859e1e..83cec6dc4d 100644 +index ee8324d..a1b6fc3 100644 --- a/ipc/BUILD.gn +++ b/ipc/BUILD.gn -@@ -4,6 +4,7 @@ +@@ -4,13 +4,14 @@ import("//build/buildflag_header.gni") import("//build/config/features.gni") +import("//build/config/jumbo.gni") - import("//build/config/nacl/config.gni") import("//ipc/features.gni") import("//mojo/public/tools/bindings/mojom.gni") -@@ -17,7 +18,7 @@ buildflag_header("ipc_buildflags") { - flags = [ "IPC_MESSAGE_LOG_ENABLED=$enable_ipc_logging" ] - } + import("//testing/test.gni") + import("//third_party/protobuf/proto_library.gni") + import("//tools/ipc_fuzzer/ipc_fuzzer.gni") -component("ipc") { +jumbo_component("ipc") { sources = [ # These are the param_traits sources needed by all platforms, # including ios. The rest are added in a conditional block below. -@@ -109,7 +110,7 @@ component("ipc") { +@@ -81,7 +82,7 @@ component("ipc") { } } @@ -369,10 +367,10 @@ index 3cd4859e1e..83cec6dc4d 100644 "ipc_message.cc", "ipc_message.h", diff --git a/ipc/ipc_sync_channel.cc b/ipc/ipc_sync_channel.cc -index fb8acffe22..de6a8a235d 100644 +index 5fc172d..264a8b7 100644 --- a/ipc/ipc_sync_channel.cc +++ b/ipc/ipc_sync_channel.cc -@@ -34,6 +34,8 @@ +@@ -30,6 +30,8 @@ using base::WaitableEvent; @@ -381,33 +379,14 @@ index fb8acffe22..de6a8a235d 100644 namespace IPC { namespace { -@@ -615,3 +617,5 @@ void SyncChannel::OnChannelInit() { - } - - } // namespace IPC -+ -+#undef OnEventReady -diff --git a/ipc/ipc_sync_message_filter.cc b/ipc/ipc_sync_message_filter.cc -index 15f66c849c..6114f78ca7 100644 ---- a/ipc/ipc_sync_message_filter.cc -+++ b/ipc/ipc_sync_message_filter.cc -@@ -17,6 +17,8 @@ - #include "mojo/public/cpp/bindings/associated_receiver.h" - #include "mojo/public/cpp/bindings/sync_handle_registry.h" - -+#define OnEventReady OnEventReadySyncMessageFilter -+ - namespace IPC { - - namespace { -@@ -199,3 +201,5 @@ void SyncMessageFilter::GetRemoteAssociatedInterface( - } +@@ -593,3 +595,5 @@ void SyncChannel::StartWatching() { + void SyncChannel::OnChannelInit() {} } // namespace IPC + +#undef OnEventReady diff --git a/sql/BUILD.gn b/sql/BUILD.gn -index 14fbb47b25..8d52fd5c05 100644 +index 4684b58..b822b18 100644 --- a/sql/BUILD.gn +++ b/sql/BUILD.gn @@ -2,6 +2,7 @@ @@ -428,7 +407,7 @@ index 14fbb47b25..8d52fd5c05 100644 "database.cc", "database.h", diff --git a/url/BUILD.gn b/url/BUILD.gn -index 3051d7b4b4..e5f423f96c 100644 +index 2ab7a8e..abdcee8 100644 --- a/url/BUILD.gn +++ b/url/BUILD.gn @@ -3,6 +3,7 @@ diff --git a/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0103-net.patch b/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0103-net.patch index bb17516c7f..09a992c604 100644 --- a/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0103-net.patch +++ b/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0103-net.patch @@ -486,21 +486,23 @@ diff --git a/net/quic/dedicated_web_transport_http3_client.cc b/net/quic/dedicat index 9879fd4203..0bf1ff4aec 100644 --- a/net/quic/dedicated_web_transport_http3_client.cc +++ b/net/quic/dedicated_web_transport_http3_client.cc -@@ -32,6 +32,8 @@ +@@ -32,6 +32,9 @@ #include "net/url_request/url_request_context.h" #include "url/scheme_host_port.h" -+#define HostsFromOrigins HostsFromOrigins_DedicatedWebTransportHTTP3Client ++#define HostsFromOrigins HostsFromOrigins_DedicatedWebTransportHTTP3Client ++#define HostsFromSchemeHostPorts HostsFromSchemeHostPorts_DedicatedWebTransportHTTP3Client + namespace net { namespace { -@@ -991,3 +993,5 @@ void DedicatedWebTransportHttp3Client::OnDatagramProcessed( +@@ -1025,3 +1028,6 @@ } } // namespace net + +#undef HostsFromOrigins ++#undef HostsFromSchemeHostPorts diff --git a/net/quic/quic_chromium_client_stream.cc b/net/quic/quic_chromium_client_stream.cc index f6becb91d0..ceaf3d57b0 100644 --- a/net/quic/quic_chromium_client_stream.cc @@ -698,3 +700,136 @@ index 41ba26fe48..55f5657768 100644 } // namespace net + +#undef ValidateStatus +diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc +index 5ec129a9ea..de23b6d50b 100644 +--- a/net/http/http_cache.cc ++++ b/net/http/http_cache.cc +@@ -63,6 +63,8 @@ + #include + #endif + ++#define TaskRunner TaskRunner_HttpCache ++ + namespace net { + + namespace { +@@ -1751,3 +1753,5 @@ void HttpCache::OnNoVarySearchCacheLoadComplete( + } + + } // namespace net ++ ++#undef TaskRunner +diff --git a/net/http/http_proxy_connect_job.cc b/net/http/http_proxy_connect_job.cc +index a34459b3f3..e2d7f0102c 100644 +--- a/net/http/http_proxy_connect_job.cc ++++ b/net/http/http_proxy_connect_job.cc +@@ -54,6 +54,8 @@ + #include "url/gurl.h" + #include "url/scheme_host_port.h" + ++#define TaskRunner TaskRunner_HttpProxyConnectJob ++ + namespace net { + + namespace { +@@ -1008,3 +1010,5 @@ void HttpProxyConnectJob::EmitConnectLatency(NextProto http_version, + } + + } // namespace net ++ ++#undef TaskRunner +diff --git a/net/http/http_stream_factory_job.cc b/net/http/http_stream_factory_job.cc +index f274d6791d..aa7e92fd8f 100644 +--- a/net/http/http_stream_factory_job.cc ++++ b/net/http/http_stream_factory_job.cc +@@ -56,6 +56,8 @@ + #include "url/scheme_host_port.h" + #include "url/url_constants.h" + ++#define TaskRunner TaskRunner_HttpStreamFactoryJob ++ + namespace net { + + namespace { +@@ -1348,3 +1350,5 @@ void HttpStreamFactory::Job::RecordCompletionHistograms(int result) { + } + + } // namespace net ++ ++#undef TaskRunner +diff --git a/net/http/http_stream_factory_job_controller.cc b/net/http/http_stream_factory_job_controller.cc +index a4551d4bfd..c6664ea64f 100644 +--- a/net/http/http_stream_factory_job_controller.cc ++++ b/net/http/http_stream_factory_job_controller.cc +@@ -45,6 +45,8 @@ + #include "url/scheme_host_port.h" + #include "url/url_constants.h" + ++#define TaskRunner TaskRunner_HttpStreamFactoryJobController ++ + namespace net { + + namespace { +@@ -1565,3 +1567,5 @@ void HttpStreamFactory::JobController::OnPoolPreconnectsComplete(int rv) { + } + + } // namespace net ++ ++#undef TaskRunner +diff --git a/net/url_request/url_request_error_job.cc b/net/url_request/url_request_error_job.cc +index 6d9a7d4394..5f58a96b9c 100644 +--- a/net/url_request/url_request_error_job.cc ++++ b/net/url_request/url_request_error_job.cc +@@ -12,6 +12,8 @@ + #include "net/base/net_errors.h" + #include "net/base/task/task_runner.h" + ++#define TaskRunner TaskRunner_URLRequestErrorJob ++ + namespace net { + + namespace { +@@ -46,3 +48,5 @@ void URLRequestErrorJob::StartAsync() { + } + + } // namespace net ++ ++#undef TaskRunner +diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc +index ff36f3719d..b4a2ac28a9 100644 +--- a/net/url_request/url_request_job.cc ++++ b/net/url_request/url_request_job.cc +@@ -40,6 +40,8 @@ + #include "net/url_request/redirect_util.h" + #include "net/url_request/url_request_context.h" + ++#define TaskRunner TaskRunner_URLRequestJob ++ + namespace net { + + namespace { +@@ -775,3 +777,5 @@ void URLRequestJob::RecordBytesRead(int bytes_read) { + } + + } // namespace net ++ ++#undef TaskRunner +diff --git a/net/url_request/url_request_redirect_job.cc b/net/url_request/url_request_redirect_job.cc +index 270cbfcf40..19f5805390 100644 +--- a/net/url_request/url_request_redirect_job.cc ++++ b/net/url_request/url_request_redirect_job.cc +@@ -27,6 +27,8 @@ + #include "net/url_request/url_request.h" + #include "net/url_request/url_request_job.h" + ++#define TaskRunner TaskRunner_URLRequestRedirectJob ++ + namespace net { + + namespace { +@@ -117,3 +119,5 @@ void URLRequestRedirectJob::StartAsync() { + } + + } // namespace net ++ ++#undef TaskRunner diff --git a/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0104-v8.patch b/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0104-v8.patch index 39834b2d6c..8c1c3290c8 100644 --- a/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0104-v8.patch +++ b/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0104-v8.patch @@ -9,7 +9,7 @@ Enable jumbo build for the following template(s): - //v8/gni/v8.gni -> template("v8_header_set") --- - v8/BUILD.gn | 116 ++++++++++++++++++ + v8/BUILD.gn | 111 ++++++++++++++++++ v8/gni/v8.gni | 7 +- .../baseline/arm/baseline-compiler-arm-inl.h | 2 + v8/src/baseline/baseline-compiler.cc | 2 + @@ -44,10 +44,10 @@ Enable jumbo build for the following template(s): v8/src/utils/sha-256.cc | 3 + v8/src/wasm/wasm-external-refs.cc | 3 + v8/src/wasm/wrappers.cc | 2 + - 35 files changed, 210 insertions(+), 34 deletions(-) + 35 files changed, 205 insertions(+), 34 deletions(-) diff --git a/v8/BUILD.gn b/v8/BUILD.gn -index f2f72a02c6..4045513c07 100644 +index 05490a65a0..b759021b2a 100644 --- a/v8/BUILD.gn +++ b/v8/BUILD.gn @@ -7,6 +7,7 @@ import("//build/config/arm.gni") @@ -58,8 +58,8 @@ index f2f72a02c6..4045513c07 100644 import("//build/config/mips.gni") import("//build/config/riscv.gni") import("//build/config/rust.gni") -@@ -3121,26 +3122,61 @@ v8_source_set("v8_initializers") { - sources += [ "src/builtins/builtins-temporal-gen.cc" ] +@@ -3101,26 +3102,54 @@ v8_source_set("v8_initializers") { + } } + jumbo_excluded_sources = [ @@ -77,13 +77,6 @@ index f2f72a02c6..4045513c07 100644 + "src/ic/unary-op-assembler.cc", + "src/interpreter/interpreter-generator.cc", + ] -+ -+ if (v8_enable_temporal_support) { -+ jumbo_excluded_sources += [ -+ # reference to 'Float32' is ambiguous -+ "src/builtins/builtins-temporal-gen.cc" -+ ] -+ } + if (v8_current_cpu == "x86") { sources += [ @@ -120,7 +113,7 @@ index f2f72a02c6..4045513c07 100644 } else if (v8_current_cpu == "mips64" || v8_current_cpu == "mips64el") { sources += [ ### gcmole(mips64el) ### -@@ -5202,6 +5238,24 @@ v8_compiler_sources = [ +@@ -5200,6 +5229,24 @@ v8_compiler_sources = [ "src/compiler/zone-stats.cc", ] @@ -145,7 +138,7 @@ index f2f72a02c6..4045513c07 100644 if (!v8_enable_maglev) { # When Maglev is not enabled, Turboshaft still needs Maglev's graph builder. v8_compiler_sources += [ -@@ -5222,6 +5276,11 @@ if (v8_current_cpu == "x86") { +@@ -5225,6 +5272,11 @@ if (v8_current_cpu == "x86") { "src/compiler/backend/ia32/instruction-scheduler-ia32.cc", "src/compiler/backend/ia32/instruction-selector-ia32.cc", ] @@ -157,7 +150,7 @@ index f2f72a02c6..4045513c07 100644 } else if (v8_current_cpu == "x64") { v8_compiler_sources += [ ### gcmole(x64) ### -@@ -5230,6 +5289,9 @@ if (v8_current_cpu == "x86") { +@@ -5233,6 +5285,9 @@ if (v8_current_cpu == "x86") { "src/compiler/backend/x64/instruction-selector-x64.cc", "src/compiler/backend/x64/unwinding-info-writer-x64.cc", ] @@ -167,7 +160,7 @@ index f2f72a02c6..4045513c07 100644 } else if (v8_current_cpu == "arm") { v8_compiler_sources += [ ### gcmole(arm) ### -@@ -5238,6 +5300,9 @@ if (v8_current_cpu == "x86") { +@@ -5241,6 +5296,9 @@ if (v8_current_cpu == "x86") { "src/compiler/backend/arm/instruction-selector-arm.cc", "src/compiler/backend/arm/unwinding-info-writer-arm.cc", ] @@ -177,7 +170,7 @@ index f2f72a02c6..4045513c07 100644 } else if (v8_current_cpu == "arm64") { v8_compiler_sources += [ ### gcmole(arm64) ### -@@ -5246,6 +5311,9 @@ if (v8_current_cpu == "x86") { +@@ -5249,6 +5307,9 @@ if (v8_current_cpu == "x86") { "src/compiler/backend/arm64/instruction-selector-arm64.cc", "src/compiler/backend/arm64/unwinding-info-writer-arm64.cc", ] @@ -187,7 +180,18 @@ index f2f72a02c6..4045513c07 100644 } else if (v8_current_cpu == "mips64" || v8_current_cpu == "mips64el") { v8_compiler_sources += [ ### gcmole(mips64el) ### -@@ -5337,6 +5405,7 @@ v8_source_set("v8_compiler_for_mksnapshot_source_set") { +@@ -5322,6 +5383,10 @@ if (v8_enable_webassembly) { + "src/wasm/turboshaft-graph-interface.cc", + "src/wasm/wrappers.cc", + ] ++ v8_compiler_sources_jumbo_excluded += [ ++ "src/wasm/turboshaft-graph-interface.cc", ++ "src/wasm/wrappers.cc", ++ ] + } + + if (v8_enable_wasm_simd256_revec) { +@@ -5342,6 +5407,7 @@ v8_source_set("v8_compiler_for_mksnapshot_source_set") { visibility = [ ":*" ] # Only targets in this file can depend on this. sources = v8_compiler_sources @@ -195,7 +199,7 @@ index f2f72a02c6..4045513c07 100644 public_deps = [ ":generate_bytecode_builtins_list", -@@ -5372,6 +5441,7 @@ v8_source_set("v8_compiler") { +@@ -5377,6 +5443,7 @@ v8_source_set("v8_compiler") { if (v8_enable_turbofan) { sources = v8_compiler_sources @@ -203,7 +207,7 @@ index f2f72a02c6..4045513c07 100644 } else { # With Turbofan disabled, we only include the stubbed-out API. sources = [ "src/compiler/turbofan-disabled.cc" ] -@@ -5930,6 +6000,8 @@ v8_source_set("v8_base_without_compiler") { +@@ -5935,6 +6002,8 @@ v8_source_set("v8_base_without_compiler") { ] } @@ -212,7 +216,7 @@ index f2f72a02c6..4045513c07 100644 if (v8_enable_maglev) { sources += [ "src/maglev/maglev-assembler.cc", -@@ -5957,6 +6029,10 @@ v8_source_set("v8_base_without_compiler") { +@@ -5967,6 +6036,10 @@ v8_source_set("v8_base_without_compiler") { "src/maglev/arm64/maglev-assembler-arm64.cc", "src/maglev/arm64/maglev-ir-arm64.cc", ] @@ -223,7 +227,7 @@ index f2f72a02c6..4045513c07 100644 } else if (v8_current_cpu == "riscv64") { sources += [ "src/maglev/riscv/maglev-assembler-riscv.cc", -@@ -5967,6 +6043,10 @@ v8_source_set("v8_base_without_compiler") { +@@ -5977,6 +6050,10 @@ v8_source_set("v8_base_without_compiler") { "src/maglev/x64/maglev-assembler-x64.cc", "src/maglev/x64/maglev-ir-x64.cc", ] @@ -234,32 +238,23 @@ index f2f72a02c6..4045513c07 100644 } else if (v8_current_cpu == "s390x") { sources += [ "src/maglev/s390/maglev-assembler-s390.cc", -@@ -5981,6 +6061,13 @@ v8_source_set("v8_base_without_compiler") { - "src/tracing/perfetto-logger.cc", - "src/tracing/perfetto-utils.cc", +@@ -6055,6 +6132,15 @@ v8_source_set("v8_base_without_compiler") { + "src/wasm/wasm-subtyping.cc", + "src/wasm/well-known-imports.cc", ] + jumbo_excluded_sources += [ + "src/asmjs/asm-js.cc", + "src/asmjs/asm-parser.cc", + "src/asmjs/asm-scanner.cc", -+ "src/wasm/turboshaft-graph-interface.cc", + "src/wasm/wasm-module.cc", -+ ] - } - - if (v8_enable_webassembly) { -@@ -6042,6 +6129,10 @@ v8_source_set("v8_base_without_compiler") { - "src/wasm/well-known-imports.cc", - "src/wasm/wrappers.cc", - ] -+ jumbo_excluded_sources += [ ++ + # Too many marco conflictions + "src/wasm/baseline/liftoff-compiler.cc", + ] if (v8_wasm_random_fuzzers) { sources += [ ### gcmole(all) ### -@@ -6076,6 +6167,26 @@ v8_source_set("v8_base_without_compiler") { +@@ -6089,6 +6175,26 @@ v8_source_set("v8_base_without_compiler") { sources += [ "src/heap/reference-summarizer.cc" ] } @@ -286,7 +281,7 @@ index f2f72a02c6..4045513c07 100644 if (v8_current_cpu == "x86") { sources += [ ### gcmole(ia32) ### -@@ -6182,6 +6293,11 @@ v8_source_set("v8_base_without_compiler") { +@@ -6195,6 +6301,11 @@ v8_source_set("v8_base_without_compiler") { if (is_win) { sources += [ "src/diagnostics/unwinding-info-win64.cc" ] } @@ -299,18 +294,18 @@ index f2f72a02c6..4045513c07 100644 sources += [ ### gcmole(mips64el) ### diff --git a/v8/gni/v8.gni b/v8/gni/v8.gni -index bcebe93384..317fbc100f 100644 +index 0ddd653e0e..5d5c7e4083 100644 --- a/v8/gni/v8.gni +++ b/v8/gni/v8.gni -@@ -4,6 +4,7 @@ - - import("//build/config/chrome_build.gni") - import("//build/config/compiler/pgo/pgo.gni") -+import("//build/config/jumbo.gni") +@@ -8,6 +8,7 @@ import("//build/config/features.gni") import("//build/config/gclient_args.gni") import("//build/config/ios/config.gni") import("//build/config/ios/ios_sdk_overrides.gni") -@@ -347,9 +348,9 @@ template("v8_source_set") { ++import("//build/config/jumbo.gni") + import("//build/config/sanitizers/sanitizers.gni") + import("//build/config/v8_target_cpu.gni") + import("//build_overrides/build.gni") +@@ -389,9 +390,9 @@ template("v8_source_set") { defined(v8_static_library) && v8_static_library && is_win) { link_target_type = "split_static_library" } else if (defined(v8_static_library) && v8_static_library) { @@ -322,7 +317,7 @@ index bcebe93384..317fbc100f 100644 } target(link_target_type, target_name) { forward_variables_from(invoker, -@@ -368,7 +369,7 @@ template("v8_source_set") { +@@ -410,7 +411,7 @@ template("v8_source_set") { } template("v8_header_set") { @@ -345,10 +340,10 @@ index 6d99dbe529..d6805a0a05 100644 } // namespace internal } // namespace v8 diff --git a/v8/src/baseline/baseline-compiler.cc b/v8/src/baseline/baseline-compiler.cc -index bcad34f516..67ddf8f3b6 100644 +index 45a624a7da..e2073c4aab 100644 --- a/v8/src/baseline/baseline-compiler.cc +++ b/v8/src/baseline/baseline-compiler.cc -@@ -2492,6 +2492,8 @@ SaveAccumulatorScope::~SaveAccumulatorScope() { +@@ -2517,6 +2517,8 @@ SaveAccumulatorScope::~SaveAccumulatorScope() { #undef RCS_BASELINE_SCOPE #undef __ @@ -358,10 +353,10 @@ index bcad34f516..67ddf8f3b6 100644 } // namespace internal } // namespace v8 diff --git a/v8/src/compiler/backend/instruction.h b/v8/src/compiler/backend/instruction.h -index 6025160f8c..99efdc3aaa 100644 +index bb743f3552..c4e4cb0348 100644 --- a/v8/src/compiler/backend/instruction.h +++ b/v8/src/compiler/backend/instruction.h -@@ -520,9 +520,9 @@ class LocationOperand : public InstructionOperand { +@@ -524,9 +524,9 @@ class LocationOperand : public InstructionOperand { return static_cast(value_) >> IndexField::kShift; } @@ -421,10 +416,10 @@ index cc5b406f1b..9fac217286 100644 loop_iteration_count_.insert({start, iter_count}); diff --git a/v8/src/compiler/turboshaft/wasm-in-js-inlining-reducer-inl.h b/v8/src/compiler/turboshaft/wasm-in-js-inlining-reducer-inl.h -index eefdbf25d4..4639a1340b 100644 +index 580cc321a0..29c3f8e648 100644 --- a/v8/src/compiler/turboshaft/wasm-in-js-inlining-reducer-inl.h +++ b/v8/src/compiler/turboshaft/wasm-in-js-inlining-reducer-inl.h -@@ -1322,6 +1322,8 @@ V WasmInJSInliningReducer::TryInlineWasmCall( +@@ -1316,6 +1316,8 @@ V WasmInJSInliningReducer::TryInlineWasmCall( return emitting_decoder.interface().Result(); } @@ -434,7 +429,7 @@ index eefdbf25d4..4639a1340b 100644 #include "src/compiler/turboshaft/undef-assembler-macros.inc" diff --git a/v8/src/compiler/turboshaft/wasm-load-elimination-reducer.h b/v8/src/compiler/turboshaft/wasm-load-elimination-reducer.h -index 2a33d3fa0f..b005cd284a 100644 +index 569d4438b2..d5022dfe4f 100644 --- a/v8/src/compiler/turboshaft/wasm-load-elimination-reducer.h +++ b/v8/src/compiler/turboshaft/wasm-load-elimination-reducer.h @@ -544,6 +544,7 @@ class WasmLoadEliminationReducer : public Next { @@ -446,7 +441,7 @@ index 2a33d3fa0f..b005cd284a 100644 OpIndex REDUCE_INPUT_GRAPH(StructGet)(OpIndex ig_index, const StructGetOp& op) { diff --git a/v8/src/compiler/wasm-compiler.cc b/v8/src/compiler/wasm-compiler.cc -index a5c13d2c33..cb38951b49 100644 +index b92154e46f..fa1b452c2f 100644 --- a/v8/src/compiler/wasm-compiler.cc +++ b/v8/src/compiler/wasm-compiler.cc @@ -70,7 +70,7 @@ namespace { @@ -467,7 +462,7 @@ index a5c13d2c33..cb38951b49 100644 } // TODO(ahaas): Merge TrapId with TrapReason. -@@ -1302,6 +1302,6 @@ AssemblerOptions WasmStubAssemblerOptions() { +@@ -1231,6 +1231,6 @@ AssemblerOptions WasmStubAssemblerOptions() { }; } @@ -489,7 +484,7 @@ index c509e4220c..e9ccece0d4 100644 #include "src/base/platform/wrappers.h" diff --git a/v8/src/handles/global-handles.cc b/v8/src/handles/global-handles.cc -index 4a504500e4..fdb26addbb 100644 +index af448aa4f2..f9d1b5f3a6 100644 --- a/v8/src/handles/global-handles.cc +++ b/v8/src/handles/global-handles.cc @@ -756,7 +756,7 @@ void GlobalHandles::InvokeSecondPassPhantomCallbacks() { @@ -511,7 +506,7 @@ index 4a504500e4..fdb26addbb 100644 } } diff --git a/v8/src/heap/code-range.cc b/v8/src/heap/code-range.cc -index f46af5ff0e..cfcb60788d 100644 +index 246dd07b86..8b6170db92 100644 --- a/v8/src/heap/code-range.cc +++ b/v8/src/heap/code-range.cc @@ -64,7 +64,7 @@ size_t CodeRange::GetWritableReservedAreaSize() { @@ -554,7 +549,7 @@ index f46af5ff0e..cfcb60788d 100644 reinterpret_cast(params.requested_start_hint), reinterpret_cast(region().begin()), reinterpret_cast(region().end())); -@@ -206,14 +206,14 @@ bool CodeRange::InitReservation(v8::PageAllocator* page_allocator, +@@ -212,14 +212,14 @@ bool CodeRange::InitReservation(v8::PageAllocator* page_allocator, // the BoundedPageAllocator. Use it if it's big enough. const Address non_allocatable_size = page_allocator_->begin() - base(); @@ -591,7 +586,7 @@ index 5b16920d22..e1e5199d27 100644 + +#undef kDefaultDeadlineCheckInterval diff --git a/v8/src/heap/cppgc/marker.cc b/v8/src/heap/cppgc/marker.cc -index a4ac8b6e8a..d582998d71 100644 +index 7966799bc8..a613b69033 100644 --- a/v8/src/heap/cppgc/marker.cc +++ b/v8/src/heap/cppgc/marker.cc @@ -57,6 +57,8 @@ bool ExitIncrementalMarkingIfNeeded(MarkingConfig config, HeapBase& heap) { @@ -603,17 +598,17 @@ index a4ac8b6e8a..d582998d71 100644 static constexpr size_t kDefaultDeadlineCheckInterval = 150u; template PushReverse(std::forward(stack_args)...); diff --git a/v8/src/maglev/maglev-assembler.cc b/v8/src/maglev/maglev-assembler.cc -index 18addeed1a..ea3630caf0 100644 +index 71cdaea16b..9009e0f3d3 100644 --- a/v8/src/maglev/maglev-assembler.cc +++ b/v8/src/maglev/maglev-assembler.cc -@@ -711,6 +711,8 @@ void MaglevAssembler::TryMigrateInstanceAndMarkMapAsMigrationTarget( +@@ -712,6 +712,8 @@ void MaglevAssembler::TryMigrateInstanceAndMarkMapAsMigrationTarget( save_register_state.DefineSafepoint(); } @@ -701,10 +696,10 @@ index 18addeed1a..ea3630caf0 100644 } // namespace internal } // namespace v8 diff --git a/v8/src/maglev/maglev-code-generator.cc b/v8/src/maglev/maglev-code-generator.cc -index f2d6d4c64a..6b8ab1c890 100644 +index 4207c84b70..4d612125e9 100644 --- a/v8/src/maglev/maglev-code-generator.cc +++ b/v8/src/maglev/maglev-code-generator.cc -@@ -427,7 +427,6 @@ class ParallelMoveResolver { +@@ -429,7 +429,6 @@ class ParallelMoveResolver { // but otherwise this code cannot be compiled by compilers not yet // implementing CWG2518. static_assert(DecompressIfNeeded && COMPRESS_POINTERS_BOOL); @@ -712,7 +707,7 @@ index f2d6d4c64a..6b8ab1c890 100644 if (targets.needs_decompression == kNeedsDecompression) { __ DecompressTagged(source_reg, source_reg); } -@@ -474,7 +473,6 @@ class ParallelMoveResolver { +@@ -476,7 +475,6 @@ class ParallelMoveResolver { // but otherwise this code cannot be compiled by compilers not yet // implementing CWG2518. static_assert(DecompressIfNeeded && COMPRESS_POINTERS_BOOL); @@ -720,7 +715,7 @@ index f2d6d4c64a..6b8ab1c890 100644 if (targets.needs_decompression == kNeedsDecompression) { __ DecompressTagged(register_with_slot_value, register_with_slot_value); targets.needs_decompression = kDoesNotNeedDecompression; -@@ -2109,6 +2107,8 @@ Handle MaglevCodeGenerator::GenerateDeoptimizationData( +@@ -2130,6 +2128,8 @@ Handle MaglevCodeGenerator::GenerateDeoptimizationData( return data; } @@ -730,11 +725,11 @@ index f2d6d4c64a..6b8ab1c890 100644 } // namespace internal } // namespace v8 diff --git a/v8/src/maglev/maglev-ir.cc b/v8/src/maglev/maglev-ir.cc -index 63754f811d..ab433f65a4 100644 +index 3f46599fbb..67e7cec3db 100644 --- a/v8/src/maglev/maglev-ir.cc +++ b/v8/src/maglev/maglev-ir.cc -@@ -8161,6 +8161,8 @@ std::optional NodeBase::TryGetInt32ConstantInput(int index) { - return {}; +@@ -8634,6 +8634,8 @@ RangeType ValueNode::GetRange() const { + } } +#undef __ @@ -763,10 +758,10 @@ index 73a03828db..8b458f2fba 100644 // JSSynchronizationPrimitive is the base class for JSAtomicsMutex and // JSAtomicsCondition. It contains a 32-bit state field and a pointer to a diff --git a/v8/src/objects/js-collator.cc b/v8/src/objects/js-collator.cc -index 405cad1552..3c5032b750 100644 +index 9ee693fa47..6ad43a79eb 100644 --- a/v8/src/objects/js-collator.cc +++ b/v8/src/objects/js-collator.cc -@@ -52,6 +52,8 @@ Maybe GetCaseFirst(Isolate* isolate, +@@ -53,6 +53,8 @@ Maybe GetCaseFirst(Isolate* isolate, CaseFirst::kUndefined); } @@ -775,17 +770,17 @@ index 405cad1552..3c5032b750 100644 // TODO(gsathya): Consider internalizing the value strings. void CreateDataPropertyForOptions(Isolate* isolate, DirectHandle options, -@@ -593,3 +595,5 @@ const std::set& JSCollator::GetAvailableLocales() { +@@ -597,3 +599,5 @@ const std::set& JSCollator::GetAvailableLocales() { } // namespace internal } // namespace v8 + +#undef CreateDataPropertyForOptions diff --git a/v8/src/objects/js-duration-format.cc b/v8/src/objects/js-duration-format.cc -index 03c847d8dd..ce88b925fb 100644 +index b8d771a686..f729894034 100644 --- a/v8/src/objects/js-duration-format.cc +++ b/v8/src/objects/js-duration-format.cc -@@ -1071,7 +1071,7 @@ MaybeDirectHandle FormattedToString( +@@ -1069,7 +1069,7 @@ MaybeDirectHandle FormattedToString( return Intl::FormattedToString(isolate, formatted); } @@ -794,9 +789,9 @@ index 03c847d8dd..ce88b925fb 100644 Isolate* isolate, const icu::FormattedValue& formatted, const std::vector>* parts, JSDurationFormat::Separator separator) { -@@ -1134,7 +1134,7 @@ MaybeDirectHandle JSDurationFormat::FormatToParts( +@@ -1132,7 +1132,7 @@ MaybeDirectHandle JSDurationFormat::FormatToParts( Isolate* isolate, DirectHandle df, - Handle duration) { + DirectHandle duration) { const char* method_name = "Intl.DurationFormat.prototype.formatToParts"; - return FormatCommon( + return FormatCommon( @@ -804,10 +799,10 @@ index 03c847d8dd..ce88b925fb 100644 } diff --git a/v8/src/objects/js-list-format.cc b/v8/src/objects/js-list-format.cc -index 97a0f6a8f5..eb3b69f0a5 100644 +index d24c39c394..d685118051 100644 --- a/v8/src/objects/js-list-format.cc +++ b/v8/src/objects/js-list-format.cc -@@ -247,7 +247,7 @@ DirectHandle IcuFieldIdToType(Isolate* isolate, int32_t field_id) { +@@ -250,7 +250,7 @@ DirectHandle IcuFieldIdToType(Isolate* isolate, int32_t field_id) { // A helper function to convert the FormattedList to a // MaybeHandle for the implementation of formatToParts. @@ -816,7 +811,7 @@ index 97a0f6a8f5..eb3b69f0a5 100644 Isolate* isolate, const icu::FormattedValue& formatted) { DirectHandle array = isolate->factory()->NewJSArray(0); icu::ConstrainedFieldPosition cfpos; -@@ -285,7 +285,7 @@ MaybeDirectHandle JSListFormat::FormatListToParts( +@@ -288,7 +288,7 @@ MaybeDirectHandle JSListFormat::FormatListToParts( Isolate* isolate, DirectHandle format, DirectHandle list) { return FormatListCommon(isolate, format, list, @@ -826,10 +821,10 @@ index 97a0f6a8f5..eb3b69f0a5 100644 namespace { diff --git a/v8/src/objects/js-plural-rules.cc b/v8/src/objects/js-plural-rules.cc -index 4606b75f42..ad3d618764 100644 +index 60041add16..1094a8d5a5 100644 --- a/v8/src/objects/js-plural-rules.cc +++ b/v8/src/objects/js-plural-rules.cc -@@ -223,6 +223,8 @@ MaybeDirectHandle JSPluralRules::ResolvePluralRange( +@@ -222,6 +222,8 @@ MaybeDirectHandle JSPluralRules::ResolvePluralRange( return Intl::ToString(isolate, result); } @@ -838,7 +833,7 @@ index 4606b75f42..ad3d618764 100644 namespace { void CreateDataPropertyForOptions(Isolate* isolate, -@@ -387,3 +389,5 @@ const std::set& JSPluralRules::GetAvailableLocales() { +@@ -386,3 +388,5 @@ const std::set& JSPluralRules::GetAvailableLocales() { } // namespace internal } // namespace v8 @@ -867,7 +862,7 @@ index 7bee9f1179..391dac8cad 100644 } // namespace internal diff --git a/v8/src/regexp/regexp-compiler-tonode.cc b/v8/src/regexp/regexp-compiler-tonode.cc -index d021885646..f777324990 100644 +index fd5589921d..190e9ee025 100644 --- a/v8/src/regexp/regexp-compiler-tonode.cc +++ b/v8/src/regexp/regexp-compiler-tonode.cc @@ -18,6 +18,8 @@ @@ -879,26 +874,26 @@ index d021885646..f777324990 100644 namespace v8 { namespace internal { -@@ -2071,3 +2073,5 @@ RegExpNode* RegExpQuantifier::ToNode(int min, int max, bool is_greedy, +@@ -2110,3 +2112,5 @@ RegExpNode* RegExpQuantifier::ToNode(int min, int max, bool is_greedy, } // namespace internal } // namespace v8 + +#undef kMaxCodePoint diff --git a/v8/src/sandbox/testing.cc b/v8/src/sandbox/testing.cc -index 5fd8a5572d..a049f497a4 100644 +index 52d7395145..d96f56f433 100644 --- a/v8/src/sandbox/testing.cc +++ b/v8/src/sandbox/testing.cc -@@ -18,6 +18,7 @@ - #include +@@ -20,6 +20,7 @@ #include + #include #include +#undef MAP_TYPE #endif // V8_OS_LINUX #ifdef V8_USE_ADDRESS_SANITIZER diff --git a/v8/src/snapshot/read-only-deserializer.cc b/v8/src/snapshot/read-only-deserializer.cc -index c6eb069415..a79565a75c 100644 +index 24e770f1ab..3568071acb 100644 --- a/v8/src/snapshot/read-only-deserializer.cc +++ b/v8/src/snapshot/read-only-deserializer.cc @@ -14,6 +14,8 @@ @@ -910,7 +905,7 @@ index c6eb069415..a79565a75c 100644 namespace v8 { namespace internal { -@@ -387,3 +389,5 @@ void ReadOnlyDeserializer::PostProcessNewObjects() { +@@ -428,3 +430,5 @@ void ReadOnlyDeserializer::PostProcessNewObjects() { } // namespace internal } // namespace v8 @@ -947,10 +942,10 @@ index 4b1d2bd42b..f55c0b4aec 100644 +#undef ror +#undef shr diff --git a/v8/src/wasm/wasm-external-refs.cc b/v8/src/wasm/wasm-external-refs.cc -index 8266e02e20..ad36a4c3ad 100644 +index 2be79a9db1..faa205ef32 100644 --- a/v8/src/wasm/wasm-external-refs.cc +++ b/v8/src/wasm/wasm-external-refs.cc -@@ -750,6 +750,8 @@ V ReadAndIncrementOffset(Address data, size_t* offset) { +@@ -715,6 +715,8 @@ V ReadAndIncrementOffset(Address data, size_t* offset) { return result; } @@ -964,28 +959,6 @@ index 8266e02e20..ad36a4c3ad 100644 #undef V8_WITH_SANITIZER #undef RESET_THREAD_IN_WASM_FLAG_FOR_ASAN_ON_WINDOWS +#undef kSuccess -diff --git a/v8/src/wasm/wrappers.cc b/v8/src/wasm/wrappers.cc -index 08a8d1dd46..4545fbf56e 100644 ---- a/v8/src/wasm/wrappers.cc -+++ b/v8/src/wasm/wrappers.cc -@@ -1326,4 +1326,6 @@ void BuildWasmWrapper(compiler::turboshaft::PipelineData* data, - } - } - -+#include "src/compiler/turboshaft/undef-assembler-macros.inc" -+ - } // namespace v8::internal::wasm -diff --git a/v8/src/maglev/maglev-graph-builder.cc b/v8/src/maglev/maglev-graph-builder.cc -index 7f4a2a1bbf..7de4c08bd8 100644 ---- a/v8/src/maglev/maglev-graph-builder.cc -+++ b/v8/src/maglev/maglev-graph-builder.cc -@@ -15605,3 +15605,6 @@ DEBUG_BREAK_BYTECODE_LIST(DEBUG_BREAK) - ReduceResult MaglevGraphBuilder::VisitIllegal() { UNREACHABLE(); } - - } // namespace v8::internal::maglev -+ -+#undef TRACE -+#undef FAIL diff --git a/v8/src/compiler/revectorizer.cc b/v8/src/compiler/revectorizer.cc index 1d332c42ae..dc9e3906b6 100644 --- a/v8/src/compiler/revectorizer.cc @@ -1006,3 +979,31 @@ index ddf3b81c7a..f6548579c7 100644 } // namespace v8::internal::compiler::turboshaft + +#undef TRACE +--- a/v8/src/maglev/maglev-graph-builder.cc ++++ b/v8/src/maglev/maglev-graph-builder.cc +@@ -16509,3 +16509,6 @@ + } + + } // namespace v8::internal::maglev ++ ++#undef TRACE ++#undef FAIL +--- a/v8/src/maglev/maglev-inlining.cc ++++ b/v8/src/maglev/maglev-inlining.cc +@@ -411,4 +411,6 @@ + return ProcessResult::kContinue; + } + ++#undef TRACE ++ + } // namespace v8::internal::maglev +diff --git a/v8/src/compiler/turboshaft/turbolev-graph-builder.cc b/v8/src/compiler/turboshaft/turbolev-graph-builder.cc +index d80362036d..18246136c0 100644 +--- a/v8/src/compiler/turboshaft/turbolev-graph-builder.cc ++++ b/v8/src/compiler/turboshaft/turbolev-graph-builder.cc +@@ -6665,3 +6665,5 @@ std::optional TurbolevGraphBuildingPhase::Run(PipelineData* data, + #include "src/compiler/turboshaft/undef-assembler-macros.inc" + + } // namespace v8::internal::compiler::turboshaft ++ ++#undef TRACE diff --git a/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0105-3rd.patch b/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0105-3rd.patch index 4b4208c897..77389f9a8d 100644 --- a/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0105-3rd.patch +++ b/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0105-3rd.patch @@ -31,13 +31,15 @@ Enable jumbo build for the following component(s)/source_set(s): .../quiche/src/quiche/quic/core/http/web_transport_http3.cc | 2 ++ net/third_party/quiche/src/quiche/quic/core/quic_stream.cc | 2 ++ .../quiche/src/quiche/quic/core/quic_stream_id_manager.cc | 2 ++ + .../quiche/src/quiche/quic/core/quic_stream_send_buffer.cc | 4 ++++ + .../quiche/quic/core/quic_stream_send_buffer_inlining.cc | 4 ++++ .../quiche/src/quiche/quic/core/tls_handshaker.cc | 2 ++ third_party/inspector_protocol/BUILD.gn | 4 +++- third_party/leveldatabase/BUILD.gn | 3 ++- - 23 files changed, 99 insertions(+), 3 deletions(-) + 25 files changed, 107 insertions(+), 3 deletions(-) diff --git a/net/third_party/quiche/BUILD.gn b/net/third_party/quiche/BUILD.gn -index a48a70817a..731253b8f0 100644 +index 2ece3e2bcf..e9f96d694d 100644 --- a/net/third_party/quiche/BUILD.gn +++ b/net/third_party/quiche/BUILD.gn @@ -24,6 +24,7 @@ @@ -392,10 +394,10 @@ index 86d60860f9..24d911aa87 100644 + +#undef ENDPOINT diff --git a/net/third_party/quiche/src/quiche/quic/core/quic_stream.cc b/net/third_party/quiche/src/quiche/quic/core/quic_stream.cc -index 92df3832f8..d9f92fc4f4 100644 +index 63e4253524..8dbff1af7b 100644 --- a/net/third_party/quiche/src/quiche/quic/core/quic_stream.cc +++ b/net/third_party/quiche/src/quiche/quic/core/quic_stream.cc -@@ -1646,3 +1646,5 @@ QuicByteCount QuicStream::CalculateSendWindowSize() const { +@@ -1676,3 +1676,5 @@ QuicByteCount QuicStream::CalculateSendWindowSize() const { } } // namespace quic @@ -411,6 +413,44 @@ index 0129beaec4..e3f0d88d57 100644 } // namespace quic + +#undef ENDPOINT +diff --git a/net/third_party/quiche/src/quiche/quic/core/quic_stream_send_buffer.cc b/net/third_party/quiche/src/quiche/quic/core/quic_stream_send_buffer.cc +index ad78782500..fecbd8006d 100644 +--- a/net/third_party/quiche/src/quiche/quic/core/quic_stream_send_buffer.cc ++++ b/net/third_party/quiche/src/quiche/quic/core/quic_stream_send_buffer.cc +@@ -22,6 +22,8 @@ + #include "quiche/common/quiche_buffer_allocator.h" + #include "quiche/common/quiche_mem_slice.h" + ++#define CompareOffset CompareOffset_BufferedSlice ++ + namespace quic { + + namespace { +@@ -194,3 +196,5 @@ QuicByteCount QuicStreamSendBuffer::TotalDataBufferedForTest() { + } + + } // namespace quic ++ ++#undef CompareOffset +diff --git a/net/third_party/quiche/src/quiche/quic/core/quic_stream_send_buffer_inlining.cc b/net/third_party/quiche/src/quiche/quic/core/quic_stream_send_buffer_inlining.cc +index bd4924e44a..d775d98c9a 100644 +--- a/net/third_party/quiche/src/quiche/quic/core/quic_stream_send_buffer_inlining.cc ++++ b/net/third_party/quiche/src/quiche/quic/core/quic_stream_send_buffer_inlining.cc +@@ -22,6 +22,8 @@ + #include "quiche/common/quiche_buffer_allocator.h" + #include "quiche/common/quiche_mem_slice.h" + ++#define CompareOffset CompareOffset_BufferedSliceInlining ++ + namespace quic { + + namespace { +@@ -230,3 +232,5 @@ QuicByteCount QuicStreamSendBufferInlining::TotalDataBufferedForTest() { + } + + } // namespace quic ++ ++#undef CompareOffset diff --git a/net/third_party/quiche/src/quiche/quic/core/tls_handshaker.cc b/net/third_party/quiche/src/quiche/quic/core/tls_handshaker.cc index 9529230d94..b80e76f7e9 100644 --- a/net/third_party/quiche/src/quiche/quic/core/tls_handshaker.cc diff --git a/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0106-blink-and-mojo.patch b/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0106-blink-and-mojo.patch index 7dd74ac755..cba6ef1fd9 100644 --- a/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0106-blink-and-mojo.patch +++ b/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0106-blink-and-mojo.patch @@ -44,6 +44,7 @@ Enable jumbo build for the following template(s): third_party/blink/renderer/core/BUILD.gn | 26 ++++++++++++----- .../blink/renderer/core/animation/BUILD.gn | 3 ++ .../css_filter_list_interpolation_type.cc | 4 +++ + .../css_gap_length_list_interpolation_type.cc | 4 +++ .../css_length_interpolation_type.cc | 4 +++ .../animation/css_shape_interpolation_type.cc | 9 ++++++ third_party/blink/renderer/core/core.gni | 5 ++-- @@ -104,8 +105,9 @@ Enable jumbo build for the following template(s): .../core/timing/background_tracing_helper.cc | 9 ++++++ .../core/timing/performance_event_timing.cc | 9 ++++++ .../core/timing/responsiveness_metrics.cc | 18 ++++++++++++ - .../core/timing/soft_navigation_heuristics.cc | 12 ++++++++ + .../core/timing/soft_navigation_heuristics.cc | 14 ++++++++++ .../core/timing/window_performance.cc | 9 ++++++ + .../url_pattern_dummy_url_canon.cc | 2 +- third_party/blink/renderer/modules/BUILD.gn | 6 ++-- .../accessibility/ax_block_flow_iterator.cc | 9 ++++++ .../accessibility/ax_object_cache_impl.cc | 2 ++ @@ -114,7 +116,7 @@ Enable jumbo build for the following template(s): .../modules/bluetooth/bluetooth_device.cc | 4 +++ ...edia_stream_audio_track_underlying_sink.cc | 4 +++ ...edia_stream_video_track_underlying_sink.cc | 4 +++ - .../blink/renderer/modules/canvas/BUILD.gn | 4 +++ + .../blink/renderer/modules/canvas/BUILD.gn | 3 ++ .../credentialmanagement/credential.cc | 10 +++++++ .../digital_credential.cc | 4 +++ .../federated_credential.cc | 4 +++ @@ -128,6 +130,7 @@ Enable jumbo build for the following template(s): .../blink/renderer/modules/hid/hid_device.cc | 4 +++ .../image_capture_frame_grabber.cc | 9 ++++++ .../blink/renderer/modules/media/BUILD.gn | 1 + + .../renderer/modules/mediarecorder/BUILD.gn | 6 ++++ .../mediarecorder/video_track_recorder.cc | 9 ++++++ .../renderer/modules/mediastream/BUILD.gn | 13 ++++++++- .../web_media_player_ms_compositor.cc | 9 ++++++ @@ -138,7 +141,6 @@ Enable jumbo build for the following template(s): .../renderer/modules/peerconnection/BUILD.gn | 8 +++++- .../renderer/modules/permissions/BUILD.gn | 1 + .../shared_storage/shared_storage_worklet.cc | 9 ++++++ - .../speech/speech_recognition_phrase_list.cc | 9 ++++++ .../blink/renderer/modules/storage/BUILD.gn | 2 +- .../global_storage_access_handle.cc | 6 +++- .../storage_access/storage_access_handle.cc | 6 +++- @@ -167,7 +169,7 @@ Enable jumbo build for the following template(s): .../modules/webcodecs/decoder_template.cc | 6 ++++ .../modules/webcodecs/encoder_base.cc | 6 ++++ .../webgl/webgl2_rendering_context_base.cc | 12 ++++++++ - .../webgl/webgl_rendering_context_base.cc | 12 ++++++++ + .../webgl/webgl_rendering_context_base.cc | 16 +++++++++++ .../blink/renderer/modules/webgpu/BUILD.gn | 2 ++ .../blink/renderer/modules/webrtc/BUILD.gn | 1 + .../renderer/modules/webtransport/BUILD.gn | 2 +- @@ -188,8 +190,8 @@ Enable jumbo build for the following template(s): .../case_mapping_harfbuzz_buffer_filler.cc | 9 ++++++ .../platform/fonts/shaping/harfbuzz_shaper.cc | 4 +++ .../platform/fonts/shaping/shape_result.cc | 4 +++ - .../graphics/compositing/pending_layer.cc | 2 +- - .../compositing/property_tree_manager.cc | 2 +- + .../renderer/platform/geometry/layout_unit.cc | 2 ++ + .../platform/geometry/physical_offset.cc | 2 ++ ...atic_bitmap_image_to_video_frame_copier.cc | 9 ++++++ .../blink/renderer/platform/heap/BUILD.gn | 5 ++-- .../platform/heap/garbage_collected.h | 9 ++++++ @@ -219,13 +221,13 @@ Enable jumbo build for the following template(s): .../renderer/platform/wtf/text/string_hash.h | 9 ++++++ .../renderer/platform/wtf/text/string_impl.h | 9 ++++++ .../blink/renderer/platform/wtf/vector.h | 9 ++++++ - 192 files changed, 1211 insertions(+), 74 deletions(-) + 194 files changed, 1220 insertions(+), 73 deletions(-) diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn -index da0e8c7260..9f40e65fa5 100644 +index 8c293f5bb0..6d7ad583bc 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn -@@ -476,6 +476,10 @@ mojom("mojo_bindings") { +@@ -438,6 +438,10 @@ mojom("mojo_bindings") { disable_variants = true @@ -237,12 +239,12 @@ index da0e8c7260..9f40e65fa5 100644 "agent_scheduling_group.mojom", "associated_interfaces.mojom", diff --git a/media/base/audio_bus.h b/media/base/audio_bus.h -index 4649d2299c..c8a5fabdf5 100644 +index 1be4610a00..23ec538b9f 100644 --- a/media/base/audio_bus.h +++ b/media/base/audio_bus.h -@@ -21,6 +21,11 @@ - #include "media/base/audio_sample_types.h" - #include "media/base/media_shmem_export.h" +@@ -20,6 +20,11 @@ + #include "base/memory/raw_ptr_exclusion.h" + #include "media/base/media_export.h" +#ifdef __clang__ +#pragma clang diagnostic push @@ -252,7 +254,7 @@ index 4649d2299c..c8a5fabdf5 100644 namespace media { class AudioParameters; -@@ -391,3 +396,7 @@ void AudioBus::CopyConvertFromAudioBusToInterleavedTarget( +@@ -390,3 +395,7 @@ void AudioBus::CopyConvertFromAudioBusToInterleavedTarget( } // namespace media #endif // MEDIA_BASE_AUDIO_BUS_H_ @@ -261,7 +263,7 @@ index 4649d2299c..c8a5fabdf5 100644 +#pragma clang diagnostic pop +#endif diff --git a/mojo/public/cpp/bindings/BUILD.gn b/mojo/public/cpp/bindings/BUILD.gn -index 5d55ed2537..25970958d4 100644 +index 2746a2e39b..c7e31d2959 100644 --- a/mojo/public/cpp/bindings/BUILD.gn +++ b/mojo/public/cpp/bindings/BUILD.gn @@ -6,6 +6,7 @@ import("//base/trace_event/tracing.gni") @@ -269,10 +271,10 @@ index 5d55ed2537..25970958d4 100644 import("//build/config/compiler/compiler.gni") import("//build/config/features.gni") +import("//build/config/jumbo.gni") - import("//build/config/nacl/config.gni") import("//tools/ipc_fuzzer/ipc_fuzzer.gni") -@@ -37,7 +38,7 @@ source_set("default_construct_tag") { + declare_args() { +@@ -38,7 +39,7 @@ source_set("default_construct_tag") { # Headers and sources which generated bindings can depend upon. No need for # other targets to depend on this directly: just use the "bindings" target. @@ -281,7 +283,7 @@ index 5d55ed2537..25970958d4 100644 sources = [ "array_data_view.h", "array_traits.h", -@@ -156,7 +157,7 @@ component("bindings_base") { +@@ -157,7 +158,7 @@ component("bindings_base") { } } @@ -291,7 +293,7 @@ index 5d55ed2537..25970958d4 100644 "associated_interface_ptr_info.h", "associated_receiver.h", diff --git a/mojo/public/cpp/system/BUILD.gn b/mojo/public/cpp/system/BUILD.gn -index 07c56d0cd2..f45695ec79 100644 +index 0be93ef19a..ce97520cd3 100644 --- a/mojo/public/cpp/system/BUILD.gn +++ b/mojo/public/cpp/system/BUILD.gn @@ -2,7 +2,9 @@ @@ -306,7 +308,7 @@ index 07c56d0cd2..f45695ec79 100644 sources = [ diff --git a/mojo/public/tools/bindings/mojom.gni b/mojo/public/tools/bindings/mojom.gni -index 758e3acf54..77c3c8863c 100644 +index 87b3bbe9ae..d3d7f411fa 100644 --- a/mojo/public/tools/bindings/mojom.gni +++ b/mojo/public/tools/bindings/mojom.gni @@ -2,6 +2,7 @@ @@ -317,7 +319,7 @@ index 758e3acf54..77c3c8863c 100644 import("//third_party/closure_compiler/closure_args.gni") import("//third_party/closure_compiler/compile_js.gni") import("//third_party/protobuf/proto_library.gni") -@@ -1040,7 +1041,7 @@ template("mojom") { +@@ -1029,7 +1030,7 @@ template("mojom") { } shared_cpp_sources_target_name = "${target_name}_shared_cpp_sources" @@ -326,7 +328,7 @@ index 758e3acf54..77c3c8863c 100644 if (defined(invoker.testonly)) { testonly = invoker.testonly } -@@ -1229,6 +1230,13 @@ template("mojom") { +@@ -1218,6 +1219,13 @@ template("mojom") { } else { enabled_configurations = [ default_variant ] } @@ -340,7 +342,7 @@ index 758e3acf54..77c3c8863c 100644 foreach(bindings_configuration, enabled_configurations) { cpp_only = false if (defined(invoker.cpp_only)) { -@@ -1620,6 +1628,10 @@ template("mojom") { +@@ -1609,6 +1617,10 @@ template("mojom") { sources_target_type = "source_set" } @@ -351,7 +353,7 @@ index 758e3acf54..77c3c8863c 100644 output_target_name = "${target_name}${variant_suffix}" if (proxy_target != "") { group(output_target_name) { -@@ -1790,6 +1802,7 @@ template("mojom") { +@@ -1779,6 +1791,7 @@ template("mojom") { target(sources_target_type, sources_target_name) { if (defined(output_name_override)) { @@ -359,7 +361,7 @@ index 758e3acf54..77c3c8863c 100644 output_name = output_name_override } visibility = output_visibility + [ -@@ -1897,7 +1910,7 @@ template("mojom") { +@@ -1886,7 +1899,7 @@ template("mojom") { mojolpm_target_name = "${target_name}_mojolpm" mojolpm_generator_target_name = "${target_name}__generator" @@ -369,7 +371,7 @@ index 758e3acf54..77c3c8863c 100644 # with typemaps and the dependencies of their typemap headers. It would # be good to enable include checking for these in the future though. diff --git a/third_party/blink/common/BUILD.gn b/third_party/blink/common/BUILD.gn -index 3c1ac12449..c20ad82cbb 100644 +index 256e5433c3..8e48eb96b7 100644 --- a/third_party/blink/common/BUILD.gn +++ b/third_party/blink/common/BUILD.gn @@ -3,6 +3,7 @@ @@ -380,7 +382,7 @@ index 3c1ac12449..c20ad82cbb 100644 import("//build/config/rust.gni") import("//build/nocompile.gni") import("//testing/libfuzzer/fuzzer_test.gni") -@@ -109,7 +110,7 @@ config("blink_common_implementation") { +@@ -112,7 +113,7 @@ config("blink_common_implementation") { defines = [ "BLINK_COMMON_IMPLEMENTATION=1" ] } @@ -389,7 +391,7 @@ index 3c1ac12449..c20ad82cbb 100644 # No target should directly depend on this target since this is just the # source set rather than the actual component that can be linked to. # Dependencies instead should be to //third_party/blink/public/common:common. -@@ -372,7 +373,7 @@ test("blink_common_unittests") { +@@ -380,7 +381,7 @@ test("blink_common_unittests") { data_deps = [ ":common_unittests_data" ] } @@ -399,10 +401,10 @@ index 3c1ac12449..c20ad82cbb 100644 sources = [ diff --git a/third_party/blink/renderer/bindings/bindings.gni b/third_party/blink/renderer/bindings/bindings.gni -index e1604f275d..9dc20f3478 100644 +index ef2403fd9b..55a46cfce9 100644 --- a/third_party/blink/renderer/bindings/bindings.gni +++ b/third_party/blink/renderer/bindings/bindings.gni -@@ -191,6 +191,12 @@ blink_core_sources_bindings = +@@ -189,6 +189,12 @@ blink_core_sources_bindings = ], "abspath") @@ -429,7 +431,7 @@ index 0ecd0f36ee..1ae92a4b3b 100644 visibility = [] diff --git a/third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.cc b/third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.cc -index 4049099a84..c301e5b3fe 100644 +index 54ed7f2666..a338bee333 100644 --- a/third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.cc +++ b/third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.cc @@ -75,6 +75,11 @@ @@ -444,7 +446,7 @@ index 4049099a84..c301e5b3fe 100644 namespace blink { void V8SetReturnValue(const v8::PropertyCallbackInfo& info, -@@ -898,3 +903,7 @@ void ApplyContextToException(v8::Isolate* isolate, +@@ -901,3 +906,7 @@ void ApplyContextToException(ScriptState* script_state, } } // namespace blink @@ -478,10 +480,10 @@ index dccf917762..bb11d3c783 100644 constructor_entries=[], supplemental_install_node=SequenceNode(), diff --git a/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py b/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py -index 6a3869e99c..10bf76f99b 100644 +index 3ca42542b5..409c3941cc 100644 --- a/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py +++ b/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py -@@ -724,7 +724,7 @@ def make_properties_array(cg_context): +@@ -708,7 +708,7 @@ def make_properties_array(cg_context): for member in cg_context.dictionary.own_members ]) return ListNode([ @@ -490,7 +492,7 @@ index 6a3869e99c..10bf76f99b 100644 properties, T("};"), EmptyNode(), -@@ -756,10 +756,10 @@ def make_fill_template_properties_function(cg_context): +@@ -740,10 +740,10 @@ def make_fill_template_properties_function(cg_context): if cg_context.dictionary.own_members: body.extend([ @@ -504,7 +506,7 @@ index 6a3869e99c..10bf76f99b 100644 T("DCHECK_EQ(properties.size(), kTotalPropertyCount);") ]) -@@ -1012,7 +1012,7 @@ def make_v8_own_member_names_function(cg_context): +@@ -996,7 +996,7 @@ def make_v8_own_member_names_function(cg_context): body.extend([ TextNode("return V8PerIsolateData::From(${isolate})" "->FindOrCreateEternalNameCache" @@ -514,10 +516,10 @@ index 6a3869e99c..10bf76f99b 100644 return func_decl, func_def diff --git a/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py -index 830b8349c7..1b4248a1c0 100644 +index d490a10187..7984abf490 100644 --- a/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +++ b/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py -@@ -5313,7 +5313,7 @@ ${prototype_object}->Delete( +@@ -5305,7 +5305,7 @@ ${prototype_object}->Delete( return SequenceNode(nodes) if nodes else None @@ -526,7 +528,7 @@ index 830b8349c7..1b4248a1c0 100644 trampoline_var_name, constructor_entries, supplemental_install_node, install_unconditional_func_name, -@@ -5446,7 +5446,7 @@ def make_install_interface_template(cg_context, function_name, class_name, +@@ -5438,7 +5438,7 @@ def make_install_interface_template(cg_context, function_name, class_name, for entry in constructor_entries: nodes = [ FormatNode("${interface_function_template}->SetCallHandler({});", @@ -535,7 +537,7 @@ index 830b8349c7..1b4248a1c0 100644 FormatNode("${interface_function_template}->SetLength({});", entry.ctor_func_length), FormatNode( -@@ -5494,7 +5494,7 @@ def make_install_interface_template(cg_context, function_name, class_name, +@@ -5486,7 +5486,7 @@ def make_install_interface_template(cg_context, function_name, class_name, T("""\ // HTMLAllCollection-specific settings // https://html.spec.whatwg.org/C/#the-htmlallcollection-interface @@ -544,7 +546,7 @@ index 830b8349c7..1b4248a1c0 100644 ${instance_template}->MarkAsUndetectable(); """)) -@@ -5784,6 +5784,7 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As();\ +@@ -5776,6 +5776,7 @@ ${instance_object} = ${v8_context}->Global();\ if unconditional_entries: body.append( CxxBlockNode([ @@ -552,7 +554,7 @@ index 830b8349c7..1b4248a1c0 100644 make_table_func(table_name, unconditional_entries), TextNode(installer_call_text), ])) -@@ -5793,6 +5794,7 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As();\ +@@ -5785,6 +5786,7 @@ ${instance_object} = ${v8_context}->Global();\ CxxLikelyIfNode(cond=conditional, attribute=None, body=[ @@ -560,7 +562,7 @@ index 830b8349c7..1b4248a1c0 100644 make_table_func(table_name, entries), TextNode(installer_call_text), ])) -@@ -5971,6 +5973,8 @@ def make_indexed_and_named_property_callbacks_and_install_node(cg_context): +@@ -5963,6 +5965,8 @@ def make_indexed_and_named_property_callbacks_and_install_node(cg_context): map(lambda flag: "int32_t({})".format(flag), flags)))) pattern = """\ // Named interceptors @@ -569,7 +571,7 @@ index 830b8349c7..1b4248a1c0 100644 {interceptor_template}->SetHandler( v8::NamedPropertyHandlerConfiguration( {impl_bridge}::NamedPropertyGetterCallback, -@@ -5991,7 +5995,9 @@ interface.indexed_and_named_properties.named_getter.extended_attributes: +@@ -5983,7 +5987,9 @@ interface.indexed_and_named_properties.named_getter.extended_attributes: {impl_bridge}::NamedPropertyDefinerCallback, {impl_bridge}::NamedPropertyDescriptorCallback, v8::Local(), @@ -580,7 +582,7 @@ index 830b8349c7..1b4248a1c0 100644 install_node.append( F(pattern, interceptor_template=interceptor_template, -@@ -6038,6 +6044,8 @@ interface.indexed_and_named_properties.named_getter.extended_attributes: +@@ -6030,6 +6036,8 @@ interface.indexed_and_named_properties.named_getter.extended_attributes: property_handler_flags = flags[0] pattern = """\ // Indexed interceptors @@ -589,7 +591,7 @@ index 830b8349c7..1b4248a1c0 100644 {interceptor_template}->SetHandler( v8::IndexedPropertyHandlerConfiguration( {impl_bridge}::IndexedPropertyGetterCallback, -@@ -6052,7 +6060,8 @@ interface.indexed_and_named_properties.named_getter.extended_attributes: +@@ -6044,7 +6052,8 @@ interface.indexed_and_named_properties.named_getter.extended_attributes: {impl_bridge}::IndexedPropertyDefinerCallback, {impl_bridge}::IndexedPropertyDescriptorCallback, v8::Local(), @@ -599,7 +601,7 @@ index 830b8349c7..1b4248a1c0 100644 install_node.append( F(pattern, interceptor_template=interceptor_template, -@@ -6208,6 +6217,8 @@ def make_cross_origin_property_callbacks_and_install_node( +@@ -6200,6 +6209,8 @@ def make_cross_origin_property_callbacks_and_install_node( text = """\ // Cross origin properties @@ -608,7 +610,7 @@ index 830b8349c7..1b4248a1c0 100644 ${instance_template}->SetAccessCheckCallbackAndHandler( CrossOriginAccessCheckCallback, v8::NamedPropertyHandlerConfiguration( -@@ -6230,6 +6241,7 @@ ${instance_template}->SetAccessCheckCallbackAndHandler( +@@ -6222,6 +6233,7 @@ ${instance_template}->SetAccessCheckCallbackAndHandler( CrossOriginIndexedDescriptorCallback, v8::Local(), v8::PropertyHandlerFlags::kNone)); @@ -624,7 +626,7 @@ index 830b8349c7..1b4248a1c0 100644 // Construction of WrapperTypeInfo may require non-trivial initialization due // to cross-component address resolution in order to load the pointer to the // parent interface's WrapperTypeInfo. We ignore this issue because the issue -@@ -6613,6 +6626,7 @@ def _make_v8_context_snapshot_get_reference_table_function( +@@ -6617,6 +6630,7 @@ def _make_v8_context_snapshot_get_reference_table_function( )), filter(None, callback_names))) table_node = ListNode([ @@ -632,7 +634,7 @@ index 830b8349c7..1b4248a1c0 100644 TextNode("static const intptr_t kReferenceTable[] = {"), ListNode(entry_nodes), TextNode("};"), -@@ -6984,6 +6998,7 @@ def generate_class_like(class_like, +@@ -6995,6 +7009,7 @@ def generate_class_like(class_like, cg_context, FN_INSTALL_INTERFACE_TEMPLATE, class_name=impl_class_name, @@ -640,7 +642,7 @@ index 830b8349c7..1b4248a1c0 100644 trampoline_var_name=tp_install_interface_template, constructor_entries=constructor_entries, supplemental_install_node=supplemental_install_node, -@@ -7233,7 +7248,7 @@ def generate_class_like(class_like, +@@ -7244,7 +7259,7 @@ def generate_class_like(class_like, class_like.identifier) impl_source_blink_ns.body.extend([ CxxNamespaceNode( @@ -650,7 +652,7 @@ index 830b8349c7..1b4248a1c0 100644 # Enclose the implementations with a namespace just in order to # include the class_like name in a stacktrace, such as diff --git a/third_party/blink/renderer/controller/BUILD.gn b/third_party/blink/renderer/controller/BUILD.gn -index 1cec8375b6..70c18dbc98 100644 +index 79cad3a8f1..de6cdc9825 100644 --- a/third_party/blink/renderer/controller/BUILD.gn +++ b/third_party/blink/renderer/controller/BUILD.gn @@ -2,6 +2,7 @@ @@ -670,7 +672,7 @@ index 1cec8375b6..70c18dbc98 100644 output_name = "blink_controller" deps = [ -@@ -204,7 +205,7 @@ test("blink_perf_tests") { +@@ -195,7 +196,7 @@ test("blink_perf_tests") { deps = [ ":blink_perf_tests_sources" ] } @@ -679,7 +681,7 @@ index 1cec8375b6..70c18dbc98 100644 visibility = [] # Allow re-assignment of list. visibility = [ "*" ] testonly = true -@@ -253,7 +254,7 @@ source_set("blink_bindings_test_sources") { +@@ -244,7 +245,7 @@ source_set("blink_bindings_test_sources") { ] } @@ -689,7 +691,7 @@ index 1cec8375b6..70c18dbc98 100644 visibility = [ "*" ] testonly = true diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn -index bae0728aa1..663965df2f 100644 +index 267e8ddfe2..41630d96c8 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn @@ -7,6 +7,7 @@ import("//build/config/arm.gni") @@ -700,16 +702,16 @@ index bae0728aa1..663965df2f 100644 import("//build/config/ui.gni") import("//build/nocompile.gni") import("//build/toolchain/toolchain.gni") -@@ -173,7 +174,7 @@ source_set("core_common") { +@@ -181,7 +182,7 @@ source_set("core_common") { sources = [ "core_export.h" ] } -source_set("prerequisites") { +jumbo_source_set("prerequisites") { public_deps = [ - "//services/network/public/cpp:cpp", + "//services/network/public/cpp", "//services/network/public/mojom", -@@ -233,7 +234,7 @@ blink_python_runner("make_deprecation_info") { +@@ -240,7 +241,7 @@ blink_python_runner("make_deprecation_info") { ] } @@ -718,7 +720,7 @@ index bae0728aa1..663965df2f 100644 output_name = "blink_core" visibility = [] # Allow re-assignment of list. -@@ -243,8 +244,10 @@ component("core") { +@@ -250,8 +251,10 @@ component("core") { "core_initializer.cc", "core_initializer.h", ] @@ -729,7 +731,7 @@ index bae0728aa1..663965df2f 100644 # If you create a new subdirectory 'foo', make 'foo/build.gni' to define # blink_core_sources_foo, and include it here. Add any dependencies in the -@@ -437,6 +440,15 @@ component("core") { +@@ -450,6 +453,15 @@ component("core") { "//third_party/blink/renderer/core/url_pattern", "//third_party/blink/renderer/core/xml:xpath_generated", ] @@ -745,7 +747,7 @@ index bae0728aa1..663965df2f 100644 public_configs = [ ":core_include_dirs" ] -@@ -500,7 +512,7 @@ blink_core_sources("core_hot") { +@@ -513,7 +525,7 @@ blink_core_sources("core_hot") { ] } @@ -754,7 +756,7 @@ index bae0728aa1..663965df2f 100644 testonly = true configs += [ -@@ -1310,7 +1322,7 @@ if (is_component_build) { +@@ -1319,7 +1331,7 @@ if (is_component_build) { core_generated_target_type = "static_library" } @@ -763,7 +765,7 @@ index bae0728aa1..663965df2f 100644 # Add all sources generated by the targets above. sources = [] foreach(current, targets_generating_sources) { -@@ -1404,7 +1416,7 @@ fuzzer_test("text_resource_decoder_fuzzer") { +@@ -1413,7 +1425,7 @@ fuzzer_test("text_resource_decoder_fuzzer") { ] } @@ -772,7 +774,7 @@ index bae0728aa1..663965df2f 100644 testonly = true # If you create a new subdirectory 'foo' that contains unit tests, list them in -@@ -1594,7 +1606,7 @@ group("gen_files_for_web_tests") { +@@ -1608,7 +1620,7 @@ group("gen_files_for_web_tests") { ] } @@ -781,7 +783,7 @@ index bae0728aa1..663965df2f 100644 testonly = true sources = [ "css/parser/css_parser_fast_paths_perftest.cc", -@@ -1621,7 +1633,7 @@ source_set("perf_tests") { +@@ -1635,7 +1647,7 @@ source_set("perf_tests") { ] } @@ -791,10 +793,10 @@ index bae0728aa1..663965df2f 100644 sources = [ "css/css_test_helpers.cc", diff --git a/third_party/blink/renderer/core/animation/BUILD.gn b/third_party/blink/renderer/core/animation/BUILD.gn -index 7fc03e4a32..e9a800ce97 100644 +index 82a86bc705..e93d73cea5 100644 --- a/third_party/blink/renderer/core/animation/BUILD.gn +++ b/third_party/blink/renderer/core/animation/BUILD.gn -@@ -308,6 +308,9 @@ blink_core_sources("animation") { +@@ -322,6 +322,9 @@ blink_core_sources("animation") { "worklet_animation_controller.cc", "worklet_animation_controller.h", ] @@ -823,6 +825,25 @@ index 4f41521dc2..794546f2de 100644 } // namespace blink + +#undef AlwaysInvalidateChecker +diff --git a/third_party/blink/renderer/core/animation/css_gap_length_list_interpolation_type.cc b/third_party/blink/renderer/core/animation/css_gap_length_list_interpolation_type.cc +index c2f2fdc3c4..78f7b931a1 100644 +--- a/third_party/blink/renderer/core/animation/css_gap_length_list_interpolation_type.cc ++++ b/third_party/blink/renderer/core/animation/css_gap_length_list_interpolation_type.cc +@@ -17,6 +17,8 @@ + #include "third_party/blink/renderer/core/css/resolver/style_resolver.h" + #include "third_party/blink/renderer/core/style/gap_data_list.h" + ++#define IsCompatible IsCompatible_CSSGapLengthListInterpolationType ++ + namespace blink { + + namespace { +@@ -431,3 +433,5 @@ void CSSGapLengthListInterpolationType::GetInitialLengthList( + } + + } // namespace blink ++ ++#undef IsCompatible diff --git a/third_party/blink/renderer/core/animation/css_length_interpolation_type.cc b/third_party/blink/renderer/core/animation/css_length_interpolation_type.cc index 9b04df3727..f1a9fc629d 100644 --- a/third_party/blink/renderer/core/animation/css_length_interpolation_type.cc @@ -843,7 +864,7 @@ index 9b04df3727..f1a9fc629d 100644 + +#undef AlwaysInvalidateChecker diff --git a/third_party/blink/renderer/core/animation/css_shape_interpolation_type.cc b/third_party/blink/renderer/core/animation/css_shape_interpolation_type.cc -index eedc750f89..58b2282460 100644 +index be67200634..26e50202b8 100644 --- a/third_party/blink/renderer/core/animation/css_shape_interpolation_type.cc +++ b/third_party/blink/renderer/core/animation/css_shape_interpolation_type.cc @@ -40,6 +40,11 @@ @@ -858,7 +879,7 @@ index eedc750f89..58b2282460 100644 namespace blink { namespace { -@@ -844,3 +849,7 @@ PairwiseInterpolationValue CSSShapeInterpolationType::MaybeMergeSingles( +@@ -869,3 +874,7 @@ PairwiseInterpolationValue CSSShapeInterpolationType::MaybeMergeSingles( } } // namespace blink @@ -953,7 +974,7 @@ index 3783ddc5e9..a1638715ec 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/css/css_numeric_literal_value.cc b/third_party/blink/renderer/core/css/css_numeric_literal_value.cc -index 1fa3fbdbd7..ff9cec9530 100644 +index 9013e5ac24..51b03cd5b8 100644 --- a/third_party/blink/renderer/core/css/css_numeric_literal_value.cc +++ b/third_party/blink/renderer/core/css/css_numeric_literal_value.cc @@ -12,6 +12,11 @@ @@ -968,7 +989,7 @@ index 1fa3fbdbd7..ff9cec9530 100644 namespace blink { struct SameSizeAsCSSNumericLiteralValue : CSSPrimitiveValue { -@@ -388,3 +393,7 @@ CSSNumericLiteralValue* CSSNumericLiteralValue::CreateCanonicalUnitValue() +@@ -387,3 +392,7 @@ CSSNumericLiteralValue* CSSNumericLiteralValue::CreateCanonicalUnitValue() } } // namespace blink @@ -977,7 +998,7 @@ index 1fa3fbdbd7..ff9cec9530 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/css/css_property_value_set.cc b/third_party/blink/renderer/core/css/css_property_value_set.cc -index c7f183f9ef..a61e46ce77 100644 +index b69b53ce51..568c58e223 100644 --- a/third_party/blink/renderer/core/css/css_property_value_set.cc +++ b/third_party/blink/renderer/core/css/css_property_value_set.cc @@ -38,6 +38,11 @@ @@ -992,7 +1013,7 @@ index c7f183f9ef..a61e46ce77 100644 namespace blink { static AdditionalBytes -@@ -841,3 +846,7 @@ void CSSPropertyValueSet::ShowStyle() { +@@ -845,3 +850,7 @@ void CSSPropertyValueSet::ShowStyle() { #endif } // namespace blink @@ -1001,7 +1022,7 @@ index c7f183f9ef..a61e46ce77 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/css/css_syntax_definition.cc b/third_party/blink/renderer/core/css/css_syntax_definition.cc -index 6ea37f21ed..3648841ff4 100644 +index aa8b36f0da..786f0dc9b6 100644 --- a/third_party/blink/renderer/core/css/css_syntax_definition.cc +++ b/third_party/blink/renderer/core/css/css_syntax_definition.cc @@ -19,6 +19,11 @@ @@ -1016,7 +1037,7 @@ index 6ea37f21ed..3648841ff4 100644 namespace blink { namespace { -@@ -372,3 +377,7 @@ CSSSyntaxDefinition CSSSyntaxDefinition::CreateNumericSyntax() { +@@ -369,3 +374,7 @@ CSSSyntaxDefinition CSSSyntaxDefinition::CreateNumericSyntax() { } } // namespace blink @@ -1049,10 +1070,10 @@ index 1b3dc8f66c..26a1af99a2 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/css/parser/css_parser_fast_paths.cc b/third_party/blink/renderer/core/css/parser/css_parser_fast_paths.cc -index 0545e4d9bb..c2141b9f45 100644 +index ec65daa360..c8ee586913 100644 --- a/third_party/blink/renderer/core/css/parser/css_parser_fast_paths.cc +++ b/third_party/blink/renderer/core/css/parser/css_parser_fast_paths.cc -@@ -39,6 +39,11 @@ +@@ -44,6 +44,11 @@ #include "third_party/blink/renderer/platform/wtf/text/character_visitor.h" #include "third_party/blink/renderer/platform/wtf/text/string_to_number.h" @@ -1063,8 +1084,8 @@ index 0545e4d9bb..c2141b9f45 100644 + namespace blink { - static unsigned ParsePositiveDouble(const LChar* string, -@@ -2248,3 +2253,7 @@ CSSValue* CSSParserFastPaths::MaybeParseValue(CSSPropertyID property_id, + static unsigned ParsePositiveDouble(base::span chars, +@@ -2236,3 +2241,7 @@ CSSValue* CSSParserFastPaths::MaybeParseValue(CSSPropertyID property_id, } } // namespace blink @@ -1073,7 +1094,7 @@ index 0545e4d9bb..c2141b9f45 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/css/parser/css_property_parser.cc b/third_party/blink/renderer/core/css/parser/css_property_parser.cc -index 6dba165486..f9f788a736 100644 +index 6320b1f3cb..6bb904791f 100644 --- a/third_party/blink/renderer/core/css/parser/css_property_parser.cc +++ b/third_party/blink/renderer/core/css/parser/css_property_parser.cc @@ -24,6 +24,11 @@ @@ -1097,7 +1118,7 @@ index 6dba165486..f9f788a736 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/css/resolver/matched_properties_cache.cc b/third_party/blink/renderer/core/css/resolver/matched_properties_cache.cc -index 9f16a9fb78..dfbd4fbdcb 100644 +index 052812a97c..0aa1227408 100644 --- a/third_party/blink/renderer/core/css/resolver/matched_properties_cache.cc +++ b/third_party/blink/renderer/core/css/resolver/matched_properties_cache.cc @@ -43,6 +43,11 @@ @@ -1112,7 +1133,7 @@ index 9f16a9fb78..dfbd4fbdcb 100644 namespace blink { static unsigned ComputeMatchedPropertiesHash(const MatchResult& result) { -@@ -474,3 +479,7 @@ std::ostream& operator<<(std::ostream& stream, +@@ -482,3 +487,7 @@ std::ostream& operator<<(std::ostream& stream, } } // namespace blink @@ -1121,10 +1142,10 @@ index 9f16a9fb78..dfbd4fbdcb 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc b/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc -index 5618121a0b..9593b3cc24 100644 +index aaf3b23f63..0efd04666d 100644 --- a/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc +++ b/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc -@@ -102,6 +102,11 @@ +@@ -106,6 +106,11 @@ #include "third_party/blink/renderer/platform/wtf/hash_map.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" @@ -1136,7 +1157,7 @@ index 5618121a0b..9593b3cc24 100644 namespace blink { const double kFinalStatePercentage = 100.0; -@@ -3963,3 +3968,7 @@ FitText StyleBuilderConverter::ConvertFitText(StyleResolverState& state, +@@ -4143,3 +4148,7 @@ ScopedCSSNameList* StyleBuilderConverter::ConvertTimelineTriggerName( } } // namespace blink @@ -1145,7 +1166,7 @@ index 5618121a0b..9593b3cc24 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/css/selector_query.cc b/third_party/blink/renderer/core/css/selector_query.cc -index ad591f03a0..a6cda67b57 100644 +index 86d0f36596..d8f0676402 100644 --- a/third_party/blink/renderer/core/css/selector_query.cc +++ b/third_party/blink/renderer/core/css/selector_query.cc @@ -51,6 +51,11 @@ @@ -1169,7 +1190,7 @@ index ad591f03a0..a6cda67b57 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/dom/element_data_cache.cc b/third_party/blink/renderer/core/dom/element_data_cache.cc -index aa56bc7840..9e992a4d60 100644 +index 1dd46d827a..f09af66f18 100644 --- a/third_party/blink/renderer/core/dom/element_data_cache.cc +++ b/third_party/blink/renderer/core/dom/element_data_cache.cc @@ -29,6 +29,11 @@ @@ -1193,7 +1214,7 @@ index aa56bc7840..9e992a4d60 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/dom/presentation_attribute_style.cc b/third_party/blink/renderer/core/dom/presentation_attribute_style.cc -index 49c22dc5f0..a5d4634575 100644 +index 97325b069f..87bead9350 100644 --- a/third_party/blink/renderer/core/dom/presentation_attribute_style.cc +++ b/third_party/blink/renderer/core/dom/presentation_attribute_style.cc @@ -41,6 +41,11 @@ @@ -1217,11 +1238,11 @@ index 49c22dc5f0..a5d4634575 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/editing/finder/chunk_graph_utils.cc b/third_party/blink/renderer/core/editing/finder/chunk_graph_utils.cc -index 91437df450..d5df50dcc6 100644 +index c970e947a5..284ca35e4f 100644 --- a/third_party/blink/renderer/core/editing/finder/chunk_graph_utils.cc +++ b/third_party/blink/renderer/core/editing/finder/chunk_graph_utils.cc -@@ -12,6 +12,11 @@ - #include "third_party/blink/renderer/platform/runtime_enabled_features.h" +@@ -11,6 +11,11 @@ + #include "third_party/blink/renderer/core/style/computed_style.h" #include "third_party/blink/renderer/platform/wtf/text/character_names.h" +#ifdef __clang__ @@ -1232,7 +1253,7 @@ index 91437df450..d5df50dcc6 100644 namespace blink { namespace { -@@ -433,3 +438,7 @@ BuildChunkGraph(const Node& first_visible_text_node, +@@ -429,3 +434,7 @@ BuildChunkGraph(const Node& first_visible_text_node, } } // namespace blink @@ -1265,10 +1286,10 @@ index 4543efd45d..58031a00b3 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/editing/ime/edit_context.cc b/third_party/blink/renderer/core/editing/ime/edit_context.cc -index 366d48972b..67f95dc997 100644 +index 91dc43cc1a..1550adccdf 100644 --- a/third_party/blink/renderer/core/editing/ime/edit_context.cc +++ b/third_party/blink/renderer/core/editing/ime/edit_context.cc -@@ -36,6 +36,11 @@ +@@ -37,6 +37,11 @@ #include "ui/base/ime/ime_text_span.h" #include "ui/gfx/geometry/rect_conversions.h" @@ -1280,7 +1301,7 @@ index 366d48972b..67f95dc997 100644 namespace blink { EditContext::EditContext(ScriptState* script_state, const EditContextInit* dict) -@@ -913,3 +918,7 @@ void EditContext::Trace(Visitor* visitor) const { +@@ -931,3 +936,7 @@ void EditContext::Trace(Visitor* visitor) const { } } // namespace blink @@ -1289,7 +1310,7 @@ index 366d48972b..67f95dc997 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/editing/iterators/text_searcher_icu.cc b/third_party/blink/renderer/core/editing/iterators/text_searcher_icu.cc -index cfa0c5d5ba..c09bad2835 100644 +index 304436dbfe..7b468adf6a 100644 --- a/third_party/blink/renderer/core/editing/iterators/text_searcher_icu.cc +++ b/third_party/blink/renderer/core/editing/iterators/text_searcher_icu.cc @@ -38,6 +38,11 @@ @@ -1356,10 +1377,10 @@ index 9b427522d3..0b7cd9305a 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/frame/frame_serializer.cc b/third_party/blink/renderer/core/frame/frame_serializer.cc -index f0a70d1f96..5a8c33835e 100644 +index 0d20126a2b..ad509d2dc9 100644 --- a/third_party/blink/renderer/core/frame/frame_serializer.cc +++ b/third_party/blink/renderer/core/frame/frame_serializer.cc -@@ -110,6 +110,11 @@ +@@ -111,6 +111,11 @@ #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" #include "third_party/blink/renderer/platform/wtf/uuid.h" @@ -1371,7 +1392,7 @@ index f0a70d1f96..5a8c33835e 100644 namespace blink { namespace internal { -@@ -1402,3 +1407,7 @@ String FrameSerializer::GetContentID(Frame* frame) { +@@ -1413,3 +1418,7 @@ String FrameSerializer::GetContentID(Frame* frame) { } } // namespace blink @@ -1380,7 +1401,7 @@ index f0a70d1f96..5a8c33835e 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc -index 48c2ef6fe7..1ba351458d 100644 +index 3a1da2ef67..8b4b48e393 100644 --- a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc +++ b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc @@ -82,6 +82,10 @@ @@ -1394,7 +1415,7 @@ index 48c2ef6fe7..1ba351458d 100644 namespace blink { namespace { -@@ -1484,3 +1488,7 @@ void LocalFrameMojoHandler::UpdatePrerenderURL( +@@ -1509,3 +1513,7 @@ void LocalFrameMojoHandler::UpdatePrerenderURL( } } // namespace blink @@ -1403,7 +1424,7 @@ index 48c2ef6fe7..1ba351458d 100644 +#undef kFireInterval +#undef kLargeAdSizeToViewportSizeThreshold diff --git a/third_party/blink/renderer/core/frame/overlay_interstitial_ad_detector.cc b/third_party/blink/renderer/core/frame/overlay_interstitial_ad_detector.cc -index 04769da464..9f22de3fa2 100644 +index 49ed8f6dcb..0a71a64cec 100644 --- a/third_party/blink/renderer/core/frame/overlay_interstitial_ad_detector.cc +++ b/third_party/blink/renderer/core/frame/overlay_interstitial_ad_detector.cc @@ -18,6 +18,9 @@ @@ -1424,7 +1445,7 @@ index 04769da464..9f22de3fa2 100644 +#undef kFireInterval +#undef kLargeAdSizeToViewportSizeThreshold diff --git a/third_party/blink/renderer/core/frame/sticky_ad_detector.cc b/third_party/blink/renderer/core/frame/sticky_ad_detector.cc -index e0547e35c9..bf87324800 100644 +index 8dd8e2c1e9..8eaa9917ae 100644 --- a/third_party/blink/renderer/core/frame/sticky_ad_detector.cc +++ b/third_party/blink/renderer/core/frame/sticky_ad_detector.cc @@ -20,6 +20,9 @@ @@ -1445,7 +1466,7 @@ index e0547e35c9..bf87324800 100644 +#undef kFireInterval +#undef kLargeAdSizeToViewportSizeThreshold diff --git a/third_party/blink/renderer/core/html/anchor_element_metrics_sender.cc b/third_party/blink/renderer/core/html/anchor_element_metrics_sender.cc -index bda2d653ea..c724521874 100644 +index 29bb02707f..b9685f1c1b 100644 --- a/third_party/blink/renderer/core/html/anchor_element_metrics_sender.cc +++ b/third_party/blink/renderer/core/html/anchor_element_metrics_sender.cc @@ -32,6 +32,8 @@ @@ -1457,14 +1478,14 @@ index bda2d653ea..c724521874 100644 namespace blink { namespace { // Returns true if `document` should have an associated -@@ -627,3 +629,5 @@ void AnchorElementMetricsSender::AnchorPositionsUpdated( +@@ -630,3 +632,5 @@ void AnchorElementMetricsSender::AnchorPositionsUpdated( } } // namespace blink + +#undef ShouldReportViewportPositions diff --git a/third_party/blink/renderer/core/html/anchor_element_viewport_position_tracker.cc b/third_party/blink/renderer/core/html/anchor_element_viewport_position_tracker.cc -index 88c1d0cca3..a42c9d62b5 100644 +index 256a2d80ae..8a6c042b3b 100644 --- a/third_party/blink/renderer/core/html/anchor_element_viewport_position_tracker.cc +++ b/third_party/blink/renderer/core/html/anchor_element_viewport_position_tracker.cc @@ -26,6 +26,8 @@ @@ -1476,14 +1497,14 @@ index 88c1d0cca3..a42c9d62b5 100644 namespace blink { namespace { -@@ -454,3 +456,5 @@ void AnchorElementViewportPositionTracker::PostFCPDelayTimerFired(TimerBase*) { +@@ -464,3 +466,5 @@ void AnchorElementViewportPositionTracker::PostFCPDelayTimerFired(TimerBase*) { } } // namespace blink + +#undef ShouldReportViewportPositions diff --git a/third_party/blink/renderer/core/html/parser/html_parser_idioms.cc b/third_party/blink/renderer/core/html/parser/html_parser_idioms.cc -index 93d701a98b..1a55ac1346 100644 +index 6700f4b081..3a1179ac32 100644 --- a/third_party/blink/renderer/core/html/parser/html_parser_idioms.cc +++ b/third_party/blink/renderer/core/html/parser/html_parser_idioms.cc @@ -35,6 +35,11 @@ @@ -1544,10 +1565,10 @@ index a0acee2829..ccad139a8e 100644 cue->OnEnter(MediaElement()); } else { diff --git a/third_party/blink/renderer/core/html/track/text_track.cc b/third_party/blink/renderer/core/html/track/text_track.cc -index a0742dbcf6..b8f56e5448 100644 +index 26701d1aaa..7845625181 100644 --- a/third_party/blink/renderer/core/html/track/text_track.cc +++ b/third_party/blink/renderer/core/html/track/text_track.cc -@@ -322,7 +322,7 @@ void TextTrack::InvalidateTrackIndex() { +@@ -323,7 +323,7 @@ void TextTrack::InvalidateTrackIndex() { } bool TextTrack::IsRendered() const { @@ -1556,7 +1577,7 @@ index a0742dbcf6..b8f56e5448 100644 return mode_ == TextTrackMode::kShowing && (IsVisualKind() || IsSpokenKind()); } -@@ -332,7 +332,7 @@ bool TextTrack::IsRendered() const { +@@ -333,7 +333,7 @@ bool TextTrack::IsRendered() const { bool TextTrack::CanBeRendered() const { // A track can be displayed when it's of kind captions, subtitles, or // descriptions and hasn't failed to load. @@ -1566,7 +1587,7 @@ index a0742dbcf6..b8f56e5448 100644 (IsVisualKind() || IsSpokenKind()); } diff --git a/third_party/blink/renderer/core/imagebitmap/image_bitmap.cc b/third_party/blink/renderer/core/imagebitmap/image_bitmap.cc -index 1bdbc2c417..44720d1ad2 100644 +index 4f43f06dda..a2d196308f 100644 --- a/third_party/blink/renderer/core/imagebitmap/image_bitmap.cc +++ b/third_party/blink/renderer/core/imagebitmap/image_bitmap.cc @@ -57,6 +57,8 @@ @@ -1577,7 +1598,7 @@ index 1bdbc2c417..44720d1ad2 100644 + namespace blink { - constexpr const char* kImageOrientationFlipY = "flipY"; + namespace { @@ -767,3 +769,5 @@ gfx::SizeF ImageBitmap::ElementSize( } @@ -1585,7 +1606,7 @@ index 1bdbc2c417..44720d1ad2 100644 + +#undef kImageBitmapOptionNone diff --git a/third_party/blink/renderer/core/imagebitmap/image_bitmap_source.cc b/third_party/blink/renderer/core/imagebitmap/image_bitmap_source.cc -index 485783c739..c9ecaca1ad 100644 +index 78e4150cdb..bdabf22cf5 100644 --- a/third_party/blink/renderer/core/imagebitmap/image_bitmap_source.cc +++ b/third_party/blink/renderer/core/imagebitmap/image_bitmap_source.cc @@ -13,6 +13,8 @@ @@ -1596,8 +1617,8 @@ index 485783c739..c9ecaca1ad 100644 + namespace blink { - constexpr const char* kImageBitmapOptionNone = "none"; -@@ -52,3 +54,5 @@ ScriptPromise ImageBitmapSource::CreateImageBitmap( + ScriptPromise ImageBitmapSource::FulfillImageBitmap( +@@ -50,3 +52,5 @@ ScriptPromise ImageBitmapSource::CreateImageBitmap( } } // namespace blink @@ -1625,7 +1646,7 @@ index 35d1fc42b1..15908128e8 100644 configs -= core_config_remove diff --git a/third_party/blink/renderer/core/inspector/inspector_css_parser_observer.cc b/third_party/blink/renderer/core/inspector/inspector_css_parser_observer.cc -index 3d1ef41e74..11ad088c16 100644 +index 09262add2a..dc471e387a 100644 --- a/third_party/blink/renderer/core/inspector/inspector_css_parser_observer.cc +++ b/third_party/blink/renderer/core/inspector/inspector_css_parser_observer.cc @@ -10,6 +10,8 @@ @@ -1644,7 +1665,7 @@ index 3d1ef41e74..11ad088c16 100644 + +#undef ParserContextForDocument diff --git a/third_party/blink/renderer/core/inspector/inspector_style_sheet.cc b/third_party/blink/renderer/core/inspector/inspector_style_sheet.cc -index a2499cc3f7..f13e9cf534 100644 +index 5fdf29c351..62da7e1ea0 100644 --- a/third_party/blink/renderer/core/inspector/inspector_style_sheet.cc +++ b/third_party/blink/renderer/core/inspector/inspector_style_sheet.cc @@ -83,6 +83,8 @@ @@ -1656,14 +1677,14 @@ index a2499cc3f7..f13e9cf534 100644 namespace blink { namespace { -@@ -2546,3 +2548,5 @@ const Document* InspectorStyleSheetForInlineStyle::GetDocument() { +@@ -2552,3 +2554,5 @@ const Document* InspectorStyleSheetForInlineStyle::GetDocument() { } } // namespace blink + +#undef ParserContextForDocument diff --git a/third_party/blink/renderer/core/layout/flex/flex_layout_algorithm.cc b/third_party/blink/renderer/core/layout/flex/flex_layout_algorithm.cc -index d5e50ad2c7..1465e1fb85 100644 +index d5964ef949..e5b024f985 100644 --- a/third_party/blink/renderer/core/layout/flex/flex_layout_algorithm.cc +++ b/third_party/blink/renderer/core/layout/flex/flex_layout_algorithm.cc @@ -42,6 +42,15 @@ @@ -1682,7 +1703,7 @@ index d5e50ad2c7..1465e1fb85 100644 namespace blink { namespace { -@@ -3700,3 +3709,11 @@ bool FlexLayoutAlgorithm::MinBlockSizeShouldEncompassIntrinsicSize( +@@ -3425,3 +3434,11 @@ bool FlexLayoutAlgorithm::MinBlockSizeShouldEncompassIntrinsicSize( } } // namespace blink @@ -1695,10 +1716,10 @@ index d5e50ad2c7..1465e1fb85 100644 +#pragma clang diagnostic pop +#endif 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 3ffa5100c0..47b639a5d0 100644 +index 5ca9e74de7..6f889a086a 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 -@@ -15,6 +15,9 @@ +@@ -18,6 +18,9 @@ #include "third_party/blink/renderer/core/layout/logical_box_fragment.h" #include "third_party/blink/renderer/core/layout/relative_utils.h" @@ -1708,7 +1729,7 @@ index 3ffa5100c0..47b639a5d0 100644 namespace blink { GridLayoutAlgorithm::GridLayoutAlgorithm(const LayoutAlgorithmParams& params) -@@ -3402,3 +3405,6 @@ LogicalRect GridLayoutAlgorithm::ComputeOutOfFlowItemContainingRect( +@@ -3190,3 +3193,6 @@ LogicalRect GridLayoutAlgorithm::ComputeOutOfFlowItemContainingRect( } // namespace blink WTF_ALLOW_CLEAR_UNUSED_SLOTS_WITH_MEM_FUNCTIONS(blink::ResultAndOffsets) @@ -1716,10 +1737,10 @@ index 3ffa5100c0..47b639a5d0 100644 +#undef BaselineAccumulator +#undef GapAccumulator diff --git a/third_party/blink/renderer/core/layout/inline/fragment_items.cc b/third_party/blink/renderer/core/layout/inline/fragment_items.cc -index 423ff42bf4..e01159a310 100644 +index bba9f8b5fa..05e5a2f578 100644 --- a/third_party/blink/renderer/core/layout/inline/fragment_items.cc +++ b/third_party/blink/renderer/core/layout/inline/fragment_items.cc -@@ -13,6 +13,11 @@ +@@ -14,6 +14,11 @@ #include "third_party/blink/renderer/platform/heap/collection_support/clear_collection_scope.h" #include "third_party/blink/renderer/platform/wtf/gc_plugin.h" @@ -1731,7 +1752,7 @@ index 423ff42bf4..e01159a310 100644 namespace blink { namespace { -@@ -585,3 +590,7 @@ void FragmentItems::Trace(Visitor* visitor) const { +@@ -607,3 +612,7 @@ void FragmentItems::Trace(Visitor* visitor) const { } } // namespace blink @@ -1740,10 +1761,10 @@ index 423ff42bf4..e01159a310 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/layout/inline/inline_node.cc b/third_party/blink/renderer/core/layout/inline/inline_node.cc -index f3a1bd029d..72ce59bb2c 100644 +index 9804f4397c..6a232a1501 100644 --- a/third_party/blink/renderer/core/layout/inline/inline_node.cc +++ b/third_party/blink/renderer/core/layout/inline/inline_node.cc -@@ -62,6 +62,11 @@ +@@ -61,6 +61,11 @@ #include "third_party/blink/renderer/platform/wtf/text/string_buffer.h" #include "third_party/blink/renderer/platform/wtf/text/text_offset_map.h" @@ -1755,7 +1776,7 @@ index f3a1bd029d..72ce59bb2c 100644 namespace blink { namespace { -@@ -2220,3 +2225,7 @@ String InlineNode::ToString() const { +@@ -2316,3 +2321,7 @@ String InlineNode::ToString() const { } } // namespace blink @@ -1764,7 +1785,7 @@ index f3a1bd029d..72ce59bb2c 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/layout/inline/line_breaker.cc b/third_party/blink/renderer/core/layout/inline/line_breaker.cc -index 04a76b9231..5f16778a4f 100644 +index bbc44ecea3..81dabe0bb5 100644 --- a/third_party/blink/renderer/core/layout/inline/line_breaker.cc +++ b/third_party/blink/renderer/core/layout/inline/line_breaker.cc @@ -38,6 +38,11 @@ @@ -1779,7 +1800,7 @@ index 04a76b9231..5f16778a4f 100644 namespace blink { namespace { -@@ -4704,3 +4709,7 @@ const InlineBreakToken* LineBreaker::CreateBreakToken( +@@ -4739,3 +4744,7 @@ const InlineBreakToken* LineBreaker::CreateBreakToken( } } // namespace blink @@ -1788,7 +1809,7 @@ index 04a76b9231..5f16778a4f 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/layout/mathml/math_layout_utils.cc b/third_party/blink/renderer/core/layout/mathml/math_layout_utils.cc -index ed0fc86dd3..e1a352c986 100644 +index 2d9caa8289..631c89cb96 100644 --- a/third_party/blink/renderer/core/layout/mathml/math_layout_utils.cc +++ b/third_party/blink/renderer/core/layout/mathml/math_layout_utils.cc @@ -15,6 +15,8 @@ @@ -1800,14 +1821,14 @@ index ed0fc86dd3..e1a352c986 100644 namespace blink { ConstraintSpace CreateConstraintSpaceForMathChild( -@@ -429,3 +431,5 @@ bool IsStretchyOperator(const BlockNode& node, bool stretch_axis_is_vertical) { +@@ -431,3 +433,5 @@ bool IsStretchyOperator(const BlockNode& node, bool stretch_axis_is_vertical) { } } // namespace blink + +#undef IsPrescriptDelimiter diff --git a/third_party/blink/renderer/core/layout/mathml/math_scripts_layout_algorithm.cc b/third_party/blink/renderer/core/layout/mathml/math_scripts_layout_algorithm.cc -index 6793451c35..f310fb3290 100644 +index 001936689f..b3e1cee389 100644 --- a/third_party/blink/renderer/core/layout/mathml/math_scripts_layout_algorithm.cc +++ b/third_party/blink/renderer/core/layout/mathml/math_scripts_layout_algorithm.cc @@ -10,6 +10,8 @@ @@ -1826,7 +1847,7 @@ index 6793451c35..f310fb3290 100644 + +#undef IsPrescriptDelimiter diff --git a/third_party/blink/renderer/core/layout/svg/layout_svg_ellipse.cc b/third_party/blink/renderer/core/layout/svg/layout_svg_ellipse.cc -index fff8c78fa9..ca5f887068 100644 +index 895131376a..5b7949f510 100644 --- a/third_party/blink/renderer/core/layout/svg/layout_svg_ellipse.cc +++ b/third_party/blink/renderer/core/layout/svg/layout_svg_ellipse.cc @@ -31,6 +31,8 @@ @@ -1838,14 +1859,14 @@ index fff8c78fa9..ca5f887068 100644 namespace blink { namespace { -@@ -162,3 +164,5 @@ bool LayoutSVGEllipse::HasContinuousStroke() const { +@@ -176,3 +178,5 @@ bool LayoutSVGEllipse::HasContinuousStroke() const { } } // namespace blink + +#undef GeometryPropertiesChanged diff --git a/third_party/blink/renderer/core/layout/svg/layout_svg_rect.cc b/third_party/blink/renderer/core/layout/svg/layout_svg_rect.cc -index 399f7bee44..bd24aa2998 100644 +index 869fb948ea..e7d3925366 100644 --- a/third_party/blink/renderer/core/layout/svg/layout_svg_rect.cc +++ b/third_party/blink/renderer/core/layout/svg/layout_svg_rect.cc @@ -31,6 +31,8 @@ @@ -1857,17 +1878,17 @@ index 399f7bee44..bd24aa2998 100644 namespace blink { namespace { -@@ -156,3 +158,5 @@ bool LayoutSVGRect::DefinitelyHasSimpleStroke() const { +@@ -158,3 +160,5 @@ bool LayoutSVGRect::DefinitelyHasSimpleStroke() const { } } // namespace blink + +#undef GeometryPropertiesChanged diff --git a/third_party/blink/renderer/core/layout/text_autosizer.cc b/third_party/blink/renderer/core/layout/text_autosizer.cc -index 46c9e05626..8c610bed27 100644 +index e223f6633f..eda0d46217 100644 --- a/third_party/blink/renderer/core/layout/text_autosizer.cc +++ b/third_party/blink/renderer/core/layout/text_autosizer.cc -@@ -62,6 +62,11 @@ +@@ -63,6 +63,11 @@ #include "third_party/blink/renderer/platform/wtf/hash_functions.h" #include "ui/gfx/geometry/rect.h" @@ -1879,7 +1900,7 @@ index 46c9e05626..8c610bed27 100644 namespace blink { namespace { struct FingerprintSourceData; -@@ -1634,3 +1639,7 @@ void TextAutosizer::FingerprintMapper::Trace(Visitor* visitor) const { +@@ -1633,3 +1638,7 @@ void TextAutosizer::FingerprintMapper::Trace(Visitor* visitor) const { } } // namespace blink @@ -1936,10 +1957,10 @@ index bf0d91bb1e..a01de8422b 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/paint/paint_property_tree_builder.cc b/third_party/blink/renderer/core/paint/paint_property_tree_builder.cc -index d1751f7ef2..a4adfefc50 100644 +index 4f5b70cd93..6120c33532 100644 --- a/third_party/blink/renderer/core/paint/paint_property_tree_builder.cc +++ b/third_party/blink/renderer/core/paint/paint_property_tree_builder.cc -@@ -87,6 +87,8 @@ +@@ -92,6 +92,8 @@ #include "ui/gfx/geometry/transform.h" #include "ui/gfx/geometry/vector2d_conversions.h" @@ -1948,18 +1969,18 @@ index d1751f7ef2..a4adfefc50 100644 namespace blink { namespace { -@@ -4156,3 +4158,5 @@ bool PaintPropertyTreeBuilder::CanDoDeferredOpacityNodeUpdate( +@@ -4249,3 +4251,5 @@ bool PaintPropertyTreeBuilder::CanDoDeferredOpacityNodeUpdate( } } // namespace blink + +#undef IsLinkHighlighted diff --git a/third_party/blink/renderer/core/paint/pre_paint_tree_walk.cc b/third_party/blink/renderer/core/paint/pre_paint_tree_walk.cc -index 3f8e0a6e96..8e22f01efc 100644 +index 7da8567b6b..aa1bded98e 100644 --- a/third_party/blink/renderer/core/paint/pre_paint_tree_walk.cc +++ b/third_party/blink/renderer/core/paint/pre_paint_tree_walk.cc -@@ -37,6 +37,8 @@ - #include "third_party/blink/renderer/core/paint/pre_paint_disable_side_effects_scope.h" +@@ -38,6 +38,8 @@ + #include "third_party/blink/renderer/core/timing/soft_navigation_paint_attribution_tracker.h" #include "third_party/blink/renderer/platform/runtime_enabled_features.h" +#define IsLinkHighlighted IsLinkHighlighted_PrePaintTreeWalk @@ -1967,14 +1988,14 @@ index 3f8e0a6e96..8e22f01efc 100644 namespace blink { namespace { -@@ -1398,3 +1400,5 @@ void PrePaintTreeWalk::Walk(const LayoutObject& object, +@@ -1459,3 +1461,5 @@ void PrePaintTreeWalk::Walk(const LayoutObject& object, } } // namespace blink + +#undef IsLinkHighlighted diff --git a/third_party/blink/renderer/core/script/document_modulator_impl.cc b/third_party/blink/renderer/core/script/document_modulator_impl.cc -index 223b6be013..c467a2dd02 100644 +index 4badbfcf43..a57d1bfe05 100644 --- a/third_party/blink/renderer/core/script/document_modulator_impl.cc +++ b/third_party/blink/renderer/core/script/document_modulator_impl.cc @@ -9,6 +9,11 @@ @@ -1989,7 +2010,7 @@ index 223b6be013..c467a2dd02 100644 namespace blink { namespace { -@@ -117,3 +122,7 @@ void DocumentModulatorImpl::AddModuleToResolvedModuleSet( +@@ -106,3 +111,7 @@ void DocumentModulatorImpl::AddModuleToResolvedModuleSet( } } // namespace blink @@ -1998,10 +2019,10 @@ index 223b6be013..c467a2dd02 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc b/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc -index fd05742ee4..ac9c5c7784 100644 +index 1424fc7fbd..41daa8b7d1 100644 --- a/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc +++ b/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc -@@ -23,6 +23,8 @@ +@@ -24,6 +24,8 @@ #include "third_party/blink/renderer/platform/wtf/text/strcat.h" #include "third_party/blink/renderer/platform/wtf/text/string_builder.h" @@ -2010,14 +2031,14 @@ index fd05742ee4..ac9c5c7784 100644 namespace blink { namespace { -@@ -643,3 +645,5 @@ HeapVector> DocumentRulePredicate::GetStyleRulesForTesting() +@@ -582,3 +584,5 @@ HeapVector> DocumentRulePredicate::GetStyleRulesForTesting() void DocumentRulePredicate::Trace(Visitor*) const {} } // namespace blink + +#undef SetParseErrorMessage diff --git a/third_party/blink/renderer/core/speculation_rules/speculation_rule_set.cc b/third_party/blink/renderer/core/speculation_rules/speculation_rule_set.cc -index bbc63959cb..6d56b7a81c 100644 +index a18b35ff8a..a35f6344e1 100644 --- a/third_party/blink/renderer/core/speculation_rules/speculation_rule_set.cc +++ b/third_party/blink/renderer/core/speculation_rules/speculation_rule_set.cc @@ -30,6 +30,8 @@ @@ -2029,14 +2050,14 @@ index bbc63959cb..6d56b7a81c 100644 namespace blink { namespace { -@@ -822,3 +824,5 @@ void SpeculationRuleSet::AddConsoleMessageForValidation( +@@ -839,3 +841,5 @@ void SpeculationRuleSet::AddConsoleMessageForValidation( } } // namespace blink + +#undef SetParseErrorMessage diff --git a/third_party/blink/renderer/core/svg/svg_path_byte_stream.h b/third_party/blink/renderer/core/svg/svg_path_byte_stream.h -index 2e1ce5b689..a59f51c32b 100644 +index 5b0b3bd742..6d70d5565c 100644 --- a/third_party/blink/renderer/core/svg/svg_path_byte_stream.h +++ b/third_party/blink/renderer/core/svg/svg_path_byte_stream.h @@ -26,6 +26,11 @@ @@ -2050,8 +2071,8 @@ index 2e1ce5b689..a59f51c32b 100644 + namespace blink { - template -@@ -76,4 +81,8 @@ class SVGPathByteStream { + class SVGPathByteStream { +@@ -68,4 +73,8 @@ class SVGPathByteStream { } // namespace blink @@ -2061,7 +2082,7 @@ index 2e1ce5b689..a59f51c32b 100644 + #endif // THIRD_PARTY_BLINK_RENDERER_CORE_SVG_SVG_PATH_BYTE_STREAM_H_ diff --git a/third_party/blink/renderer/core/svg/svg_view_spec.cc b/third_party/blink/renderer/core/svg/svg_view_spec.cc -index 42779d708c..d4c2568af7 100644 +index 1f4b21d976..b000ecbc2f 100644 --- a/third_party/blink/renderer/core/svg/svg_view_spec.cc +++ b/third_party/blink/renderer/core/svg/svg_view_spec.cc @@ -31,6 +31,8 @@ @@ -2073,17 +2094,17 @@ index 42779d708c..d4c2568af7 100644 namespace blink { void SVGViewSpec::Trace(Visitor* visitor) const { -@@ -208,3 +210,5 @@ bool SVGViewSpec::ParseViewSpecInternal(base::span chars) { +@@ -201,3 +203,5 @@ bool SVGViewSpec::ParseViewSpecInternal(base::span chars) { } } // namespace blink + +#undef kUnknown diff --git a/third_party/blink/renderer/core/timing/background_tracing_helper.cc b/third_party/blink/renderer/core/timing/background_tracing_helper.cc -index 36bbcf53cb..402a674c7a 100644 +index 15ad503a1b..a499762dc1 100644 --- a/third_party/blink/renderer/core/timing/background_tracing_helper.cc +++ b/third_party/blink/renderer/core/timing/background_tracing_helper.cc -@@ -28,6 +28,11 @@ +@@ -29,6 +29,11 @@ #include "third_party/blink/renderer/platform/wtf/text/string_to_number.h" #include "url/url_constants.h" @@ -2094,8 +2115,8 @@ index 36bbcf53cb..402a674c7a 100644 + namespace blink { - namespace { -@@ -251,3 +256,7 @@ BackgroundTracingHelper::ParsePerformanceMarkSiteHashes( + uint32_t MD5Hash32ForBackgroundTracingHelper(std::string_view string) { +@@ -254,3 +259,7 @@ BackgroundTracingHelper::ParsePerformanceMarkSiteHashes( } } // namespace blink @@ -2104,7 +2125,7 @@ index 36bbcf53cb..402a674c7a 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/timing/performance_event_timing.cc b/third_party/blink/renderer/core/timing/performance_event_timing.cc -index 3dcef14bb6..ffcff9e8a0 100644 +index 12b25ffde8..83d1633b15 100644 --- a/third_party/blink/renderer/core/timing/performance_event_timing.cc +++ b/third_party/blink/renderer/core/timing/performance_event_timing.cc @@ -15,6 +15,11 @@ @@ -2119,7 +2140,7 @@ index 3dcef14bb6..ffcff9e8a0 100644 namespace blink { // static -@@ -372,3 +377,7 @@ bool PerformanceEventTiming::NeedsNextPaintMeasurement() const { +@@ -400,3 +405,7 @@ bool PerformanceEventTiming::NeedsNextPaintMeasurement() const { } } // namespace blink @@ -2128,7 +2149,7 @@ index 3dcef14bb6..ffcff9e8a0 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/timing/responsiveness_metrics.cc b/third_party/blink/renderer/core/timing/responsiveness_metrics.cc -index 5e0362c6a9..fc33cea509 100644 +index 08406d2138..811fe144b0 100644 --- a/third_party/blink/renderer/core/timing/responsiveness_metrics.cc +++ b/third_party/blink/renderer/core/timing/responsiveness_metrics.cc @@ -32,6 +32,11 @@ @@ -2143,9 +2164,9 @@ index 5e0362c6a9..fc33cea509 100644 namespace blink { namespace { -@@ -67,6 +72,10 @@ constexpr char kSlowInteractionToNextPaintTraceEventName[] = - const char kPageLoadInternalEventTimingClickInteractionEvents[] = - "PageLoad.Internal.EventTiming.ClickInteractionEvents"; +@@ -64,6 +69,10 @@ constexpr char kSlowInteractionToNextPaintTraceEventCategory[] = "latency"; + constexpr char kSlowInteractionToNextPaintTraceEventName[] = + "SlowInteractionToNextPaint"; +} // namespace { + @@ -2154,7 +2175,7 @@ index 5e0362c6a9..fc33cea509 100644 // These values are logged to UMA. Please keep in sync with // "EventTimingClickInteractionEvents" in tools/metrics/histograms/enums.xml. // LINT.IfChange -@@ -84,6 +93,10 @@ enum ClickInteractionEvents { +@@ -81,6 +90,10 @@ enum ClickInteractionEvents { }; // LINT.ThenChange(/tools/metrics/histograms/enums.xml:EventTimingClickInteractionEvents) @@ -2165,7 +2186,7 @@ index 5e0362c6a9..fc33cea509 100644 void EmitSlowInteractionToNextPaintTraceEvent( const ResponsivenessMetrics::EventTimestamps& event, uint64_t event_id) { -@@ -277,6 +290,7 @@ void ResponsivenessMetrics::RecordTapOrClickUKM( +@@ -274,6 +287,7 @@ void ResponsivenessMetrics::RecordTapOrClickUKM( bool ResponsivenessMetrics::SetPointerIdAndRecordLatency( PerformanceEventTiming* entry, EventTimestamps event_timestamps) { @@ -2173,7 +2194,7 @@ index 5e0362c6a9..fc33cea509 100644 const AtomicString& event_type = entry->name(); auto pointer_id = entry->GetEventTimingReportingInfo()->pointer_id.value(); auto* pointer_info = pointer_id_entry_map_.Contains(pointer_id) -@@ -876,3 +890,7 @@ bool ResponsivenessMetrics::TryHandleKeyboardEventSimulatedClick( +@@ -801,3 +815,7 @@ bool ResponsivenessMetrics::TryHandleKeyboardEventSimulatedClick( return true; } } // namespace blink @@ -2182,13 +2203,14 @@ index 5e0362c6a9..fc33cea509 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/core/timing/soft_navigation_heuristics.cc b/third_party/blink/renderer/core/timing/soft_navigation_heuristics.cc -index fec3dcff21..b609b8c999 100644 +index b011a33c54..30b5c74004 100644 --- a/third_party/blink/renderer/core/timing/soft_navigation_heuristics.cc +++ b/third_party/blink/renderer/core/timing/soft_navigation_heuristics.cc -@@ -34,6 +34,10 @@ namespace { - const char kPageLoadInternalSoftNavigationOutcome[] = - "PageLoad.Internal.SoftNavigationOutcome"; - +@@ -60,6 +60,11 @@ const char + kPageLoadInternalSoftNavigationNotEmittedInsufficientPaintTotalPaintAreaPercentage + [] = "PageLoad.Internal.SoftNavigation.NotEmittedInsufficientPaint." + "TotalPaintAreaPoints"; ++ +} // namespace { + +namespace soft_navigation_heuristics { @@ -2196,7 +2218,7 @@ index fec3dcff21..b609b8c999 100644 // These values are logged to UMA. Entries should not be renumbered and numeric // values should never be reused. Please keep in sync with // "SoftNavigationOutcome" in tools/metrics/histograms/enums.xml. Note also that -@@ -56,6 +60,10 @@ enum SoftNavigationOutcome { +@@ -83,6 +88,10 @@ enum SoftNavigationOutcome { }; // LINT.ThenChange(/tools/metrics/histograms/enums.xml:SoftNavigationOutcome) @@ -2205,11 +2227,11 @@ index fec3dcff21..b609b8c999 100644 +namespace { + void OnSoftNavigationContextWasExhausted(const SoftNavigationContext& context, + uint64_t viewport_area, uint64_t required_paint_area) { - TRACE_EVENT_INSTANT( -@@ -78,9 +86,11 @@ void OnSoftNavigationContextWasExhausted(const SoftNavigationContext& context, - // However, if we ever report total painted area, or largest paint size, we - // should do it here, lazily, in order to wait for the final sizes. +@@ -125,9 +134,11 @@ void OnSoftNavigationContextWasExhausted(const SoftNavigationContext& context, + kPageLoadInternalSoftNavigationEmittedTotalPaintAreaPoints, + base::saturated_cast(points_val)); } else if (!context.HasDomModification()) { + using namespace soft_navigation_heuristics; base::UmaHistogramEnumeration(kPageLoadInternalSoftNavigationOutcome, @@ -2218,16 +2240,24 @@ index fec3dcff21..b609b8c999 100644 + using namespace soft_navigation_heuristics; base::UmaHistogramEnumeration(kPageLoadInternalSoftNavigationOutcome, SoftNavigationOutcome::kInsufficientPaints); - } -@@ -228,6 +238,7 @@ void SoftNavigationHeuristics::SameDocumentNavigationCommitted( + uint64_t total_paint_area = context.PaintedArea(); +@@ -320,6 +331,7 @@ void SoftNavigationHeuristics::SameDocumentNavigationCommitted( "SoftNavigationHeuristics::" "SameDocumentNavigationCommittedWithoutContext", - "url", url); + perfetto::Track::FromPointer(this), "url", url); + using namespace soft_navigation_heuristics; base::UmaHistogramEnumeration( kPageLoadInternalSoftNavigationOutcome, SoftNavigationOutcome::kNoSoftNavContextDuringUrlChange); -@@ -364,6 +375,7 @@ void SoftNavigationHeuristics::ReportSoftNavigationToMetrics( +@@ -337,6 +349,7 @@ void SoftNavigationHeuristics::SameDocumentNavigationCommitted( + "edIntoPreviousContext", + perfetto::Track::FromPointer(context), "context", + *context_for_current_url_, "url", url); ++ using namespace soft_navigation_heuristics; + base::UmaHistogramEnumeration( + kPageLoadInternalSoftNavigationOutcome, + SoftNavigationOutcome:: +@@ -584,6 +597,7 @@ void SoftNavigationHeuristics::ReportSoftNavigationToMetrics( } // Count "successful soft nav" in histogram @@ -2236,10 +2266,10 @@ index fec3dcff21..b609b8c999 100644 SoftNavigationOutcome::kSoftNavigationDetected); } diff --git a/third_party/blink/renderer/core/timing/window_performance.cc b/third_party/blink/renderer/core/timing/window_performance.cc -index 81c4fd9eca..09387fbf64 100644 +index c58b9bea3a..e4a20645b2 100644 --- a/third_party/blink/renderer/core/timing/window_performance.cc +++ b/third_party/blink/renderer/core/timing/window_performance.cc -@@ -105,6 +105,11 @@ +@@ -109,6 +109,11 @@ static constexpr base::TimeDelta kLongTaskObserverThreshold = base::Milliseconds(50); @@ -2251,7 +2281,7 @@ index 81c4fd9eca..09387fbf64 100644 namespace blink { namespace { -@@ -1553,3 +1558,7 @@ bool WindowPerformance::IsAutoscrollActive() { +@@ -1616,3 +1621,7 @@ bool WindowPerformance::IsAutoscrollActive() { } } // namespace blink @@ -2259,8 +2289,21 @@ index 81c4fd9eca..09387fbf64 100644 +#ifdef __clang__ +#pragma clang diagnostic pop +#endif +diff --git a/third_party/blink/renderer/core/url_pattern/url_pattern_dummy_url_canon.cc b/third_party/blink/renderer/core/url_pattern/url_pattern_dummy_url_canon.cc +index 7d9bf5e67d..91f9228b7a 100644 +--- a/third_party/blink/renderer/core/url_pattern/url_pattern_dummy_url_canon.cc ++++ b/third_party/blink/renderer/core/url_pattern/url_pattern_dummy_url_canon.cc +@@ -65,7 +65,7 @@ String MaybeStripAfterFirstDelimiter(const String& value, + bool ContainsForbiddenHostnameCodePoint(const String& input, + const bool allow_ipv6_delimiters) { + StringUtf8Adaptor input_utf8(input); +- return url_pattern::ContainsForbiddenHostnameCodePoint( ++ return ::url_pattern::ContainsForbiddenHostnameCodePoint( + input_utf8.AsStringView(), allow_ipv6_delimiters); + } + diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn -index e29fa53cb4..1d9f1c4a52 100644 +index 0abfa024c8..343027cecf 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn @@ -25,7 +25,7 @@ config("modules_implementation") { @@ -2272,7 +2315,7 @@ index e29fa53cb4..1d9f1c4a52 100644 output_name = "blink_modules" visibility = [] # Allow re-assignment of list. -@@ -218,7 +218,7 @@ component("modules") { +@@ -215,7 +215,7 @@ component("modules") { configs += blink_symbols_config } @@ -2281,7 +2324,7 @@ index e29fa53cb4..1d9f1c4a52 100644 testonly = true sources = [ -@@ -397,7 +397,7 @@ blink_modules_sources("modules_generated") { +@@ -394,7 +394,7 @@ blink_modules_sources("modules_generated") { } } @@ -2291,10 +2334,10 @@ index e29fa53cb4..1d9f1c4a52 100644 sources = [ diff --git a/third_party/blink/renderer/modules/accessibility/ax_block_flow_iterator.cc b/third_party/blink/renderer/modules/accessibility/ax_block_flow_iterator.cc -index ebb7e1553d..a65e0b7dde 100644 +index adf61cbc8a..f1c7eeab62 100644 --- a/third_party/blink/renderer/modules/accessibility/ax_block_flow_iterator.cc +++ b/third_party/blink/renderer/modules/accessibility/ax_block_flow_iterator.cc -@@ -29,6 +29,11 @@ +@@ -30,6 +30,11 @@ #include "third_party/blink/renderer/platform/wtf/text/string_view.h" #include "third_party/blink/renderer/platform/wtf/wtf_size_t.h" @@ -2306,7 +2349,7 @@ index ebb7e1553d..a65e0b7dde 100644 namespace blink { namespace { -@@ -550,3 +555,7 @@ bool AXBlockFlowIterator::IsLineBreak() const { +@@ -551,3 +556,7 @@ bool AXBlockFlowIterator::IsLineBreak() const { } } // namespace blink @@ -2315,17 +2358,17 @@ index ebb7e1553d..a65e0b7dde 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.cc b/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.cc -index 24b7180959..876e073017 100644 +index 12b2f7048c..e2fba014f1 100644 --- a/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.cc +++ b/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.cc -@@ -6834,3 +6834,5 @@ std::ostream& operator<<(std::ostream& stream, const AXObjectCacheImpl& cache) { +@@ -6951,3 +6951,5 @@ std::ostream& operator<<(std::ostream& stream, const AXObjectCacheImpl& cache) { } } // namespace blink + +#undef DEBUG_STRING_CASE diff --git a/third_party/blink/renderer/modules/accessibility/ax_object_cache_lifecycle.cc b/third_party/blink/renderer/modules/accessibility/ax_object_cache_lifecycle.cc -index ee2cce1243..0c3894fee3 100644 +index b7e5c03061..8f27b05276 100644 --- a/third_party/blink/renderer/modules/accessibility/ax_object_cache_lifecycle.cc +++ b/third_party/blink/renderer/modules/accessibility/ax_object_cache_lifecycle.cc @@ -83,3 +83,5 @@ void AXObjectCacheLifecycle::EnsureStateAtMost(LifecycleState state) { @@ -2335,7 +2378,7 @@ index ee2cce1243..0c3894fee3 100644 + +#undef DEBUG_STRING_CASE diff --git a/third_party/blink/renderer/modules/bluetooth/bluetooth.cc b/third_party/blink/renderer/modules/bluetooth/bluetooth.cc -index 3686c677a3..d0276f4cee 100644 +index ba932f1531..c4ad59115c 100644 --- a/third_party/blink/renderer/modules/bluetooth/bluetooth.cc +++ b/third_party/blink/renderer/modules/bluetooth/bluetooth.cc @@ -47,6 +47,8 @@ @@ -2347,14 +2390,14 @@ index 3686c677a3..d0276f4cee 100644 namespace blink { namespace { -@@ -680,3 +682,5 @@ void Bluetooth::EnsureServiceConnection(ExecutionContext* context) { +@@ -679,3 +681,5 @@ void Bluetooth::EnsureServiceConnection(ExecutionContext* context) { } } // namespace blink + +#undef kInactiveDocumentError diff --git a/third_party/blink/renderer/modules/bluetooth/bluetooth_device.cc b/third_party/blink/renderer/modules/bluetooth/bluetooth_device.cc -index 75a6721326..1a95acdc16 100644 +index 92f17165cc..882b496a50 100644 --- a/third_party/blink/renderer/modules/bluetooth/bluetooth_device.cc +++ b/third_party/blink/renderer/modules/bluetooth/bluetooth_device.cc @@ -23,6 +23,8 @@ @@ -2392,7 +2435,7 @@ index cad29b1693..1f8a13ab44 100644 + +#undef TransferringOptimizer diff --git a/third_party/blink/renderer/modules/breakout_box/media_stream_video_track_underlying_sink.cc b/third_party/blink/renderer/modules/breakout_box/media_stream_video_track_underlying_sink.cc -index 28dd0fd38a..637c0e438b 100644 +index 384b2bb3de..a224405e65 100644 --- a/third_party/blink/renderer/modules/breakout_box/media_stream_video_track_underlying_sink.cc +++ b/third_party/blink/renderer/modules/breakout_box/media_stream_video_track_underlying_sink.cc @@ -25,6 +25,8 @@ @@ -2404,34 +2447,33 @@ index 28dd0fd38a..637c0e438b 100644 namespace blink { namespace { -@@ -291,3 +293,5 @@ void MediaStreamVideoTrackUnderlyingSink::ConvertDone( +@@ -286,3 +288,5 @@ void MediaStreamVideoTrackUnderlyingSink::ConvertDone( } } // namespace blink + +#undef TransferringOptimizer diff --git a/third_party/blink/renderer/modules/canvas/BUILD.gn b/third_party/blink/renderer/modules/canvas/BUILD.gn -index 51ad545130..d78ee216e3 100644 +index 16ba800e7e..cebb1a99fb 100644 --- a/third_party/blink/renderer/modules/canvas/BUILD.gn +++ b/third_party/blink/renderer/modules/canvas/BUILD.gn -@@ -60,6 +60,10 @@ blink_modules_sources("canvas") { +@@ -58,6 +58,9 @@ blink_modules_sources("canvas") { "offscreencanvas2d/offscreen_canvas_rendering_context_2d.h", "testing/canvas_test_utils.cc", ] + jumbo_excluded_sources = [ -+ "imagebitmap/image_bitmap_rendering_context_base.cc", + "offscreencanvas2d/offscreen_canvas_rendering_context_2d.cc", + ] deps = [ "//third_party/blink/renderer/modules/webcodecs", diff --git a/third_party/blink/renderer/modules/credentialmanagement/credential.cc b/third_party/blink/renderer/modules/credentialmanagement/credential.cc -index 71890b4673..bce5d5c42d 100644 +index dfe39e2d8c..3670219120 100644 --- a/third_party/blink/renderer/modules/credentialmanagement/credential.cc +++ b/third_party/blink/renderer/modules/credentialmanagement/credential.cc -@@ -7,6 +7,11 @@ - #include "third_party/blink/renderer/platform/bindings/exception_state.h" +@@ -8,6 +8,11 @@ #include "third_party/blink/renderer/platform/weborigin/kurl.h" + #include "third_party/blink/renderer/platform/wtf/text/strcat.h" +#define kDigitalCredentialType kDigitalCredentialType_Credential +#define kFederatedCredentialType kFederatedCredentialType_Credential @@ -2441,7 +2483,7 @@ index 71890b4673..bce5d5c42d 100644 namespace blink { namespace { -@@ -43,3 +48,8 @@ void Credential::Trace(Visitor* visitor) const { +@@ -45,3 +50,8 @@ void Credential::Trace(Visitor* visitor) const { } } // namespace blink @@ -2451,26 +2493,26 @@ index 71890b4673..bce5d5c42d 100644 +#undef kIdentityCredentialType +#undef kOtpCredentialType diff --git a/third_party/blink/renderer/modules/credentialmanagement/digital_credential.cc b/third_party/blink/renderer/modules/credentialmanagement/digital_credential.cc -index 95b1ed6817..05009f334e 100644 +index c8c677d23d..6691a13578 100644 --- a/third_party/blink/renderer/modules/credentialmanagement/digital_credential.cc +++ b/third_party/blink/renderer/modules/credentialmanagement/digital_credential.cc -@@ -4,6 +4,8 @@ - - #include "third_party/blink/renderer/modules/credentialmanagement/digital_credential.h" +@@ -9,6 +9,8 @@ + #include "third_party/blink/renderer/platform/wtf/text/ascii_ctype.h" + #include "third_party/blink/renderer/platform/wtf/text/character_names.h" +#define kDigitalCredentialType kDigitalCredentialType_DigitalCredential + namespace blink { namespace { -@@ -30,3 +32,5 @@ void DigitalCredential::Trace(Visitor* visitor) const { +@@ -68,3 +70,5 @@ ScriptObject DigitalCredential::toJSON(ScriptState* script_state) const { } } // namespace blink + +#undef kDigitalCredentialType diff --git a/third_party/blink/renderer/modules/credentialmanagement/federated_credential.cc b/third_party/blink/renderer/modules/credentialmanagement/federated_credential.cc -index 45a1b96563..b74773cb21 100644 +index a1964aa7d0..82c0c307dc 100644 --- a/third_party/blink/renderer/modules/credentialmanagement/federated_credential.cc +++ b/third_party/blink/renderer/modules/credentialmanagement/federated_credential.cc @@ -17,6 +17,8 @@ @@ -2482,14 +2524,14 @@ index 45a1b96563..b74773cb21 100644 namespace blink { namespace { -@@ -97,3 +99,5 @@ void SetIdpSigninStatus(const blink::LocalFrameToken& local_frame_token, +@@ -98,3 +100,5 @@ void SetIdpSigninStatus(const blink::LocalFrameToken& local_frame_token, } } // namespace blink + +#undef kFederatedCredentialType diff --git a/third_party/blink/renderer/modules/credentialmanagement/identity_credential.cc b/third_party/blink/renderer/modules/credentialmanagement/identity_credential.cc -index 6da1ab50f9..6232b8a244 100644 +index 43645fc560..8ad2887cc6 100644 --- a/third_party/blink/renderer/modules/credentialmanagement/identity_credential.cc +++ b/third_party/blink/renderer/modules/credentialmanagement/identity_credential.cc @@ -14,6 +14,8 @@ @@ -2501,7 +2543,7 @@ index 6da1ab50f9..6232b8a244 100644 namespace blink { namespace { -@@ -147,3 +149,5 @@ ScriptPromise IdentityCredential::disconnect( +@@ -159,3 +161,5 @@ void IdentityCredential::Trace(Visitor* visitor) const { } } // namespace blink @@ -2540,12 +2582,12 @@ index 9db32e0cc2..c01e8226f6 100644 sources = [ "gamepad_comparisons_test.cc" ] diff --git a/third_party/blink/renderer/modules/gamepad/gamepad.cc b/third_party/blink/renderer/modules/gamepad/gamepad.cc -index 08a0bd7e57..15a6520aeb 100644 +index b5c598bdde..ba61a11a57 100644 --- a/third_party/blink/renderer/modules/gamepad/gamepad.cc +++ b/third_party/blink/renderer/modules/gamepad/gamepad.cc -@@ -32,6 +32,11 @@ +@@ -33,6 +33,11 @@ #include "third_party/blink/renderer/modules/gamepad/gamepad_comparisons.h" - #include "third_party/blink/renderer/platform/wtf/text/string_view.h" + #include "third_party/blink/renderer/platform/wtf/text/string_builder.h" +#ifdef __clang__ +#pragma clang diagnostic push @@ -2555,7 +2597,7 @@ index 08a0bd7e57..15a6520aeb 100644 namespace blink { Gamepad::Gamepad(Client* client, -@@ -230,3 +235,7 @@ void Gamepad::Trace(Visitor* visitor) const { +@@ -239,3 +244,7 @@ void Gamepad::Trace(Visitor* visitor) const { } } // namespace blink @@ -2601,7 +2643,7 @@ index 2bf007a917..768e988305 100644 sources = [ "hid_device_test.cc" ] diff --git a/third_party/blink/renderer/modules/hid/hid.cc b/third_party/blink/renderer/modules/hid/hid.cc -index a9400bf954..d7c1657ffb 100644 +index 41f05e136a..c424f01c35 100644 --- a/third_party/blink/renderer/modules/hid/hid.cc +++ b/third_party/blink/renderer/modules/hid/hid.cc @@ -27,6 +27,8 @@ @@ -2620,7 +2662,7 @@ index a9400bf954..d7c1657ffb 100644 + +#undef kContextGone diff --git a/third_party/blink/renderer/modules/hid/hid_device.cc b/third_party/blink/renderer/modules/hid/hid_device.cc -index 41c20ab0fc..71aa47f574 100644 +index 339d065f73..f325f9a8bb 100644 --- a/third_party/blink/renderer/modules/hid/hid_device.cc +++ b/third_party/blink/renderer/modules/hid/hid_device.cc @@ -18,6 +18,8 @@ @@ -2632,29 +2674,29 @@ index 41c20ab0fc..71aa47f574 100644 namespace blink { namespace { -@@ -625,3 +627,5 @@ HIDReportItem* HIDDevice::ToHIDReportItem( +@@ -624,3 +626,5 @@ HIDReportItem* HIDDevice::ToHIDReportItem( } } // namespace blink + +#undef kContextGone diff --git a/third_party/blink/renderer/modules/imagecapture/image_capture_frame_grabber.cc b/third_party/blink/renderer/modules/imagecapture/image_capture_frame_grabber.cc -index 353758cfda..af149d83aa 100644 +index 197ae7263c..9eb4194093 100644 --- a/third_party/blink/renderer/modules/imagecapture/image_capture_frame_grabber.cc +++ b/third_party/blink/renderer/modules/imagecapture/image_capture_frame_grabber.cc -@@ -34,6 +34,11 @@ +@@ -33,6 +33,11 @@ + #include "third_party/skia/include/core/SkImage.h" #include "third_party/skia/include/core/SkSurface.h" - #include "ui/gfx/gpu_memory_buffer.h" +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wshorten-64-to-32" +#endif + - namespace WTF { + namespace blink { + // Template specialization of [1], needed to be able to pass callbacks - // that have ScopedPromiseResolver parameters across threads. -@@ -383,3 +388,7 @@ void ImageCaptureFrameGrabber::OnTimeout() { +@@ -376,3 +381,7 @@ void ImageCaptureFrameGrabber::OnTimeout() { } } // namespace blink @@ -2674,11 +2716,28 @@ index c88bc2c7eb..64f98ebedc 100644 import("//third_party/blink/renderer/modules/modules.gni") blink_modules_sources("media") { +diff --git a/third_party/blink/renderer/modules/mediarecorder/BUILD.gn b/third_party/blink/renderer/modules/mediarecorder/BUILD.gn +index 29885ef93a..e660deaec6 100644 +--- a/third_party/blink/renderer/modules/mediarecorder/BUILD.gn ++++ b/third_party/blink/renderer/modules/mediarecorder/BUILD.gn +@@ -34,6 +34,12 @@ blink_modules_sources("mediarecorder") { + "video_track_recorder.cc", + "video_track_recorder.h", + ] ++ jumbo_excluded_sources = [ ++ # redefinition of 'CrossThreadCopier>>' ++ # `CrossThreadCopier>` in `audio_track_recorder.cc` ++ # `CrossThreadCopier>` in `video_track_recorder.cc` ++ "audio_track_recorder.cc", ++ ] + + deps = [ + "//media", diff --git a/third_party/blink/renderer/modules/mediarecorder/video_track_recorder.cc b/third_party/blink/renderer/modules/mediarecorder/video_track_recorder.cc -index e921050dfb..8866d391a9 100644 +index 9231f24311..80d7fbde1b 100644 --- a/third_party/blink/renderer/modules/mediarecorder/video_track_recorder.cc +++ b/third_party/blink/renderer/modules/mediarecorder/video_track_recorder.cc -@@ -63,6 +63,11 @@ +@@ -67,6 +67,11 @@ using video_track_recorder::kVEAEncoderMinResolutionHeight; using video_track_recorder::kVEAEncoderMinResolutionWidth; @@ -2687,10 +2746,10 @@ index e921050dfb..8866d391a9 100644 +#pragma clang diagnostic ignored "-Wshorten-64-to-32" +#endif + - namespace WTF { + namespace blink { + template <> - struct CrossThreadCopier>> -@@ -1199,3 +1204,7 @@ void VideoTrackRecorderPassthrough::HandleEncodedVideoFrame( +@@ -1181,3 +1186,7 @@ void VideoTrackRecorderPassthrough::HandleEncodedVideoFrame( } } // namespace blink @@ -2699,7 +2758,7 @@ index e921050dfb..8866d391a9 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/modules/mediastream/BUILD.gn b/third_party/blink/renderer/modules/mediastream/BUILD.gn -index 2c0492c713..2cc294a1b2 100644 +index 9bc2de3680..9166708dc6 100644 --- a/third_party/blink/renderer/modules/mediastream/BUILD.gn +++ b/third_party/blink/renderer/modules/mediastream/BUILD.gn @@ -2,6 +2,7 @@ @@ -2737,10 +2796,10 @@ index 2c0492c713..2cc294a1b2 100644 sources = [ diff --git a/third_party/blink/renderer/modules/mediastream/web_media_player_ms_compositor.cc b/third_party/blink/renderer/modules/mediastream/web_media_player_ms_compositor.cc -index 9e280bf285..1140223159 100644 +index 54fae6c427..f2a9e4771a 100644 --- a/third_party/blink/renderer/modules/mediastream/web_media_player_ms_compositor.cc +++ b/third_party/blink/renderer/modules/mediastream/web_media_player_ms_compositor.cc -@@ -41,6 +41,11 @@ +@@ -42,6 +42,11 @@ #include "third_party/libyuv/include/libyuv/video_common.h" #include "third_party/skia/include/core/SkSurface.h" @@ -2749,10 +2808,10 @@ index 9e280bf285..1140223159 100644 +#pragma clang diagnostic ignored "-Wshorten-64-to-32" +#endif + - namespace WTF { + namespace blink { template -@@ -1000,3 +1005,7 @@ WebMediaPlayerMSCompositor::GetLastPresentedFrameMetadata() { +@@ -1016,3 +1021,7 @@ WebMediaPlayerMSCompositor::GetLastPresentedFrameMetadata() { } } // namespace blink @@ -2761,20 +2820,20 @@ index 9e280bf285..1140223159 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/modules/ml/webnn/ml_graph.cc b/third_party/blink/renderer/modules/ml/webnn/ml_graph.cc -index 672cefb116..ac30f46617 100644 +index 37aed5ec98..592fc55b21 100644 --- a/third_party/blink/renderer/modules/ml/webnn/ml_graph.cc +++ b/third_party/blink/renderer/modules/ml/webnn/ml_graph.cc -@@ -229,3 +229,5 @@ void MLGraph::OnConnectionError() { +@@ -236,3 +236,5 @@ void MLGraph::OnConnectionError() { } } // namespace blink + +#undef THROW_AND_RETURN_IF_ERROR diff --git a/third_party/blink/renderer/modules/ml/webnn/ml_graph_builder.cc b/third_party/blink/renderer/modules/ml/webnn/ml_graph_builder.cc -index 00bb3955c0..4137add21f 100644 +index 172f32c333..49fd2f7826 100644 --- a/third_party/blink/renderer/modules/ml/webnn/ml_graph_builder.cc +++ b/third_party/blink/renderer/modules/ml/webnn/ml_graph_builder.cc -@@ -79,6 +79,11 @@ +@@ -82,6 +82,11 @@ #include "third_party/blink/renderer/platform/heap/persistent.h" #include "third_party/blink/renderer/platform/wtf/functional.h" @@ -2786,7 +2845,7 @@ index 00bb3955c0..4137add21f 100644 namespace blink { namespace blink_mojom = webnn::mojom::blink; -@@ -3398,3 +3403,9 @@ base::expected MLGraphBuilder::ValidateInputs( +@@ -3478,3 +3483,9 @@ base::expected MLGraphBuilder::ValidateInputs( } } // namespace blink @@ -2837,10 +2896,10 @@ index 8042183668..7197e7eb6a 100644 + +#undef AllowedToUsePaymentFeatures diff --git a/third_party/blink/renderer/modules/peerconnection/BUILD.gn b/third_party/blink/renderer/modules/peerconnection/BUILD.gn -index 31913748ae..755062f0a2 100644 +index d8ef825295..6ab6e5aa55 100644 --- a/third_party/blink/renderer/modules/peerconnection/BUILD.gn +++ b/third_party/blink/renderer/modules/peerconnection/BUILD.gn -@@ -180,6 +180,12 @@ blink_modules_sources("peerconnection") { +@@ -168,6 +168,12 @@ blink_modules_sources("peerconnection") { "webrtc_video_perf_reporter.h", ] @@ -2853,7 +2912,7 @@ index 31913748ae..755062f0a2 100644 public_deps = [ "//third_party/webrtc_overrides:webrtc_component" ] deps = [ "//build:chromecast_buildflags", -@@ -197,7 +203,7 @@ blink_modules_sources("peerconnection") { +@@ -187,7 +193,7 @@ blink_modules_sources("peerconnection") { [ "//third_party/blink/renderer/modules/mediastream" ] } @@ -2873,11 +2932,11 @@ index 2e4b14e097..ab20f6efde 100644 + jumbo_excluded_sources = [ "permission_utils.cc" ] } diff --git a/third_party/blink/renderer/modules/shared_storage/shared_storage_worklet.cc b/third_party/blink/renderer/modules/shared_storage/shared_storage_worklet.cc -index ef0e447d5b..85e41d2a88 100644 +index aeb8343ed4..5ac248c26c 100644 --- a/third_party/blink/renderer/modules/shared_storage/shared_storage_worklet.cc +++ b/third_party/blink/renderer/modules/shared_storage/shared_storage_worklet.cc -@@ -33,6 +33,11 @@ - #include "third_party/blink/renderer/platform/wtf/casting.h" +@@ -34,6 +34,11 @@ + #include "third_party/blink/renderer/platform/wtf/text/strcat.h" #include "url/origin.h" +#ifdef __clang__ @@ -2888,31 +2947,7 @@ index ef0e447d5b..85e41d2a88 100644 namespace blink { namespace { -@@ -788,3 +793,7 @@ void SharedStorageWorklet::RunInternal( - } - - } // namespace blink -+ -+#ifdef __clang__ -+#pragma clang diagnostic pop -+#endif -diff --git a/third_party/blink/renderer/modules/speech/speech_recognition_phrase_list.cc b/third_party/blink/renderer/modules/speech/speech_recognition_phrase_list.cc -index 917a677024..4396fda409 100644 ---- a/third_party/blink/renderer/modules/speech/speech_recognition_phrase_list.cc -+++ b/third_party/blink/renderer/modules/speech/speech_recognition_phrase_list.cc -@@ -4,6 +4,11 @@ - - #include "third_party/blink/renderer/modules/speech/speech_recognition_phrase_list.h" - -+#ifdef __clang__ -+#pragma clang diagnostic push -+#pragma clang diagnostic ignored "-Wshorten-64-to-32" -+#endif -+ - namespace blink { - - SpeechRecognitionPhraseList* SpeechRecognitionPhraseList::Create( -@@ -43,3 +48,7 @@ void SpeechRecognitionPhraseList::removeItem(wtf_size_t index, +@@ -789,3 +794,7 @@ void SharedStorageWorklet::RunInternal( } } // namespace blink @@ -2955,10 +2990,10 @@ index ebeeafcfbe..cc7b4c474e 100644 + +#undef PassKey diff --git a/third_party/blink/renderer/modules/storage_access/storage_access_handle.cc b/third_party/blink/renderer/modules/storage_access/storage_access_handle.cc -index e5c338fe4d..7a48419157 100644 +index e3ef922899..e57913d578 100644 --- a/third_party/blink/renderer/modules/storage_access/storage_access_handle.cc +++ b/third_party/blink/renderer/modules/storage_access/storage_access_handle.cc -@@ -17,7 +17,9 @@ +@@ -18,7 +18,9 @@ namespace blink { @@ -2969,19 +3004,19 @@ index e5c338fe4d..7a48419157 100644 // static const char StorageAccessHandle::kSupplementName[] = "StorageAccessHandle"; -@@ -472,3 +474,5 @@ ExecutionContext* ExecutionContextFromV8Wrappable( +@@ -479,3 +481,5 @@ ExecutionContext* ExecutionContextFromV8Wrappable( } // namespace bindings } // namespace blink + +#undef PassKey diff --git a/third_party/blink/renderer/modules/webaudio/analyser_handler.cc b/third_party/blink/renderer/modules/webaudio/analyser_handler.cc -index 495a64fd10..57daf3b422 100644 +index 0c16348a2c..6a313c5c2d 100644 --- a/third_party/blink/renderer/modules/webaudio/analyser_handler.cc +++ b/third_party/blink/renderer/modules/webaudio/analyser_handler.cc -@@ -10,6 +10,9 @@ - #include "third_party/blink/renderer/platform/bindings/exception_messages.h" +@@ -11,6 +11,9 @@ #include "third_party/blink/renderer/platform/bindings/exception_state.h" + #include "third_party/blink/renderer/platform/wtf/text/strcat.h" +#define kDefaultNumberOfInputChannels kDefaultNumberOfInputChannels_AnalyserHandler +#define kDefaultNumberOfOutputChannels kDefaultNumberOfOutputChannels_AnalyserHandler @@ -2989,7 +3024,7 @@ index 495a64fd10..57daf3b422 100644 namespace blink { namespace { -@@ -216,3 +219,6 @@ void AnalyserHandler::CheckNumberOfChannelsForInput(AudioNodeInput* input) { +@@ -217,3 +220,6 @@ void AnalyserHandler::CheckNumberOfChannelsForInput(AudioNodeInput* input) { } } // namespace blink @@ -2997,7 +3032,7 @@ index 495a64fd10..57daf3b422 100644 +#undef kDefaultNumberOfInputChannels +#undef kDefaultNumberOfOutputChannels diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer_source_handler.cc b/third_party/blink/renderer/modules/webaudio/audio_buffer_source_handler.cc -index 0c8595e3f7..63f051dc1d 100644 +index 80c1218d75..ae5a4c6913 100644 --- a/third_party/blink/renderer/modules/webaudio/audio_buffer_source_handler.cc +++ b/third_party/blink/renderer/modules/webaudio/audio_buffer_source_handler.cc @@ -20,6 +20,8 @@ @@ -3035,10 +3070,10 @@ index b01409155b..3441b334c6 100644 + +#undef kDefaultDetuneValue diff --git a/third_party/blink/renderer/modules/webaudio/audio_worklet_handler.cc b/third_party/blink/renderer/modules/webaudio/audio_worklet_handler.cc -index 22689fc28e..4306bae394 100644 +index a414dcf6d0..0f294fa887 100644 --- a/third_party/blink/renderer/modules/webaudio/audio_worklet_handler.cc +++ b/third_party/blink/renderer/modules/webaudio/audio_worklet_handler.cc -@@ -33,6 +33,8 @@ +@@ -34,6 +34,8 @@ #include "third_party/blink/renderer/platform/wtf/cross_thread_copier_base.h" #include "third_party/blink/renderer/platform/wtf/cross_thread_functional.h" @@ -3047,17 +3082,17 @@ index 22689fc28e..4306bae394 100644 namespace blink { namespace { -@@ -299,3 +301,5 @@ void AudioWorkletHandler::MarkProcessorInactiveOnMainThread() { +@@ -291,3 +293,5 @@ void AudioWorkletHandler::MarkProcessorInactiveOnMainThread() { } } // namespace blink + +#undef kDefaultNumberOfOutputChannels diff --git a/third_party/blink/renderer/modules/webaudio/biquad_filter_node.cc b/third_party/blink/renderer/modules/webaudio/biquad_filter_node.cc -index d86c34e94a..ecfb9e58b8 100644 +index f640e4e954..5eeb4ac4fa 100644 --- a/third_party/blink/renderer/modules/webaudio/biquad_filter_node.cc +++ b/third_party/blink/renderer/modules/webaudio/biquad_filter_node.cc -@@ -35,6 +35,8 @@ +@@ -34,6 +34,8 @@ #include "third_party/blink/renderer/platform/bindings/exception_messages.h" #include "third_party/blink/renderer/platform/bindings/exception_state.h" @@ -3066,7 +3101,7 @@ index d86c34e94a..ecfb9e58b8 100644 namespace blink { namespace { -@@ -261,3 +263,5 @@ void BiquadFilterNode::ReportWillBeDestroyed() { +@@ -240,3 +242,5 @@ void BiquadFilterNode::ReportWillBeDestroyed() { } } // namespace blink @@ -3092,12 +3127,12 @@ index a428860ba8..be05124769 100644 + +#undef kNumberOfOutputChannels diff --git a/third_party/blink/renderer/modules/webaudio/convolver_handler.cc b/third_party/blink/renderer/modules/webaudio/convolver_handler.cc -index 33c40b3b98..83b296871f 100644 +index 27ccc8f158..58f2749f0e 100644 --- a/third_party/blink/renderer/modules/webaudio/convolver_handler.cc +++ b/third_party/blink/renderer/modules/webaudio/convolver_handler.cc -@@ -17,6 +17,9 @@ - #include "third_party/blink/renderer/platform/bindings/exception_messages.h" +@@ -18,6 +18,9 @@ #include "third_party/blink/renderer/platform/bindings/exception_state.h" + #include "third_party/blink/renderer/platform/wtf/text/strcat.h" +#define kDefaultNumberOfInputChannels kDefaultNumberOfInputChannels_ConvolverHandler +#define kDefaultNumberOfOutputChannels kDefaultNumberOfOutputChannels_ConvolverHandler @@ -3105,7 +3140,7 @@ index 33c40b3b98..83b296871f 100644 namespace blink { namespace { -@@ -323,3 +326,6 @@ void ConvolverHandler::CheckNumberOfChannelsForInput(AudioNodeInput* input) { +@@ -322,3 +325,6 @@ void ConvolverHandler::CheckNumberOfChannelsForInput(AudioNodeInput* input) { } } // namespace blink @@ -3151,49 +3186,49 @@ index 5ae07797e7..5c9ba48b00 100644 + +#undef kNumberOfOutputChannels diff --git a/third_party/blink/renderer/modules/webaudio/iir_filter_handler.cc b/third_party/blink/renderer/modules/webaudio/iir_filter_handler.cc -index d2205c3bb7..dbf918a387 100644 +index 34168939d2..398653f61e 100644 --- a/third_party/blink/renderer/modules/webaudio/iir_filter_handler.cc +++ b/third_party/blink/renderer/modules/webaudio/iir_filter_handler.cc -@@ -18,6 +18,8 @@ - #include "third_party/blink/renderer/platform/wtf/cross_thread_copier_base.h" +@@ -19,6 +19,8 @@ #include "third_party/blink/renderer/platform/wtf/cross_thread_functional.h" + #include "third_party/blink/renderer/platform/wtf/text/strcat.h" +#define kDefaultNumberOfOutputChannels kDefaultNumberOfOutputChannels_IIRFilterHandler + namespace blink { namespace { -@@ -271,3 +273,5 @@ void IIRFilterHandler::NotifyBadState() const { +@@ -272,3 +274,5 @@ void IIRFilterHandler::NotifyBadState() const { } } // namespace blink + +#undef kDefaultNumberOfOutputChannels diff --git a/third_party/blink/renderer/modules/webaudio/media_element_audio_source_handler.cc b/third_party/blink/renderer/modules/webaudio/media_element_audio_source_handler.cc -index 3625f3160d..48ea3e6b90 100644 +index e303986f1e..d6ba22e47f 100644 --- a/third_party/blink/renderer/modules/webaudio/media_element_audio_source_handler.cc +++ b/third_party/blink/renderer/modules/webaudio/media_element_audio_source_handler.cc -@@ -21,6 +21,8 @@ - #include "third_party/blink/renderer/platform/weborigin/security_origin.h" +@@ -22,6 +22,8 @@ #include "third_party/blink/renderer/platform/wtf/cross_thread_functional.h" + #include "third_party/blink/renderer/platform/wtf/text/strcat.h" +#define kDefaultNumberOfOutputChannels kDefaultNumberOfOutputChannels_MediaElementAudioSourceHandlerLocker + namespace blink { namespace { -@@ -233,3 +235,5 @@ void MediaElementAudioSourceHandler::unlock() { +@@ -234,3 +236,5 @@ void MediaElementAudioSourceHandler::unlock() { } } // namespace blink + +#undef kDefaultNumberOfOutputChannels diff --git a/third_party/blink/renderer/modules/webaudio/media_stream_audio_destination_node.cc b/third_party/blink/renderer/modules/webaudio/media_stream_audio_destination_node.cc -index dc1b514991..ce4181f703 100644 +index e120777cd2..0e29570d72 100644 --- a/third_party/blink/renderer/modules/webaudio/media_stream_audio_destination_node.cc +++ b/third_party/blink/renderer/modules/webaudio/media_stream_audio_destination_node.cc -@@ -38,6 +38,8 @@ - #include "third_party/blink/renderer/platform/scheduler/public/main_thread.h" +@@ -40,6 +40,8 @@ + #include "third_party/blink/renderer/platform/wtf/text/strcat.h" #include "third_party/blink/renderer/platform/wtf/uuid.h" +#define kDefaultNumberOfChannels kDefaultNumberOfChannels_MediaStreamAudioDestinationNode @@ -3201,7 +3236,7 @@ index dc1b514991..ce4181f703 100644 namespace blink { namespace { -@@ -172,3 +174,5 @@ void MediaStreamAudioDestinationNode::SendLogMessage( +@@ -175,3 +177,5 @@ void MediaStreamAudioDestinationNode::SendLogMessage( } } // namespace blink @@ -3248,10 +3283,10 @@ index bd2958443a..04d7121ceb 100644 +#undef ref_count +#undef EnsureSharedBackingThread diff --git a/third_party/blink/renderer/modules/webaudio/oscillator_handler.cc b/third_party/blink/renderer/modules/webaudio/oscillator_handler.cc -index 66badc9ceb..92bbc5aef9 100644 +index 09d6a766ca..6192e46a6f 100644 --- a/third_party/blink/renderer/modules/webaudio/oscillator_handler.cc +++ b/third_party/blink/renderer/modules/webaudio/oscillator_handler.cc -@@ -28,6 +28,8 @@ +@@ -29,6 +29,8 @@ #include "third_party/blink/renderer/platform/wtf/math_extras.h" #include "third_party/blink/renderer/platform/wtf/std_lib_extras.h" @@ -3260,14 +3295,14 @@ index 66badc9ceb..92bbc5aef9 100644 namespace blink { namespace { -@@ -802,3 +804,5 @@ void OscillatorHandler::HandleStoppableSourceNode() { +@@ -813,3 +815,5 @@ void OscillatorHandler::HandleStoppableSourceNode() { } } // namespace blink + +#undef kNumberOfOutputChannels diff --git a/third_party/blink/renderer/modules/webaudio/panner_handler.cc b/third_party/blink/renderer/modules/webaudio/panner_handler.cc -index ece412ac9a..5b10cc2b9a 100644 +index 4418eb461b..097b845df9 100644 --- a/third_party/blink/renderer/modules/webaudio/panner_handler.cc +++ b/third_party/blink/renderer/modules/webaudio/panner_handler.cc @@ -20,6 +20,9 @@ @@ -3280,7 +3315,7 @@ index ece412ac9a..5b10cc2b9a 100644 namespace blink { namespace { -@@ -796,3 +799,6 @@ bool PannerHandler::RequiresTailProcessing() const { +@@ -801,3 +804,6 @@ bool PannerHandler::RequiresTailProcessing() const { } } // namespace blink @@ -3288,7 +3323,7 @@ index ece412ac9a..5b10cc2b9a 100644 +#undef kMinimumOutputChannels +#undef kMaximumOutputChannels diff --git a/third_party/blink/renderer/modules/webaudio/realtime_audio_destination_handler.cc b/third_party/blink/renderer/modules/webaudio/realtime_audio_destination_handler.cc -index 36da21ad9e..9d3535d5d2 100644 +index a4d8931880..af6831ca4a 100644 --- a/third_party/blink/renderer/modules/webaudio/realtime_audio_destination_handler.cc +++ b/third_party/blink/renderer/modules/webaudio/realtime_audio_destination_handler.cc @@ -27,6 +27,8 @@ @@ -3300,7 +3335,7 @@ index 36da21ad9e..9d3535d5d2 100644 namespace blink { namespace { -@@ -546,3 +548,5 @@ void RealtimeAudioDestinationHandler::SendLogMessage( +@@ -555,3 +557,5 @@ void RealtimeAudioDestinationHandler::SendLogMessage( } } // namespace blink @@ -3349,7 +3384,7 @@ index 775dceb62d..8ad858dd72 100644 +#undef kMinimumOutputChannels +#undef kMaximumOutputChannels diff --git a/third_party/blink/renderer/modules/webcodecs/BUILD.gn b/third_party/blink/renderer/modules/webcodecs/BUILD.gn -index d97a4c6c3e..78b371fffd 100644 +index d3cac25f9b..ac00064754 100644 --- a/third_party/blink/renderer/modules/webcodecs/BUILD.gn +++ b/third_party/blink/renderer/modules/webcodecs/BUILD.gn @@ -98,6 +98,11 @@ blink_modules_sources("webcodecs") { @@ -3365,7 +3400,7 @@ index d97a4c6c3e..78b371fffd 100644 "//media", "//media/mojo:buildflags", diff --git a/third_party/blink/renderer/modules/webcodecs/audio_encoder.cc b/third_party/blink/renderer/modules/webcodecs/audio_encoder.cc -index c150f50145..a1ec4e0a8b 100644 +index 686b607cb5..21cb7765e1 100644 --- a/third_party/blink/renderer/modules/webcodecs/audio_encoder.cc +++ b/third_party/blink/renderer/modules/webcodecs/audio_encoder.cc @@ -40,6 +40,8 @@ @@ -3377,19 +3412,19 @@ index c150f50145..a1ec4e0a8b 100644 namespace blink { namespace { -@@ -687,3 +689,5 @@ DOMException* AudioEncoder::MakeEncodingError(std::string error_msg, +@@ -697,3 +699,5 @@ DOMException* AudioEncoder::MakeEncodingError(std::string error_msg, } } // namespace blink + +#undef kCategory diff --git a/third_party/blink/renderer/modules/webcodecs/background_readback.cc b/third_party/blink/renderer/modules/webcodecs/background_readback.cc -index b378f8623c..42eb4920f4 100644 +index bcf5cda440..c72cb33881 100644 --- a/third_party/blink/renderer/modules/webcodecs/background_readback.cc +++ b/third_party/blink/renderer/modules/webcodecs/background_readback.cc -@@ -29,6 +29,11 @@ - #include "third_party/blink/renderer/platform/wtf/functional.h" +@@ -30,6 +30,11 @@ #include "third_party/blink/renderer/platform/wtf/thread_safe_ref_counted.h" + #include "third_party/perfetto/include/perfetto/tracing/track.h" +#ifdef __clang__ +#pragma clang diagnostic push @@ -3399,7 +3434,7 @@ index b378f8623c..42eb4920f4 100644 namespace { bool CanUseRgbReadback(media::VideoFrame& frame) { return media::IsRGB(frame.format()) && frame.HasSharedImage(); -@@ -397,3 +402,7 @@ bool SyncReadbackThread::ReadbackToBuffer( +@@ -388,3 +393,7 @@ bool SyncReadbackThread::ReadbackToBuffer( } } // namespace blink @@ -3408,12 +3443,12 @@ index b378f8623c..42eb4920f4 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/modules/webcodecs/decoder_template.cc b/third_party/blink/renderer/modules/webcodecs/decoder_template.cc -index d0b49d5558..f52c08fdb7 100644 +index d7c8f8c6e5..32e1f690ff 100644 --- a/third_party/blink/renderer/modules/webcodecs/decoder_template.cc +++ b/third_party/blink/renderer/modules/webcodecs/decoder_template.cc -@@ -45,6 +45,9 @@ - #include "third_party/blink/renderer/platform/wtf/cross_thread_functional.h" +@@ -46,6 +46,9 @@ #include "third_party/blink/renderer/platform/wtf/functional.h" + #include "third_party/perfetto/include/perfetto/tracing/track.h" +#define kCategory kCategory_DecoderTemplate +#define g_sequence_num_for_counters g_sequence_num_for_counters_decoder_template @@ -3421,7 +3456,7 @@ index d0b49d5558..f52c08fdb7 100644 namespace blink { namespace { -@@ -937,3 +940,6 @@ template class DecoderTemplate; +@@ -935,3 +938,6 @@ template class DecoderTemplate; template class DecoderTemplate; } // namespace blink @@ -3429,7 +3464,7 @@ index d0b49d5558..f52c08fdb7 100644 +#undef kCategory +#undef g_sequence_num_for_counters diff --git a/third_party/blink/renderer/modules/webcodecs/encoder_base.cc b/third_party/blink/renderer/modules/webcodecs/encoder_base.cc -index c2df4632aa..2f5de5033e 100644 +index 3e5d6b936c..91aeb2c9d5 100644 --- a/third_party/blink/renderer/modules/webcodecs/encoder_base.cc +++ b/third_party/blink/renderer/modules/webcodecs/encoder_base.cc @@ -41,6 +41,9 @@ @@ -3450,7 +3485,7 @@ index c2df4632aa..2f5de5033e 100644 +#undef kCategory +#undef g_sequence_num_for_counters diff --git a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc -index 2c3e4f9cbb..3172ea8c78 100644 +index 7c42a1de1b..2ca0791a20 100644 --- a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc @@ -40,6 +40,11 @@ @@ -3477,10 +3512,10 @@ index 2c3e4f9cbb..3172ea8c78 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -index 4c25f00f12..e0fe4218e0 100644 +index 2f853871f4..9ea7764cf2 100644 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -149,6 +149,11 @@ +@@ -156,6 +156,13 @@ #include "third_party/skia/include/core/SkImage.h" #include "ui/gfx/geometry/size.h" @@ -3488,11 +3523,13 @@ index 4c25f00f12..e0fe4218e0 100644 +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wshorten-64-to-32" +#endif ++ ++#define GetErrorString GetErrorString_WebGLRenderingContextBase + // Populates parameters from texImage2D except for border, width, height, and // depth (which are not present for all texImage2D functions). #define POPULATE_TEX_IMAGE_2D_PARAMS(params, src_type) \ -@@ -9150,3 +9155,10 @@ bool WebGLRenderingContextBase::checkProgramCompletionQueryAvailable( +@@ -9390,3 +9397,12 @@ bool WebGLRenderingContextBase::checkProgramCompletionQueryAvailable( return false; } } // namespace blink @@ -3500,14 +3537,16 @@ index 4c25f00f12..e0fe4218e0 100644 +#undef POPULATE_TEX_IMAGE_2D_PARAMS +#undef POPULATE_TEX_SUB_IMAGE_2D_PARAMS + ++#undef GetErrorString ++ +#ifdef __clang__ +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/modules/webgpu/BUILD.gn b/third_party/blink/renderer/modules/webgpu/BUILD.gn -index 95caaa2f62..72f93315ae 100644 +index 90b629c559..40db715663 100644 --- a/third_party/blink/renderer/modules/webgpu/BUILD.gn +++ b/third_party/blink/renderer/modules/webgpu/BUILD.gn -@@ -105,6 +105,8 @@ blink_modules_sources("webgpu") { +@@ -106,6 +106,8 @@ blink_modules_sources("webgpu") { "wgsl_language_features.cc", "wgsl_language_features.h", ] @@ -3542,10 +3581,10 @@ index e5865de824..70e678bee6 100644 sources = [ "bidirectional_stream_test.cc", diff --git a/third_party/blink/renderer/modules/xr/xr_gpu_binding.cc b/third_party/blink/renderer/modules/xr/xr_gpu_binding.cc -index 0e5be455d1..7bd4f45ee2 100644 +index ef1e615934..d4fccf6371 100644 --- a/third_party/blink/renderer/modules/xr/xr_gpu_binding.cc +++ b/third_party/blink/renderer/modules/xr/xr_gpu_binding.cc -@@ -26,6 +26,13 @@ +@@ -27,6 +27,13 @@ #include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/geometry/size_f.h" @@ -3559,7 +3598,7 @@ index 0e5be455d1..7bd4f45ee2 100644 namespace blink { namespace { -@@ -279,3 +286,9 @@ void XRGPUBinding::Trace(Visitor* visitor) const { +@@ -285,3 +292,9 @@ void XRGPUBinding::Trace(Visitor* visitor) const { } } // namespace blink @@ -3570,10 +3609,10 @@ index 0e5be455d1..7bd4f45ee2 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/modules/xr/xr_webgl_binding.cc b/third_party/blink/renderer/modules/xr/xr_webgl_binding.cc -index debb5ef133..7d3969dc52 100644 +index 7347c91f80..c42e5d9b8a 100644 --- a/third_party/blink/renderer/modules/xr/xr_webgl_binding.cc +++ b/third_party/blink/renderer/modules/xr/xr_webgl_binding.cc -@@ -32,6 +32,13 @@ +@@ -40,6 +40,13 @@ #include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/geometry/size_f.h" @@ -3587,7 +3626,7 @@ index debb5ef133..7d3969dc52 100644 namespace blink { namespace { -@@ -596,3 +603,9 @@ void XRWebGLBinding::Trace(Visitor* visitor) const { +@@ -810,3 +817,9 @@ void XRWebGLBinding::Trace(Visitor* visitor) const { } } // namespace blink @@ -3622,7 +3661,7 @@ index e2287f38b2..ddc53cbda4 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn -index e8db555306..25936c9856 100644 +index 589dd18b99..d65ab808e7 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn @@ -7,6 +7,7 @@ import("//build/buildflag_header.gni") @@ -3633,7 +3672,7 @@ index e8db555306..25936c9856 100644 import("//build/config/ui.gni") import("//build/nocompile.gni") import("//media/media_options.gni") -@@ -329,7 +330,7 @@ source_set("image_headers") { +@@ -346,7 +347,7 @@ source_set("image_headers") { ] } @@ -3642,7 +3681,7 @@ index e8db555306..25936c9856 100644 visibility = [] # Allow re-assignment of list. visibility = [ "//third_party/blink/*", -@@ -1682,6 +1683,23 @@ component("platform") { +@@ -1702,6 +1703,23 @@ component("platform") { ] } @@ -3666,7 +3705,7 @@ index e8db555306..25936c9856 100644 if (is_mac) { sources += [ "audio/mac/fft_frame_mac.cc", -@@ -1966,7 +1984,7 @@ component("platform") { +@@ -1986,7 +2004,7 @@ component("platform") { configs += blink_symbols_config } @@ -3675,7 +3714,7 @@ index e8db555306..25936c9856 100644 visibility += [ "//third_party/blink/*", "//tools/privacy_budget/font_indexer:*", -@@ -2161,7 +2179,7 @@ if (enable_nocompile_tests) { +@@ -2180,7 +2198,7 @@ if (enable_nocompile_tests) { } } @@ -3684,7 +3723,7 @@ index e8db555306..25936c9856 100644 visibility = [] # Allow re-assignment of list. visibility = [ "*" ] testonly = true -@@ -2667,7 +2685,7 @@ test("blink_fuzzer_unittests") { +@@ -2695,7 +2713,7 @@ test("blink_fuzzer_unittests") { # This source set is used for fuzzers that need an environment similar to unit # tests. @@ -3693,7 +3732,7 @@ index e8db555306..25936c9856 100644 testonly = true visibility = [] # Allow re-assignment of list. visibility = [ "*" ] -@@ -2994,7 +3012,7 @@ blink_text_codec_fuzzer("WINDOWS_1252") { +@@ -3021,7 +3039,7 @@ blink_text_codec_fuzzer("WINDOWS_1252") { # NOTE: These are legacy unit tests and tests that require a Platform # object. Do not add more unless the test requires a Platform object. # These tests are a part of the blink_unittests binary. @@ -3746,10 +3785,10 @@ index a6c3d89b1c..b8c377ef80 100644 + +#undef kInterpolationFactor diff --git a/third_party/blink/renderer/platform/audio/hrtf_elevation.cc b/third_party/blink/renderer/platform/audio/hrtf_elevation.cc -index 11aee4cc28..a880f6f9db 100644 +index 0e2a1c4a03..3d776f6df9 100644 --- a/third_party/blink/renderer/platform/audio/hrtf_elevation.cc +++ b/third_party/blink/renderer/platform/audio/hrtf_elevation.cc -@@ -47,6 +47,8 @@ +@@ -43,6 +43,8 @@ #include "third_party/blink/renderer/platform/audio/hrtf_panner.h" #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" @@ -3758,7 +3797,7 @@ index 11aee4cc28..a880f6f9db 100644 namespace blink { namespace { -@@ -371,3 +373,5 @@ void HRTFElevation::GetKernelsFromAzimuth(double azimuth_blend, +@@ -367,3 +369,5 @@ void HRTFElevation::GetKernelsFromAzimuth(double azimuth_blend, } } // namespace blink @@ -3789,7 +3828,7 @@ index 44911ccdbb..a2996f2cee 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/platform/blob/BUILD.gn b/third_party/blink/renderer/platform/blob/BUILD.gn -index 5a8ca53de8..55f8db7ec6 100644 +index 53a9123fab..c76e8f1e34 100644 --- a/third_party/blink/renderer/platform/blob/BUILD.gn +++ b/third_party/blink/renderer/platform/blob/BUILD.gn @@ -2,6 +2,7 @@ @@ -3828,7 +3867,7 @@ index 5a8ca53de8..55f8db7ec6 100644 # blink_platform_unittests and blink_unittests can use. visibility = [ "//third_party/blink/renderer/platform:test_support" ] diff --git a/third_party/blink/renderer/platform/fonts/font_cache_key.h b/third_party/blink/renderer/platform/fonts/font_cache_key.h -index 3ba4b2cebe..0fbd138d17 100644 +index a4ebcfdb61..008809a428 100644 --- a/third_party/blink/renderer/platform/fonts/font_cache_key.h +++ b/third_party/blink/renderer/platform/fonts/font_cache_key.h @@ -46,6 +46,11 @@ @@ -3843,7 +3882,7 @@ index 3ba4b2cebe..0fbd138d17 100644 namespace blink { // Multiplying the floating point size by 100 gives two decimal point -@@ -185,4 +190,8 @@ struct std::hash { +@@ -178,4 +183,8 @@ struct std::hash { } }; @@ -3853,7 +3892,7 @@ index 3ba4b2cebe..0fbd138d17 100644 + #endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_FONTS_FONT_CACHE_KEY_H_ diff --git a/third_party/blink/renderer/platform/fonts/font_face_creation_params.h b/third_party/blink/renderer/platform/fonts/font_face_creation_params.h -index 62d50cba70..f213fc93a1 100644 +index 70e191c695..6dd2c223f8 100644 --- a/third_party/blink/renderer/platform/fonts/font_face_creation_params.h +++ b/third_party/blink/renderer/platform/fonts/font_face_creation_params.h @@ -38,6 +38,11 @@ @@ -3921,7 +3960,7 @@ index 1f8f9e2fca..cbf52d83f4 100644 + +#undef HarfBuzzUnitsToFloat diff --git a/third_party/blink/renderer/platform/fonts/opentype/open_type_math_support.cc b/third_party/blink/renderer/platform/fonts/opentype/open_type_math_support.cc -index 2dbf0d39e7..12073d5cdd 100644 +index 1f5a4f4a6a..91e8503570 100644 --- a/third_party/blink/renderer/platform/fonts/opentype/open_type_math_support.cc +++ b/third_party/blink/renderer/platform/fonts/opentype/open_type_math_support.cc @@ -15,6 +15,8 @@ @@ -3964,10 +4003,10 @@ index 44db6ba2fc..ed70f41b3f 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper.cc b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper.cc -index fdd6e695ab..539b6d1f6b 100644 +index 5142d226e6..260c79ff98 100644 --- a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper.cc +++ b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper.cc -@@ -65,6 +65,8 @@ +@@ -66,6 +66,8 @@ #include "third_party/blink/renderer/platform/wtf/text/string_builder.h" #include "third_party/blink/renderer/platform/wtf/text/unicode.h" @@ -3976,17 +4015,17 @@ index fdd6e695ab..539b6d1f6b 100644 namespace blink { namespace { -@@ -1246,3 +1248,5 @@ void HarfBuzzShaper::GetGlyphData(const SimpleFontData& font_data, +@@ -1288,3 +1290,5 @@ void HarfBuzzShaper::GetGlyphData(const SimpleFontData& font_data, } } // namespace blink + +#undef HarfBuzzPositionToFloat diff --git a/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc b/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc -index 67520f001f..ebfefa5756 100644 +index b313bec964..1cd31f9531 100644 --- a/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc +++ b/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc -@@ -53,6 +53,8 @@ +@@ -52,6 +52,8 @@ #include "third_party/blink/renderer/platform/wtf/text/string_builder.h" #include "ui/gfx/geometry/skia_conversions.h" @@ -3995,40 +4034,34 @@ index 67520f001f..ebfefa5756 100644 namespace blink { constexpr unsigned HarfBuzzRunGlyphData::kMaxCharacterIndex; -@@ -2498,3 +2500,5 @@ gfx::RectF ShapeResult::ComputeInkBounds() const { +@@ -2494,3 +2496,5 @@ gfx::RectF ShapeResult::ComputeInkBounds() const { } } // namespace blink + +#undef HarfBuzzPositionToFloat -diff --git a/third_party/blink/renderer/platform/graphics/compositing/pending_layer.cc b/third_party/blink/renderer/platform/graphics/compositing/pending_layer.cc -index 4cfeca0e1d..55025892d6 100644 ---- a/third_party/blink/renderer/platform/graphics/compositing/pending_layer.cc -+++ b/third_party/blink/renderer/platform/graphics/compositing/pending_layer.cc -@@ -101,7 +101,7 @@ std::pair PendingLayer::Bounds() const { - // if scale rounding on the render surface doesn't apply). - gfx::RectF bounds_with_ceiled_size(bounds_.origin(), gfx::SizeF(ceiled_size)); - gfx::Rect enclosing_bounds = gfx::ToEnclosingRect(bounds_); -- if (base::FeatureList::IsEnabled(features::kRenderSurfacePixelAlignment) && -+ if (base::FeatureList::IsEnabled(::features::kRenderSurfacePixelAlignment) && - rect_known_to_be_opaque_.Contains(bounds_with_ceiled_size) && - !rect_known_to_be_opaque_.Contains(gfx::RectF(enclosing_bounds))) { - return {bounds_.OffsetFromOrigin(), ceiled_size}; -diff --git a/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc b/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc -index ef6050836a..7e18151d64 100644 ---- a/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc -+++ b/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc -@@ -477,7 +477,7 @@ int PropertyTreeManager::EnsureCompositorTransformNode( - } +diff --git a/third_party/blink/renderer/platform/geometry/layout_unit.cc b/third_party/blink/renderer/platform/geometry/layout_unit.cc +index 9d3b36ef25..ffbf29ecb8 100644 +--- a/third_party/blink/renderer/platform/geometry/layout_unit.cc ++++ b/third_party/blink/renderer/platform/geometry/layout_unit.cc +@@ -57,3 +57,5 @@ INSTANTIATE(16, int32_t); + INSTANTIATE(16, int64_t); - if (base::FeatureList::IsEnabled( -- features::kDynamicSafeAreaInsetsSupportedByCC)) { -+ ::features::kDynamicSafeAreaInsetsSupportedByCC)) { - if (transform_node.IsAffectedBySafeAreaBottom()) { - compositor_node.moved_by_safe_area_bottom = true; - transform_tree_.AddNodeAffectedBySafeAreaInsetBottom(id); + } // namespace blink ++ ++#undef INSTANTIATE +diff --git a/third_party/blink/renderer/platform/geometry/physical_offset.cc b/third_party/blink/renderer/platform/geometry/physical_offset.cc +index f3101af87e..2e8455a011 100644 +--- a/third_party/blink/renderer/platform/geometry/physical_offset.cc ++++ b/third_party/blink/renderer/platform/geometry/physical_offset.cc +@@ -29,3 +29,5 @@ std::ostream& operator<<(std::ostream& os, + INSTANTIATE(LayoutUnit); + + } // namespace blink ++ ++#undef INSTANTIATE diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image_to_video_frame_copier.cc b/third_party/blink/renderer/platform/graphics/static_bitmap_image_to_video_frame_copier.cc -index 339c79e303..cad545c19b 100644 +index 677e56d718..ff89efd35f 100644 --- a/third_party/blink/renderer/platform/graphics/static_bitmap_image_to_video_frame_copier.cc +++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image_to_video_frame_copier.cc @@ -21,6 +21,11 @@ @@ -4043,7 +4076,7 @@ index 339c79e303..cad545c19b 100644 namespace blink { StaticBitmapImageToVideoFrameCopier::StaticBitmapImageToVideoFrameCopier( -@@ -284,3 +289,7 @@ void StaticBitmapImageToVideoFrameCopier::OnReleaseMailbox( +@@ -290,3 +295,7 @@ void StaticBitmapImageToVideoFrameCopier::OnReleaseMailbox( } } // namespace blink @@ -4052,7 +4085,7 @@ index 339c79e303..cad545c19b 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/platform/heap/BUILD.gn b/third_party/blink/renderer/platform/heap/BUILD.gn -index 144adbd33d..60f8abbcc9 100644 +index f559c63412..1d94a02338 100644 --- a/third_party/blink/renderer/platform/heap/BUILD.gn +++ b/third_party/blink/renderer/platform/heap/BUILD.gn @@ -4,6 +4,7 @@ @@ -4106,17 +4139,16 @@ index 76856823d2..fc10b03613 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/platform/image-decoders/BUILD.gn b/third_party/blink/renderer/platform/image-decoders/BUILD.gn -index 870c7e8537..a822ebf59e 100644 +index 31f8b57c43..8137a8ab59 100644 --- a/third_party/blink/renderer/platform/image-decoders/BUILD.gn +++ b/third_party/blink/renderer/platform/image-decoders/BUILD.gn -@@ -2,13 +2,14 @@ +@@ -2,12 +2,13 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/config/jumbo.gni") import("//build/config/sanitizers/sanitizers.gni") import("//media/media_options.gni") - import("//skia/skia.gni") import("//testing/test.gni") import("//third_party/blink/renderer/platform/platform.gni") @@ -4126,7 +4158,7 @@ index 870c7e8537..a822ebf59e 100644 "//third_party/blink/renderer/core/*", "//third_party/blink/renderer/platform/*", diff --git a/third_party/blink/renderer/platform/instrumentation/BUILD.gn b/third_party/blink/renderer/platform/instrumentation/BUILD.gn -index 2a2ba908ed..330861c09d 100644 +index 0573c63c00..553d709e7b 100644 --- a/third_party/blink/renderer/platform/instrumentation/BUILD.gn +++ b/third_party/blink/renderer/platform/instrumentation/BUILD.gn @@ -2,6 +2,7 @@ @@ -4147,7 +4179,7 @@ index 2a2ba908ed..330861c09d 100644 sources = [ diff --git a/third_party/blink/renderer/platform/loader/BUILD.gn b/third_party/blink/renderer/platform/loader/BUILD.gn -index 0f566bbe8e..b717545ba8 100644 +index 368305c6b0..969c6dcf2e 100644 --- a/third_party/blink/renderer/platform/loader/BUILD.gn +++ b/third_party/blink/renderer/platform/loader/BUILD.gn @@ -2,6 +2,7 @@ @@ -4158,7 +4190,7 @@ index 0f566bbe8e..b717545ba8 100644 import("//testing/test.gni") import("//third_party/blink/renderer/build/scripts/scripts.gni") import("//third_party/blink/renderer/platform/platform.gni") -@@ -191,6 +192,14 @@ blink_platform_sources("loader") { +@@ -189,6 +190,14 @@ blink_platform_sources("loader") { sources += get_target_outputs(":make_platform_loader_generated_delivery_type_names") @@ -4173,7 +4205,7 @@ index 0f566bbe8e..b717545ba8 100644 deps = [ ":make_platform_loader_generated_delivery_type_names", ":make_platform_loader_generated_fetch_initiator_type_names", -@@ -217,7 +226,7 @@ blink_platform_sources("loader") { +@@ -215,7 +224,7 @@ blink_platform_sources("loader") { [ "//third_party/blink/renderer/platform/network:network" ] } @@ -4182,8 +4214,8 @@ index 0f566bbe8e..b717545ba8 100644 # This target defines test files for blink_platform_unittests and only the # blink_platform_unittests target should depend on it. visibility = [ "//third_party/blink/renderer/platform:*" ] -@@ -298,7 +307,7 @@ test("unencoded_digest_fuzzer") { - ] +@@ -278,7 +287,7 @@ source_set("unit_tests") { + configs += [ "//build/config/compiler:no_exit_time_destructors" ] } -source_set("test_support") { @@ -4216,10 +4248,10 @@ index 192a8bc751..73c965b871 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/mojo_url_loader_client.cc b/third_party/blink/renderer/platform/loader/fetch/url_loader/mojo_url_loader_client.cc -index 570200e61d..d03ebe31fc 100644 +index 5987071336..caf1abbe28 100644 --- a/third_party/blink/renderer/platform/loader/fetch/url_loader/mojo_url_loader_client.cc +++ b/third_party/blink/renderer/platform/loader/fetch/url_loader/mojo_url_loader_client.cc -@@ -29,6 +29,11 @@ +@@ -30,6 +30,11 @@ #include "third_party/blink/renderer/platform/loader/fetch/url_loader/resource_request_sender.h" #include "third_party/blink/renderer/platform/wtf/functional.h" @@ -4231,7 +4263,7 @@ index 570200e61d..d03ebe31fc 100644 namespace blink { namespace { -@@ -543,3 +548,7 @@ void MojoURLLoaderClient::FlushDeferredMessages() { +@@ -546,3 +551,7 @@ void MojoURLLoaderClient::FlushDeferredMessages() { } } // namespace blink @@ -4240,7 +4272,7 @@ index 570200e61d..d03ebe31fc 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/platform/media/BUILD.gn b/third_party/blink/renderer/platform/media/BUILD.gn -index 679bbcd637..cb08084aa4 100644 +index 0d5a0c694d..09a4060e9b 100644 --- a/third_party/blink/renderer/platform/media/BUILD.gn +++ b/third_party/blink/renderer/platform/media/BUILD.gn @@ -2,6 +2,7 @@ @@ -4261,10 +4293,10 @@ index 679bbcd637..cb08084aa4 100644 # Note: this is here because web_media_player_impl_unittest.cc needs core # and web, and platform should not depend on either. diff --git a/third_party/blink/renderer/platform/media/cache_util.cc b/third_party/blink/renderer/platform/media/cache_util.cc -index accb6385e1..b10edf2789 100644 +index fc2967d1a7..59872b1958 100644 --- a/third_party/blink/renderer/platform/media/cache_util.cc +++ b/third_party/blink/renderer/platform/media/cache_util.cc -@@ -17,6 +17,9 @@ +@@ -18,6 +18,9 @@ #include "third_party/blink/public/platform/web_string.h" #include "third_party/blink/public/platform/web_url_response.h" @@ -4274,7 +4306,7 @@ index accb6385e1..b10edf2789 100644 namespace blink { using ::base::Time; -@@ -130,3 +133,6 @@ base::TimeDelta GetCacheValidUntil(const WebURLResponse& response) { +@@ -127,3 +130,6 @@ base::TimeDelta GetCacheValidUntil(const WebURLResponse& response) { } } // namespace blink @@ -4282,10 +4314,10 @@ index accb6385e1..b10edf2789 100644 +#undef kHttpOK +#undef kHttpPartialContent diff --git a/third_party/blink/renderer/platform/media/new_session_cdm_result_promise.cc b/third_party/blink/renderer/platform/media/new_session_cdm_result_promise.cc -index 1727913971..64ec2413e2 100644 +index bcf6a5909f..3da9788a56 100644 --- a/third_party/blink/renderer/platform/media/new_session_cdm_result_promise.cc +++ b/third_party/blink/renderer/platform/media/new_session_cdm_result_promise.cc -@@ -10,6 +10,9 @@ +@@ -12,6 +12,9 @@ #include "third_party/blink/public/platform/web_string.h" #include "third_party/blink/renderer/platform/media/cdm_result_promise_helper.h" @@ -4295,7 +4327,7 @@ index 1727913971..64ec2413e2 100644 namespace blink { namespace { -@@ -108,3 +111,6 @@ void NewSessionCdmResultPromise::reject(CdmPromise::Exception exception_code, +@@ -110,3 +113,6 @@ void NewSessionCdmResultPromise::reject(CdmPromise::Exception exception_code, } } // namespace blink @@ -4303,10 +4335,10 @@ index 1727913971..64ec2413e2 100644 +#undef kTimeToResolveUmaPrefix +#undef kTimeToRejectUmaPrefix diff --git a/third_party/blink/renderer/platform/media/resource_multi_buffer_data_provider.cc b/third_party/blink/renderer/platform/media/resource_multi_buffer_data_provider.cc -index 34cee8e0f3..52f1471676 100644 +index 093e01ba30..96fc5df31c 100644 --- a/third_party/blink/renderer/platform/media/resource_multi_buffer_data_provider.cc +++ b/third_party/blink/renderer/platform/media/resource_multi_buffer_data_provider.cc -@@ -32,6 +32,9 @@ +@@ -35,6 +35,9 @@ #include "third_party/blink/renderer/platform/weborigin/security_origin.h" #include "third_party/blink/renderer/platform/wtf/functional.h" @@ -4316,7 +4348,7 @@ index 34cee8e0f3..52f1471676 100644 namespace blink { // The number of milliseconds to wait before retrying a failed load. -@@ -611,3 +614,6 @@ void ResourceMultiBufferDataProvider::SetStale() { +@@ -596,3 +599,6 @@ bool ResourceMultiBufferDataProvider::VerifyPartialResponse( } } // namespace blink @@ -4324,7 +4356,7 @@ index 34cee8e0f3..52f1471676 100644 +#undef kHttpOK +#undef kHttpPartialContent diff --git a/third_party/blink/renderer/platform/mojo/browser_interface_broker_proxy_impl.cc b/third_party/blink/renderer/platform/mojo/browser_interface_broker_proxy_impl.cc -index eea68661dc..9e20d6e208 100644 +index 1362b05900..0e6924508e 100644 --- a/third_party/blink/renderer/platform/mojo/browser_interface_broker_proxy_impl.cc +++ b/third_party/blink/renderer/platform/mojo/browser_interface_broker_proxy_impl.cc @@ -11,6 +11,11 @@ @@ -4348,7 +4380,7 @@ index eea68661dc..9e20d6e208 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/platform/network/BUILD.gn b/third_party/blink/renderer/platform/network/BUILD.gn -index fe31989dda..546de3785b 100644 +index b223e13e43..5ce0145fae 100644 --- a/third_party/blink/renderer/platform/network/BUILD.gn +++ b/third_party/blink/renderer/platform/network/BUILD.gn @@ -2,6 +2,7 @@ @@ -4359,7 +4391,7 @@ index fe31989dda..546de3785b 100644 import("//third_party/blink/renderer/build/scripts/scripts.gni") import("//third_party/blink/renderer/platform/platform.gni") import("//third_party/blink/renderer/platform/platform_generated.gni") -@@ -76,7 +77,7 @@ blink_platform_sources("network") { +@@ -75,7 +76,7 @@ blink_platform_sources("network") { ] } @@ -4368,8 +4400,8 @@ index fe31989dda..546de3785b 100644 visibility = [ "//third_party/blink/renderer/platform:*" ] testonly = true -@@ -105,7 +106,7 @@ source_set("unit_tests") { - public_deps = [ "//third_party/blink/renderer/platform:platform" ] +@@ -108,7 +109,7 @@ source_set("unit_tests") { + configs += [ "//build/config/compiler:no_exit_time_destructors" ] } -source_set("test_support") { @@ -4378,10 +4410,10 @@ index fe31989dda..546de3785b 100644 testonly = true diff --git a/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder.cc b/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder.cc -index 4979c8114a..f0fa2f7732 100644 +index 26697fc894..ffff7b1904 100644 --- a/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder.cc +++ b/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder.cc -@@ -79,6 +79,11 @@ +@@ -78,6 +78,11 @@ #include "third_party/webrtc/rtc_base/time_utils.h" #include "ui/gfx/buffer_format_util.h" @@ -4393,7 +4425,7 @@ index 4979c8114a..f0fa2f7732 100644 namespace { media::SVCScalabilityMode ToSVCScalabilityMode( -@@ -3051,3 +3056,7 @@ void RTCVideoEncoder::SetH265ParameterSetsTrackerForTesting( +@@ -3042,3 +3047,7 @@ void RTCVideoEncoder::SetH265ParameterSetsTrackerForTesting( #endif } // namespace blink @@ -4443,7 +4475,7 @@ index c90255bea5..d882b4945e 100644 # Any target outside platform should instead depend on platform. visibility = [ "//third_party/blink/renderer/platform/*" ] diff --git a/third_party/blink/renderer/platform/scheduler/BUILD.gn b/third_party/blink/renderer/platform/scheduler/BUILD.gn -index 9084db71bf..44bb7a531a 100644 +index 36c923d28b..c168252f9b 100644 --- a/third_party/blink/renderer/platform/scheduler/BUILD.gn +++ b/third_party/blink/renderer/platform/scheduler/BUILD.gn @@ -2,6 +2,7 @@ @@ -4463,7 +4495,7 @@ index 9084db71bf..44bb7a531a 100644 testonly = true sources = [ -@@ -223,7 +224,7 @@ source_set("test_support") { +@@ -220,7 +221,7 @@ source_set("test_support") { configs += [ "//third_party/blink/renderer/platform:blink_platform_config" ] } @@ -4472,7 +4504,7 @@ index 9084db71bf..44bb7a531a 100644 testonly = true sources = [ -@@ -271,7 +272,7 @@ source_set("unit_tests") { +@@ -268,7 +269,7 @@ source_set("unit_tests") { configs += [ "//third_party/blink/renderer/platform:blink_platform_config" ] } @@ -4482,7 +4514,7 @@ index 9084db71bf..44bb7a531a 100644 sources = [] diff --git a/third_party/blink/renderer/platform/storage/blink_storage_key_hash.h b/third_party/blink/renderer/platform/storage/blink_storage_key_hash.h -index 30fcdb59b2..7e7008e522 100644 +index 1205b7f433..75bd1e3e3e 100644 --- a/third_party/blink/renderer/platform/storage/blink_storage_key_hash.h +++ b/third_party/blink/renderer/platform/storage/blink_storage_key_hash.h @@ -9,6 +9,11 @@ @@ -4507,7 +4539,7 @@ index 30fcdb59b2..7e7008e522 100644 + #endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_STORAGE_BLINK_STORAGE_KEY_HASH_H_ diff --git a/third_party/blink/renderer/platform/text/text_encoding_detector.cc b/third_party/blink/renderer/platform/text/text_encoding_detector.cc -index 0f5d610ad2..ab7957a9e4 100644 +index e70286e4c0..dd1edeae9a 100644 --- a/third_party/blink/renderer/platform/text/text_encoding_detector.cc +++ b/third_party/blink/renderer/platform/text/text_encoding_detector.cc @@ -45,6 +45,11 @@ @@ -4531,10 +4563,10 @@ index 0f5d610ad2..ab7957a9e4 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/platform/theme/web_theme_engine_default.cc b/third_party/blink/renderer/platform/theme/web_theme_engine_default.cc -index 415b0c2009..ecbfe8b1d0 100644 +index a356e37e92..f2d66afd30 100644 --- a/third_party/blink/renderer/platform/theme/web_theme_engine_default.cc +++ b/third_party/blink/renderer/platform/theme/web_theme_engine_default.cc -@@ -276,7 +276,7 @@ SkColor4f WebThemeEngineDefault::GetScrollbarThumbColor( +@@ -277,7 +277,7 @@ SkColor4f WebThemeEngineDefault::GetScrollbarThumbColor( } void WebThemeEngineDefault::GetOverlayScrollbarStyle(ScrollbarStyle* style) { @@ -4542,12 +4574,12 @@ index 415b0c2009..ecbfe8b1d0 100644 + if (!base::FeatureList::IsEnabled(::features::kScrollbarAnimations)) { style->fade_out_delay = base::TimeDelta::Max(); style->fade_out_duration = base::TimeDelta(); - } else if (IsFluentOverlayScrollbarEnabled()) { + } else { diff --git a/third_party/blink/renderer/platform/weborigin/security_origin.h b/third_party/blink/renderer/platform/weborigin/security_origin.h -index 3e23fa12e6..9bcc66ae8d 100644 +index 926537abee..63790d9c91 100644 --- a/third_party/blink/renderer/platform/weborigin/security_origin.h +++ b/third_party/blink/renderer/platform/weborigin/security_origin.h -@@ -42,6 +42,11 @@ +@@ -44,6 +44,11 @@ #include "third_party/blink/renderer/platform/wtf/thread_safe_ref_counted.h" #include "url/origin.h" @@ -4556,12 +4588,12 @@ index 3e23fa12e6..9bcc66ae8d 100644 +#pragma clang diagnostic ignored "-Wshorten-64-to-32" +#endif + - namespace WTF { - class StringBuilder; - } // namespace WTF -@@ -540,4 +545,8 @@ struct HashTraits> + namespace blink { - } // namespace WTF + class KURL; +@@ -532,4 +537,8 @@ struct HashTraits> + + } // namespace blink +#ifdef __clang__ +#pragma clang diagnostic pop @@ -4569,22 +4601,22 @@ index 3e23fa12e6..9bcc66ae8d 100644 + #endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_WEBORIGIN_SECURITY_ORIGIN_H_ diff --git a/third_party/blink/renderer/platform/webrtc/convert_to_webrtc_video_frame_buffer.cc b/third_party/blink/renderer/platform/webrtc/convert_to_webrtc_video_frame_buffer.cc -index 86057e66f8..17727ee854 100644 +index 073bbd5889..5467c9aa20 100644 --- a/third_party/blink/renderer/platform/webrtc/convert_to_webrtc_video_frame_buffer.cc +++ b/third_party/blink/renderer/platform/webrtc/convert_to_webrtc_video_frame_buffer.cc -@@ -26,6 +26,11 @@ +@@ -25,6 +25,11 @@ + #include "third_party/webrtc/common_video/include/video_frame_buffer.h" #include "third_party/webrtc/rtc_base/ref_counted_object.h" - #include "ui/gfx/gpu_memory_buffer.h" +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wshorten-64-to-32" +#endif + - namespace WTF { + namespace blink { // Template specializations of [1], needed to be able to pass WTF callbacks -@@ -500,3 +505,7 @@ scoped_refptr ConvertFromMappedWebRtcVideoFrameBuffer( +@@ -583,3 +588,7 @@ scoped_refptr ConvertFromMappedWebRtcVideoFrameBuffer( } } // namespace blink @@ -4593,7 +4625,7 @@ index 86057e66f8..17727ee854 100644 +#pragma clang diagnostic pop +#endif diff --git a/third_party/blink/renderer/platform/widget/input/main_thread_event_queue.cc b/third_party/blink/renderer/platform/widget/input/main_thread_event_queue.cc -index be811ca354..052d985f6e 100644 +index 5d6b3197bb..2a3f3e26af 100644 --- a/third_party/blink/renderer/platform/widget/input/main_thread_event_queue.cc +++ b/third_party/blink/renderer/platform/widget/input/main_thread_event_queue.cc @@ -23,6 +23,8 @@ @@ -4605,7 +4637,7 @@ index be811ca354..052d985f6e 100644 namespace blink { namespace { -@@ -956,3 +958,5 @@ MainThreadEventQueue::GetCompositorThreadOnly() { +@@ -991,3 +993,5 @@ bool MainThreadEventQueue::ShouldThrottleAsyncTouchMoves( } } // namespace blink @@ -4631,7 +4663,7 @@ index 71570ab35a..52424396d3 100644 + +#undef IsGestureScroll diff --git a/third_party/blink/renderer/platform/wtf/BUILD.gn b/third_party/blink/renderer/platform/wtf/BUILD.gn -index 49b0a677e7..a43379b7d4 100644 +index 4ad38e95f6..65df137826 100644 --- a/third_party/blink/renderer/platform/wtf/BUILD.gn +++ b/third_party/blink/renderer/platform/wtf/BUILD.gn @@ -8,6 +8,7 @@ assert(use_blink) @@ -4651,7 +4683,7 @@ index 49b0a677e7..a43379b7d4 100644 output_name = "blink_platform_wtf" sources = [ -@@ -287,7 +288,7 @@ test("wtf_unittests") { +@@ -289,7 +290,7 @@ test("wtf_unittests") { deps = [ ":wtf_unittests_sources" ] } @@ -4661,10 +4693,10 @@ index 49b0a677e7..a43379b7d4 100644 visibility = [ "*" ] testonly = true diff --git a/third_party/blink/renderer/platform/wtf/text/string_hash.h b/third_party/blink/renderer/platform/wtf/text/string_hash.h -index 7ca8340aa8..84695065ca 100644 +index 7a257cd18e..3ec722614a 100644 --- a/third_party/blink/renderer/platform/wtf/text/string_hash.h +++ b/third_party/blink/renderer/platform/wtf/text/string_hash.h -@@ -28,6 +28,11 @@ +@@ -29,6 +29,11 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hasher.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" @@ -4673,10 +4705,10 @@ index 7ca8340aa8..84695065ca 100644 +#pragma clang diagnostic ignored "-Wshorten-64-to-32" +#endif + - namespace WTF { + namespace blink { // The GetHash() functions in below HashTraits do not support null strings. -@@ -113,4 +118,8 @@ struct hash { +@@ -116,4 +121,8 @@ struct hash { }; } // namespace std @@ -4686,10 +4718,10 @@ index 7ca8340aa8..84695065ca 100644 + #endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_WTF_TEXT_STRING_HASH_H_ diff --git a/third_party/blink/renderer/platform/wtf/text/string_impl.h b/third_party/blink/renderer/platform/wtf/text/string_impl.h -index 231dc71a69..57ebfec352 100644 +index 733aed247a..ebc20c073d 100644 --- a/third_party/blink/renderer/platform/wtf/text/string_impl.h +++ b/third_party/blink/renderer/platform/wtf/text/string_impl.h -@@ -65,6 +65,11 @@ typedef const struct __CFString* CFStringRef; +@@ -61,6 +61,11 @@ typedef const struct __CFString* CFStringRef; @class NSString; #endif @@ -4698,12 +4730,12 @@ index 231dc71a69..57ebfec352 100644 +#pragma clang diagnostic ignored "-Wshorten-64-to-32" +#endif + - namespace WTF { + namespace blink { - enum TextCaseSensitivity { -@@ -934,4 +939,8 @@ using WTF::ReverseFind; - using WTF::StringImpl; - using WTF::TextCaseSensitivity; + class AtomicStringTable; +@@ -947,4 +952,8 @@ struct HashTraits>; + + } // namespace blink +#ifdef __clang__ +#pragma clang diagnostic pop @@ -4711,10 +4743,10 @@ index 231dc71a69..57ebfec352 100644 + #endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_WTF_TEXT_STRING_IMPL_H_ diff --git a/third_party/blink/renderer/platform/wtf/vector.h b/third_party/blink/renderer/platform/wtf/vector.h -index a45d9342d9..62df3c4b8d 100644 +index d7ec050e88..609a531b26 100644 --- a/third_party/blink/renderer/platform/wtf/vector.h +++ b/third_party/blink/renderer/platform/wtf/vector.h -@@ -57,6 +57,11 @@ +@@ -58,6 +58,11 @@ #include "third_party/blink/renderer/platform/wtf/vector_traits.h" #include "third_party/blink/renderer/platform/wtf/wtf_size_t.h" @@ -4726,9 +4758,9 @@ index a45d9342d9..62df3c4b8d 100644 // For ASAN builds, disable inline buffers completely as they cause various // issues. #ifdef ANNOTATE_CONTIGUOUS_CONTAINER -@@ -2609,4 +2614,8 @@ auto ToVector(Range&& range, Proj proj = {}) { +@@ -2621,4 +2626,8 @@ auto ToVector(Range&& range, Proj proj = {}) { - using WTF::Vector; + } // namespace blink +#ifdef __clang__ +#pragma clang diagnostic pop @@ -4737,7 +4769,7 @@ index a45d9342d9..62df3c4b8d 100644 #endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_WTF_VECTOR_H_ --- a/third_party/blink/renderer/core/annotation/annotation_agent_impl.cc +++ b/third_party/blink/renderer/core/annotation/annotation_agent_impl.cc -@@ -170,7 +170,7 @@ +@@ -177,7 +177,7 @@ bool ShouldUseIsValidRangeAndMarkable(mojom::blink::AnnotationType type) { // instant. int GetGlicSmoothScrollThresholdInDIPs() { const base::FeatureParam glic_smooth_scroll_threshold_in_dips{ @@ -4746,17 +4778,6 @@ index a45d9342d9..62df3c4b8d 100644 "glic_smooth_scroll_threshold_in_dips", 15000}; return glic_smooth_scroll_threshold_in_dips.Get(); } ---- a/third_party/blink/renderer/core/clipboard/system_clipboard.cc -+++ b/third_party/blink/renderer/core/clipboard/system_clipboard.cc -@@ -667,7 +667,7 @@ - } - - void SystemClipboard::StartListening(LocalDOMWindow* window) { -- if (!base::FeatureList::IsEnabled(features::kClipboardChangeEvent)) { -+ if (!base::FeatureList::IsEnabled(::features::kClipboardChangeEvent)) { - return; - } - --- a/third_party/blink/renderer/core/dom/subscriber.cc +++ b/third_party/blink/renderer/core/dom/subscriber.cc @@ -22,8 +22,6 @@ diff --git a/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0107-components.patch b/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0107-components.patch index 0ce4c26522..f88843b75c 100644 --- a/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0107-components.patch +++ b/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0107-components.patch @@ -6,35 +6,70 @@ Subject: [PATCH] reland jumbo 7 Enable jumbo build for the following component(s)/source_set(s): - //components/affiliations/core/browser:affiliations +- //components/assist_ranker:assist_ranker +- //components/attribution_reporting:attribution_reporting - //components/autofill/content/browser:browser - //components/autofill/content/renderer:renderer - //components/autofill/core/browser:browser - //components/autofill/core/common:common +- //components/bookmarks/browser:browser - //components/cdm/browser:browser - //components/cdm/common:common - //components/cdm/renderer:renderer +- //components/collaboration/internal:messaging_internal - //components/content_settings/core/browser:browser - //components/content_settings/core/common:common +- //components/data_sharing/internal:internal +- //components/dom_distiller/core:core - //components/domain_reliability:domain_reliability - //components/download/internal/common:internal +- //components/download/public/background_service:public - //components/download/public/common:public +- //components/drive:drive +- //components/enterprise:enterprise +- //components/favicon/core:core - //components/feature_engagement/internal:internal - //components/feature_engagement/public:public +- //components/feedback:feedback +- //components/gcm_driver:gcm_driver - //components/global_media_controls:global_media_controls - //components/guest_view/browser:browser - //components/guest_view/renderer:renderer +- //components/history/core/browser:browser +- //components/history_clusters/core:core +- //components/history_embeddings:history_embeddings +- //components/input:input +- //components/keyed_service/core:core +- //components/lens:lens - //components/leveldb_proto:leveldb_proto +- //components/live_caption:live_caption - //components/lookalikes/core:core - //components/lookalikes/core:safety_tips -- //components/media_router/common/providers/cast/certificate:certificate_reader +- //components/media_message_center:media_message_center - //components/media_router/common/providers/cast/certificate:certificate +- //components/media_router/common/providers/cast/certificate:certificate_reader - //components/media_router/common/providers/cast/certificate:openscreen_certificate_verifier +- //components/media_router/common/providers/cast/channel:channel +- //components/media_router/common:common +- //components/metrics/private_metrics:private_metrics - //components/metrics:metrics +- //components/mirroring/service:mirroring_service +- //components/no_state_prefetch/browser:browser +- //components/ntp_tiles:ntp_tiles +- //components/offline_pages/core/background:background_offliner +- //components/offline_pages/core:core - //components/omnibox/browser:browser +- //components/optimization_guide/core:core_util +- //components/optimization_guide/core:features +- //components/optimization_guide/core:filters +- //components/optimization_guide/core:hints +- //components/optimization_guide/core:model_execution +- //components/optimization_guide/core:prediction +- //components/page_content_annotations/core:core - //components/password_manager/content/browser:browser +- //components/password_manager/core/browser/leak_detection:leak_detection - //components/password_manager/core/browser:browser - //components/password_manager/core/browser:password_hash_data -- //components/password_manager/core/browser/leak_detection:leak_detection - //components/password_manager/core/common:common - //components/payments/content:content - //components/payments/content:content_common @@ -43,8 +78,9 @@ Enable jumbo build for the following component(s)/source_set(s): - //components/payments/core:error_strings - //components/payments/core:method_strings - //components/performance_manager:performance_manager -- //components/policy/content:safe_sites_navigation_throttle +- //components/persistent_cache:persistent_cache - //components/policy/content:content +- //components/policy/content:safe_sites_navigation_throttle - //components/policy/core/browser:internal - //components/policy/core/common:policy_namespace_internal - //components/policy/core/common:util @@ -54,141 +90,246 @@ Enable jumbo build for the following component(s)/source_set(s): - //components/safe_browsing/content/browser:client_side_detection_images_cache - //components/safe_browsing/content/browser:client_side_detection_service - //components/safe_browsing/core/browser:browser +- //components/search_engines:search_engines +- //components/security_interstitials/content:security_interstitial_page - //components/security_state/content:content - //components/security_state/core:core +- //components/segmentation_platform/internal:internal +- //components/services/app_service/public/cpp:app_types +- //components/sessions:session_id +- //components/sessions:sessions +- //components/signin/core/browser:browser - //components/storage_monitor:storage_monitor +- //components/subresource_filter/content/browser:browser +- //components/subresource_filter/core/common:common +- //components/supervised_user/core/browser:browser # - //components/sync:? - //components/sync/base:base +- //components/sync/engine:engine +- //components/sync/model:model +- //components/sync/nigori:nigori - //components/sync/protocol:util - //components/sync/service:service - //components/sync_device_info:sync_device_info +- //components/sync_sessions:sync_sessions - //components/sync_user_events:sync_user_events +- //components/translate/core/browser:browser +- //components/trusted_vault:trusted_vault - //components/ui_devtools:ui_devtools +- //components/ukm:ukm +- //components/unexportable_keys:unexportable_keys +- //components/update_client:update_client - //components/url_formatter:skeleton_generator - //components/url_formatter:url_formatter - //components/variations:variations +- //components/web_package:web_package - //components/webauthn/content/browser:browser +- //components/webcrypto:webcrypto - //components/wifi:wifi +- //components/zucchini:zucchini_lib --- - components/affiliations/core/browser/BUILD.gn | 3 ++- - components/autofill/content/browser/BUILD.gn | 3 ++- - components/autofill/content/renderer/BUILD.gn | 10 ++++++++-- - .../autofill/content/renderer/form_tracker.cc | 4 ++++ - .../content/renderer/password_autofill_agent.cc | 4 ++++ - components/autofill/core/browser/BUILD.gn | 7 ++++--- - .../addresses/autofill_structured_address_name.cc | 3 ++- - ...iple_request_payments_network_interface_base.cc | 8 ++++++++ - .../payments/payments_network_interface_base.cc | 8 ++++++++ - .../payments/payments_suggestion_generator.cc | 6 ++++++ - .../core/browser/ui/autofill_resource_utils.cc | 4 ++++ - .../webdata/addresses/address_autofill_table.cc | 14 ++++++++++++++ - .../addresses/autofill_profile_sync_util.cc | 6 ++++++ - .../webdata/addresses/contact_info_sync_util.cc | 6 ++++++ - .../webdata/autocomplete/autocomplete_table.cc | 6 ++++++ - .../browser/webdata/autofill_ai/entity_table.cc | 4 ++++ - .../webdata/autofill_sync_metadata_table.cc | 6 ++++++ - .../webdata/valuables/valuable_sync_bridge.cc | 4 ++++ - .../browser/webdata/valuables/valuables_table.cc | 6 ++++++ - components/autofill/core/common/BUILD.gn | 4 ++-- - components/cdm/browser/BUILD.gn | 5 +++-- - components/cdm/common/BUILD.gn | 3 ++- - components/cdm/renderer/BUILD.gn | 3 ++- - components/content_settings/core/browser/BUILD.gn | 5 +++-- - .../browser/content_settings_default_provider.cc | 4 ++++ - .../core/browser/content_settings_pref_provider.cc | 4 ++++ - components/content_settings/core/common/BUILD.gn | 5 +++-- - components/content_settings/core/test/BUILD.gn | 4 +++- - components/domain_reliability/BUILD.gn | 6 ++++-- - components/download/internal/common/BUILD.gn | 3 ++- - components/download/public/common/BUILD.gn | 3 ++- - components/feature_engagement/internal/BUILD.gn | 6 ++++-- - .../feature_engagement/internal/test/BUILD.gn | 4 +++- - components/feature_engagement/public/BUILD.gn | 6 ++++-- - components/global_media_controls/BUILD.gn | 4 +++- - .../public/views/media_item_ui_updated_view.cc | 14 ++++++++++++++ - components/guest_view/browser/BUILD.gn | 4 +++- - components/guest_view/renderer/BUILD.gn | 4 +++- - components/leveldb_proto/BUILD.gn | 3 ++- - .../internal/proto_leveldb_wrapper.cc | 6 ++++++ - components/lookalikes/core/BUILD.gn | 7 ++++--- - .../common/providers/cast/certificate/BUILD.gn | 12 +++++++----- - components/metrics/BUILD.gn | 5 +++-- - components/metrics/install_date_provider.cc | 6 ++++++ - components/metrics/metrics_log.cc | 4 ++-- - components/omnibox/browser/BUILD.gn | 5 +++-- - .../omnibox/browser/autocomplete_grouper_groups.cc | 4 ++++ - .../browser/autocomplete_grouper_sections.cc | 4 ++++ - components/omnibox/browser/autocomplete_match.cc | 4 ++++ - components/omnibox/browser/autocomplete_result.cc | 6 ++++++ - components/omnibox/browser/base_search_provider.cc | 6 ++++++ - components/omnibox/browser/history_url_provider.cc | 5 ++++- - .../omnibox/browser/omnibox_popup_selection.cc | 4 ++++ - components/omnibox/browser/open_tab_provider.cc | 4 ++++ - .../password_manager/content/browser/BUILD.gn | 4 +++- - components/password_manager/core/browser/BUILD.gn | 7 ++++--- - .../core/browser/leak_detection/BUILD.gn | 7 ++++--- - .../core/browser/sync_credentials_filter.cc | 2 +- - components/password_manager/core/common/BUILD.gn | 3 ++- - components/payments/content/BUILD.gn | 10 ++++++---- - components/payments/content/icon/BUILD.gn | 4 +++- - components/payments/core/BUILD.gn | 11 ++++++----- - components/performance_manager/BUILD.gn | 8 +++++++- - .../decorators/page_aggregator.cc | 4 ++++ - .../decorators/page_live_state_decorator.cc | 4 ++++ - .../decorators/page_load_tracker_decorator.cc | 4 ++++ - .../decorators/process_priority_aggregator.cc | 4 ++++ - .../decorators/site_data_recorder.cc | 4 ++++ - .../decorators/tab_page_decorator.cc | 2 +- - .../frame_audible_voter.cc | 6 ++++++ - .../frame_capturing_media_stream_voter.cc | 6 ++++++ - .../frame_visibility_voter.cc | 4 ++++ - .../inherit_client_priority_voter.cc | 4 ++++ - .../inherit_parent_priority_voter.cc | 6 ++++++ - .../loading_page_voter.cc | 4 ++++ - .../freezing/frozen_frame_aggregator.cc | 4 ++++ - .../graph/frame_node_impl_describer.cc | 4 ++++ - .../graph/process_node_impl_describer.cc | 4 ++++ - .../graph/worker_node_impl_describer.cc | 4 ++++ - .../performance_manager_registry_impl.cc | 4 ++++ - .../site_data/site_data_cache_factory.cc | 4 ++++ - .../cpu_measurement_monitor.cc | 4 ++++ - .../memory_measurement_provider.cc | 4 ++++ - components/policy/content/BUILD.gn | 5 +++-- - components/policy/core/browser/BUILD.gn | 5 +++-- - .../core/browser/url_allowlist_policy_handler.cc | 4 ++++ - .../core/browser/url_blocklist_policy_handler.cc | 4 ++++ - components/policy/core/common/BUILD.gn | 9 +++++---- - .../common/cloud/profile_cloud_policy_manager.cc | 4 ++++ - .../common/cloud/profile_cloud_policy_store.cc | 4 ++++ - .../policy/core/common/policy_proto_decoders.cc | 4 ++++ - components/prefs/BUILD.gn | 4 +++- - components/printing/browser/BUILD.gn | 4 +++- - components/safe_browsing/content/browser/BUILD.gn | 3 ++- - components/safe_browsing/core/browser/BUILD.gn | 3 ++- - components/security_state/content/BUILD.gn | 4 +++- - components/security_state/core/BUILD.gn | 6 ++++-- - components/storage_monitor/BUILD.gn | 3 ++- - components/sync/BUILD.gn | 1 + - components/sync/base/BUILD.gn | 3 ++- - components/sync/protocol/BUILD.gn | 3 ++- - components/sync/service/BUILD.gn | 3 ++- - ...tory_sync_session_durations_metrics_recorder.cc | 6 ++++++ - components/sync/service/sync_service_impl.cc | 4 ++-- - .../sync_session_durations_metrics_recorder.cc | 6 ++++++ - components/sync_device_info/BUILD.gn | 3 ++- - components/sync_user_events/BUILD.gn | 4 +++- - components/ui_devtools/BUILD.gn | 3 ++- - components/url_formatter/BUILD.gn | 7 ++++--- - components/variations/BUILD.gn | 3 ++- - .../variations/child_process_field_trial_syncer.cc | 4 ++++ - components/variations/variations_ids_provider.cc | 4 ++++ - components/webauthn/content/browser/BUILD.gn | 4 +++- - components/wifi/BUILD.gn | 6 ++++-- - 113 files changed, 457 insertions(+), 97 deletions(-) + components/affiliations/core/browser/BUILD.gn | 3 ++- + components/assist_ranker/BUILD.gn | 4 +++- + components/attribution_reporting/BUILD.gn | 3 ++- + .../aggregatable_trigger_data.cc | 4 ++++ + components/autofill/content/browser/BUILD.gn | 3 ++- + components/autofill/content/renderer/BUILD.gn | 10 +++++++-- + .../autofill/content/renderer/form_tracker.cc | 4 ++++ + .../renderer/password_autofill_agent.cc | 4 ++++ + components/autofill/core/browser/BUILD.gn | 7 +++--- + .../autofill_ai/entity_instance_cleaner.cc | 4 ++++ + .../addresses/autofill_profile_comparator.cc | 4 ++++ + .../autofill_structured_address_name.cc | 3 ++- + ...request_payments_network_interface_base.cc | 8 +++++++ + .../payments_network_interface_base.cc | 8 +++++++ + .../addresses/address_suggestion_generator.cc | 4 ++++ + .../payments/payments_suggestion_generator.cc | 6 +++++ + .../valuable_suggestion_generator.cc | 4 ++++ + .../browser/ui/autofill_resource_utils.cc | 4 ++++ + .../addresses/address_autofill_table.cc | 14 ++++++++++++ + .../addresses/autofill_profile_sync_util.cc | 6 +++++ + .../addresses/contact_info_sync_util.cc | 6 +++++ + .../autocomplete/autocomplete_table.cc | 6 +++++ + .../autocomplete_table_label_sensitive.cc | 22 +++++++++++++++++++ + .../webdata/autofill_ai/entity_table.cc | 4 ++++ + .../webdata/autofill_sync_metadata_table.cc | 6 +++++ + .../webdata/valuables/valuable_sync_bridge.cc | 4 ++++ + .../webdata/valuables/valuables_table.cc | 6 +++++ + components/autofill/core/common/BUILD.gn | 4 ++-- + components/bookmarks/browser/BUILD.gn | 3 ++- + components/cdm/browser/BUILD.gn | 5 +++-- + components/cdm/common/BUILD.gn | 3 ++- + components/cdm/renderer/BUILD.gn | 3 ++- + components/collaboration/internal/BUILD.gn | 3 ++- + .../content_settings/core/browser/BUILD.gn | 5 +++-- + .../content_settings_default_provider.cc | 4 ++++ + .../browser/content_settings_pref_provider.cc | 4 ++++ + .../browser/permission_settings_registry.cc | 4 ++-- + .../content_settings/core/common/BUILD.gn | 5 +++-- + .../content_settings/core/test/BUILD.gn | 4 +++- + components/data_sharing/internal/BUILD.gn | 3 ++- + .../data_sharing_network_loader_impl.cc | 4 ++++ + components/dom_distiller/core/BUILD.gn | 4 +++- + components/domain_reliability/BUILD.gn | 6 +++-- + components/download/internal/common/BUILD.gn | 3 ++- + .../public/background_service/BUILD.gn | 3 ++- + components/download/public/common/BUILD.gn | 3 ++- + components/drive/BUILD.gn | 3 ++- + components/enterprise/BUILD.gn | 3 ++- + components/favicon/core/BUILD.gn | 4 +++- + .../feature_engagement/internal/BUILD.gn | 6 +++-- + .../feature_engagement/internal/test/BUILD.gn | 4 +++- + components/feature_engagement/public/BUILD.gn | 6 +++-- + components/feedback/BUILD.gn | 3 ++- + components/gcm_driver/BUILD.gn | 3 ++- + components/global_media_controls/BUILD.gn | 4 +++- + .../views/media_item_ui_updated_view.cc | 14 ++++++++++++ + components/guest_view/browser/BUILD.gn | 4 +++- + components/guest_view/renderer/BUILD.gn | 4 +++- + components/history/core/browser/BUILD.gn | 4 +++- + components/history_clusters/core/BUILD.gn | 3 ++- + .../core/on_device_clustering_backend.cc | 4 ++++ + components/history_embeddings/BUILD.gn | 3 ++- + components/input/BUILD.gn | 3 ++- + components/input/input_router_impl.cc | 4 ++-- + components/keyed_service/core/BUILD.gn | 3 ++- + components/lens/BUILD.gn | 3 ++- + components/leveldb_proto/BUILD.gn | 3 ++- + .../internal/proto_leveldb_wrapper.cc | 6 +++++ + components/live_caption/BUILD.gn | 3 ++- + components/lookalikes/core/BUILD.gn | 7 +++--- + components/media_message_center/BUILD.gn | 4 +++- + components/media_router/common/BUILD.gn | 4 +++- + .../providers/cast/certificate/BUILD.gn | 12 +++++----- + .../common/providers/cast/channel/BUILD.gn | 3 ++- + components/metrics/BUILD.gn | 5 +++-- + components/metrics/install_date_provider.cc | 6 +++++ + components/metrics/private_metrics/BUILD.gn | 4 +++- + components/mirroring/service/BUILD.gn | 3 ++- + .../mirroring/service/mirroring_logger.cc | 4 ++++ + components/no_state_prefetch/browser/BUILD.gn | 3 ++- + .../browser/no_state_prefetch_contents.cc | 6 +++++ + components/ntp_tiles/BUILD.gn | 3 ++- + components/offline_pages/core/BUILD.gn | 3 ++- + .../offline_pages/core/background/BUILD.gn | 3 ++- + .../offline_pages/core/snapshot_controller.cc | 4 ++++ + components/omnibox/browser/BUILD.gn | 5 +++-- + .../browser/autocomplete_grouper_groups.cc | 4 ++++ + .../browser/autocomplete_grouper_sections.cc | 4 ++++ + .../omnibox/browser/autocomplete_match.cc | 4 ++++ + .../omnibox/browser/autocomplete_result.cc | 6 +++++ + .../omnibox/browser/base_search_provider.cc | 6 +++++ + .../omnibox/browser/history_url_provider.cc | 5 ++++- + .../browser/omnibox_popup_selection.cc | 4 ++++ + .../omnibox/browser/open_tab_provider.cc | 4 ++++ + .../omnibox/browser/shortcuts_provider.cc | 4 ++++ + components/optimization_guide/core/BUILD.gn | 13 ++++++----- + .../prediction_model_download_manager.cc | 2 +- + .../page_content_annotations/core/BUILD.gn | 3 ++- + .../password_manager/content/browser/BUILD.gn | 4 +++- + .../password_manager/core/browser/BUILD.gn | 7 +++--- + .../core/browser/leak_detection/BUILD.gn | 7 +++--- + .../core/browser/sync_credentials_filter.cc | 2 +- + .../password_manager/core/common/BUILD.gn | 3 ++- + components/payments/content/BUILD.gn | 10 +++++---- + components/payments/content/icon/BUILD.gn | 4 +++- + components/payments/core/BUILD.gn | 11 +++++----- + components/performance_manager/BUILD.gn | 8 ++++++- + .../decorators/page_aggregator.cc | 4 ++++ + .../decorators/page_live_state_decorator.cc | 4 ++++ + .../decorators/page_load_tracker_decorator.cc | 4 ++++ + .../decorators/process_priority_aggregator.cc | 4 ++++ + .../decorators/site_data_recorder.cc | 4 ++++ + .../decorators/tab_page_decorator.cc | 2 +- + .../frame_audible_voter.cc | 6 +++++ + .../frame_capturing_media_stream_voter.cc | 6 +++++ + .../frame_visibility_voter.cc | 4 ++++ + .../inherit_client_priority_voter.cc | 4 ++++ + .../inherit_parent_priority_voter.cc | 6 +++++ + .../loading_page_voter.cc | 4 ++++ + .../freezing/frozen_frame_aggregator.cc | 4 ++++ + .../graph/frame_node_impl_describer.cc | 4 ++++ + .../graph/process_node_impl_describer.cc | 4 ++++ + .../graph/worker_node_impl_describer.cc | 4 ++++ + .../performance_manager_registry_impl.cc | 4 ++++ + .../site_data/site_data_cache_factory.cc | 4 ++++ + .../cpu_measurement_monitor.cc | 4 ++++ + .../memory_measurement_provider.cc | 4 ++++ + components/persistent_cache/BUILD.gn | 4 +++- + .../persistent_cache_collection.cc | 4 ++++ + components/policy/content/BUILD.gn | 5 +++-- + components/policy/core/browser/BUILD.gn | 5 +++-- + .../browser/url_allowlist_policy_handler.cc | 4 ++++ + .../browser/url_blocklist_policy_handler.cc | 4 ++++ + components/policy/core/common/BUILD.gn | 9 ++++---- + .../cloud/profile_cloud_policy_manager.cc | 4 ++++ + .../cloud/profile_cloud_policy_store.cc | 4 ++++ + .../core/common/policy_proto_decoders.cc | 4 ++++ + components/prefs/BUILD.gn | 4 +++- + components/printing/browser/BUILD.gn | 4 +++- + .../safe_browsing/content/browser/BUILD.gn | 3 ++- + .../safe_browsing/core/browser/BUILD.gn | 3 ++- + components/search_engines/BUILD.gn | 3 ++- + .../security_interstitials/content/BUILD.gn | 4 +++- + .../security_interstitials/core/BUILD.gn | 4 +++- + .../core/https_only_mode_allowlist.cc | 4 ++++ + components/security_state/content/BUILD.gn | 4 +++- + components/security_state/core/BUILD.gn | 6 +++-- + .../segmentation_platform/internal/BUILD.gn | 3 ++- + .../selection/result_refresh_manager.cc | 4 ++++ + .../services/app_service/public/cpp/BUILD.gn | 4 +++- + .../app_service/public/cpp/permission.cc | 4 ++++ + components/sessions/BUILD.gn | 5 +++-- + components/signin/core/browser/BUILD.gn | 3 ++- + components/storage_monitor/BUILD.gn | 3 ++- + .../content/browser/BUILD.gn | 3 ++- + .../subresource_filter/core/common/BUILD.gn | 3 ++- + .../supervised_user/core/browser/BUILD.gn | 3 ++- + ...ds_chrome_management_url_checker_client.cc | 4 ++++ + .../browser/supervised_user_preferences.cc | 4 ++++ + components/sync/BUILD.gn | 1 + + components/sync/base/BUILD.gn | 3 ++- + components/sync/engine/BUILD.gn | 4 +++- + components/sync/model/BUILD.gn | 4 +++- + components/sync/nigori/BUILD.gn | 4 +++- + components/sync/nigori/nigori_state.cc | 4 ++++ + components/sync/protocol/BUILD.gn | 3 ++- + components/sync/service/BUILD.gn | 3 ++- + ...sync_session_durations_metrics_recorder.cc | 6 +++++ + ...sync_session_durations_metrics_recorder.cc | 6 +++++ + components/sync_device_info/BUILD.gn | 3 ++- + components/sync_sessions/BUILD.gn | 4 +++- + .../sync_sessions/session_sync_bridge.cc | 4 ++++ + components/sync_user_events/BUILD.gn | 4 +++- + components/translate/core/browser/BUILD.gn | 3 ++- + components/trusted_vault/BUILD.gn | 4 +++- + components/ui_devtools/BUILD.gn | 3 ++- + components/ukm/BUILD.gn | 3 ++- + components/unexportable_keys/BUILD.gn | 4 +++- + components/update_client/BUILD.gn | 3 ++- + components/update_client/op_zucchini.cc | 10 +++++++++ + components/url_formatter/BUILD.gn | 7 +++--- + components/variations/BUILD.gn | 3 ++- + .../child_process_field_trial_syncer.cc | 4 ++++ + .../variations/variations_ids_provider.cc | 4 ++++ + components/web_package/BUILD.gn | 3 ++- + components/webauthn/content/browser/BUILD.gn | 4 +++- + components/webcrypto/BUILD.gn | 3 ++- + components/webcrypto/algorithms/aes.cc | 4 ++++ + components/webcrypto/algorithms/aes_cbc.cc | 4 ++++ + components/webcrypto/algorithms/ed25519.cc | 6 +++++ + components/webcrypto/algorithms/pbkdf2.cc | 4 ++++ + components/webcrypto/algorithms/rsa.cc | 4 ++++ + components/webcrypto/algorithms/x25519.cc | 4 ++++ + components/wifi/BUILD.gn | 6 +++-- + components/zucchini/BUILD.gn | 3 ++- + .../protoc_plugins/util/writer.py | 3 +++ + .../test_sample_json_converter.h.golden | 3 +++ + 197 files changed, 731 insertions(+), 159 deletions(-) diff --git a/components/affiliations/core/browser/BUILD.gn b/components/affiliations/core/browser/BUILD.gn -index e6556a7300..e8f9cb027d 100644 +index 90df14a320..7739e8f601 100644 --- a/components/affiliations/core/browser/BUILD.gn +++ b/components/affiliations/core/browser/BUILD.gn @@ -2,6 +2,7 @@ @@ -208,8 +349,63 @@ index e6556a7300..e8f9cb027d 100644 sources = [ "affiliation_backend.cc", "affiliation_backend.h", +diff --git a/components/assist_ranker/BUILD.gn b/components/assist_ranker/BUILD.gn +index e2006de1e9..77062f3150 100644 +--- a/components/assist_ranker/BUILD.gn ++++ b/components/assist_ranker/BUILD.gn +@@ -2,7 +2,9 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-static_library("assist_ranker") { ++import("//build/config/jumbo.gni") ++ ++jumbo_static_library("assist_ranker") { + sources = [ + "assist_ranker_service.h", + "assist_ranker_service_impl.cc", +diff --git a/components/attribution_reporting/BUILD.gn b/components/attribution_reporting/BUILD.gn +index 12d7532590..3078e8c947 100644 +--- a/components/attribution_reporting/BUILD.gn ++++ b/components/attribution_reporting/BUILD.gn +@@ -2,6 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + import("//mojo/public/tools/bindings/mojom.gni") + import("//testing/test.gni") + +@@ -37,7 +38,7 @@ component("features") { + defines = [ "IS_ATTRIBUTION_REPORTING_FEATURES_IMPL" ] + } + +-component("attribution_reporting") { ++jumbo_component("attribution_reporting") { + sources = [ + "aggregatable_debug_reporting_config.cc", + "aggregatable_debug_reporting_config.h", +diff --git a/components/attribution_reporting/aggregatable_trigger_data.cc b/components/attribution_reporting/aggregatable_trigger_data.cc +index 1f4d357f36..09fefcb74c 100644 +--- a/components/attribution_reporting/aggregatable_trigger_data.cc ++++ b/components/attribution_reporting/aggregatable_trigger_data.cc +@@ -20,6 +20,8 @@ + #include "components/attribution_reporting/trigger_registration_error.mojom.h" + #include "third_party/abseil-cpp/absl/numeric/int128.h" + ++#define ParseKeyPiece ParseKeyPiece_AggregatableTriggerData ++ + namespace attribution_reporting { + + namespace { +@@ -129,3 +131,5 @@ base::Value::Dict AggregatableTriggerData::ToJson() const { + } + + } // namespace attribution_reporting ++ ++#undef ParseKeyPiece diff --git a/components/autofill/content/browser/BUILD.gn b/components/autofill/content/browser/BUILD.gn -index 903cad0821..e054941146 100644 +index 89e8a27d58..8ec7d3fc3c 100644 --- a/components/autofill/content/browser/BUILD.gn +++ b/components/autofill/content/browser/BUILD.gn @@ -2,13 +2,14 @@ @@ -229,7 +425,7 @@ index 903cad0821..e054941146 100644 "autofill_log_router_factory.cc", "autofill_log_router_factory.h", diff --git a/components/autofill/content/renderer/BUILD.gn b/components/autofill/content/renderer/BUILD.gn -index 1e51b2a0c1..ddc10f47d4 100644 +index 8271bf352b..b8355bd4dd 100644 --- a/components/autofill/content/renderer/BUILD.gn +++ b/components/autofill/content/renderer/BUILD.gn @@ -2,7 +2,9 @@ @@ -264,10 +460,10 @@ index 1e51b2a0c1..ddc10f47d4 100644 sources = [ "autofill_agent_test_api.h", diff --git a/components/autofill/content/renderer/form_tracker.cc b/components/autofill/content/renderer/form_tracker.cc -index 26fde50223..c0774c5d5b 100644 +index 013921d85e..df5c5bdb22 100644 --- a/components/autofill/content/renderer/form_tracker.cc +++ b/components/autofill/content/renderer/form_tracker.cc -@@ -35,6 +35,8 @@ using blink::WebFormControlElement; +@@ -36,6 +36,8 @@ using blink::WebFormControlElement; using blink::WebFormElement; using blink::WebInputElement; @@ -276,17 +472,17 @@ index 26fde50223..c0774c5d5b 100644 namespace autofill { namespace { -@@ -534,3 +536,5 @@ void FormTracker::ElementWasHiddenOrRemoved(mojom::SubmissionSource source) { +@@ -533,3 +535,5 @@ void FormTracker::ElementWasHiddenOrRemoved(mojom::SubmissionSource source) { } } // namespace autofill + +#undef kSubmissionSourceHistogram diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/components/autofill/content/renderer/password_autofill_agent.cc -index dbbb6ebd13..4f5ad40103 100644 +index dafb672153..e2a9cdac9d 100644 --- a/components/autofill/content/renderer/password_autofill_agent.cc +++ b/components/autofill/content/renderer/password_autofill_agent.cc -@@ -99,6 +99,8 @@ using blink::WebView; +@@ -98,6 +98,8 @@ using blink::WebView; using password_manager::util::IsRendererRecognizedCredentialForm; @@ -295,34 +491,34 @@ index dbbb6ebd13..4f5ad40103 100644 namespace autofill { namespace { -@@ -2437,3 +2439,5 @@ void PasswordAutofillAgent::MaybeTriggerSuggestionsOnFocusedElement( +@@ -2430,3 +2432,5 @@ void PasswordAutofillAgent::MaybeTriggerSuggestionsOnFocusedElement( } } // namespace autofill + +#undef kSubmissionSourceHistogram diff --git a/components/autofill/core/browser/BUILD.gn b/components/autofill/core/browser/BUILD.gn -index b637152c86..f475869e02 100644 +index 778d9f89cc..57520bcb14 100644 --- a/components/autofill/core/browser/BUILD.gn +++ b/components/autofill/core/browser/BUILD.gn -@@ -5,6 +5,7 @@ - import("//build/buildflag_header.gni") +@@ -6,6 +6,7 @@ import("//build/buildflag_header.gni") + import("//build/compiled_action.gni") import("//build/config/chrome_build.gni") import("//build/config/features.gni") +import("//build/config/jumbo.gni") import("//components/optimization_guide/features.gni") import("//testing/libfuzzer/fuzzer_test.gni") import("//third_party/protobuf/proto_library.gni") -@@ -74,7 +75,7 @@ proto_library("amount_extraction_heuristic_regexes_proto") { +@@ -105,7 +106,7 @@ proto_library("amount_extraction_heuristic_regexes_proto") { sources = [ "payments/amount_extraction_heuristic_regexes.proto" ] } -static_library("browser") { +jumbo_static_library("browser") { sources = [ - "autofill_browser_util.cc", - "autofill_browser_util.h", -@@ -941,7 +942,7 @@ static_library("browser") { + "autofill_ai_form_rationalization.cc", + "autofill_ai_form_rationalization.h", +@@ -1068,7 +1069,7 @@ static_library("browser") { } } @@ -331,8 +527,8 @@ index b637152c86..f475869e02 100644 sources = [ "payments/legal_message_line.cc", "payments/legal_message_line.h", -@@ -955,7 +956,7 @@ static_library("legal_message_line") { - configs += [ "//build/config/compiler:wexit_time_destructors" ] +@@ -1095,7 +1096,7 @@ source_set("payments_sync_utils") { + ] } -static_library("test_support") { @@ -340,11 +536,49 @@ index b637152c86..f475869e02 100644 testonly = true sources = [ "crowdsourcing/autofill_crowdsourcing_manager_test_api.h", +diff --git a/components/autofill/core/browser/data_manager/autofill_ai/entity_instance_cleaner.cc b/components/autofill/core/browser/data_manager/autofill_ai/entity_instance_cleaner.cc +index 4080e51473..d750d60315 100644 +--- a/components/autofill/core/browser/data_manager/autofill_ai/entity_instance_cleaner.cc ++++ b/components/autofill/core/browser/data_manager/autofill_ai/entity_instance_cleaner.cc +@@ -19,6 +19,8 @@ + #include "components/sync/service/sync_service.h" + #include "components/sync/service/sync_user_settings.h" + ++#define ShouldWaitForSync ShouldWaitForSync_EntityInstanceCleaner ++ + namespace autofill { + + namespace { +@@ -130,3 +132,5 @@ void EntityInstanceCleaner::OnSyncShutdown(syncer::SyncService* sync_service) { + } + + } // namespace autofill ++ ++#undef ShouldWaitForSync +diff --git a/components/autofill/core/browser/data_model/addresses/autofill_profile_comparator.cc b/components/autofill/core/browser/data_model/addresses/autofill_profile_comparator.cc +index 37a31e4563..2eef25f09d 100644 +--- a/components/autofill/core/browser/data_model/addresses/autofill_profile_comparator.cc ++++ b/components/autofill/core/browser/data_model/addresses/autofill_profile_comparator.cc +@@ -33,6 +33,8 @@ + + using i18n::phonenumbers::PhoneNumberUtil; + ++#define kSpace kSpace_AutofillProfileComparator ++ + namespace autofill { + namespace { + +@@ -583,3 +585,5 @@ bool AutofillProfileComparator::HaveMergeableAddresses( + } + + } // namespace autofill ++ ++#undef kSpace diff --git a/components/autofill/core/browser/data_model/addresses/autofill_structured_address_name.cc b/components/autofill/core/browser/data_model/addresses/autofill_structured_address_name.cc -index abd103ab01..23d7455a25 100644 +index d82be758ae..b03ad7f640 100644 --- a/components/autofill/core/browser/data_model/addresses/autofill_structured_address_name.cc +++ b/components/autofill/core/browser/data_model/addresses/autofill_structured_address_name.cc -@@ -30,8 +30,9 @@ std::u16string ReduceToInitials(const std::u16string& value) { +@@ -31,8 +31,9 @@ std::u16string ReduceToInitials(const std::u16string& value) { return std::u16string(); } @@ -356,10 +590,10 @@ index abd103ab01..23d7455a25 100644 base::SplitResult::SPLIT_WANT_NONEMPTY); diff --git a/components/autofill/core/browser/payments/multiple_request_payments_network_interface_base.cc b/components/autofill/core/browser/payments/multiple_request_payments_network_interface_base.cc -index 804fa48434..a8debd868e 100644 +index 202dc3fefa..6d9f6bc2c6 100644 --- a/components/autofill/core/browser/payments/multiple_request_payments_network_interface_base.cc +++ b/components/autofill/core/browser/payments/multiple_request_payments_network_interface_base.cc -@@ -29,6 +29,10 @@ +@@ -32,6 +32,10 @@ #include "services/network/public/cpp/simple_url_loader.h" #include "services/network/public/mojom/url_response_head.mojom.h" @@ -370,7 +604,7 @@ index 804fa48434..a8debd868e 100644 namespace autofill::payments { namespace { -@@ -381,3 +385,7 @@ void MultipleRequestPaymentsNetworkInterfaceBase::OnRequestFinished( +@@ -394,3 +398,7 @@ void MultipleRequestPaymentsNetworkInterfaceBase::OnRequestFinished( } } // namespace autofill::payments @@ -379,10 +613,10 @@ index 804fa48434..a8debd868e 100644 +#undef kPaymentsOAuth2Scope +#undef GetRequestUrl diff --git a/components/autofill/core/browser/payments/payments_network_interface_base.cc b/components/autofill/core/browser/payments/payments_network_interface_base.cc -index f9e56051af..5f64dc51c5 100644 +index 9875953a63..7ee1bc3b1e 100644 --- a/components/autofill/core/browser/payments/payments_network_interface_base.cc +++ b/components/autofill/core/browser/payments/payments_network_interface_base.cc -@@ -23,6 +23,10 @@ +@@ -27,6 +27,10 @@ #include "services/network/public/cpp/simple_url_loader.h" #include "services/network/public/mojom/url_response_head.mojom.h" @@ -393,7 +627,7 @@ index f9e56051af..5f64dc51c5 100644 namespace autofill::payments { namespace { -@@ -388,3 +392,7 @@ void PaymentsNetworkInterfaceBase::SetOAuth2TokenAndStartRequest() { +@@ -387,3 +391,7 @@ void PaymentsNetworkInterfaceBase::SetOAuth2TokenAndStartRequest() { } } // namespace autofill::payments @@ -401,11 +635,30 @@ index f9e56051af..5f64dc51c5 100644 +#undef kTokenFetchId +#undef kPaymentsOAuth2Scope +#undef GetRequestUrl +diff --git a/components/autofill/core/browser/suggestions/addresses/address_suggestion_generator.cc b/components/autofill/core/browser/suggestions/addresses/address_suggestion_generator.cc +index 5e7a5c773c..15cf232f0b 100644 +--- a/components/autofill/core/browser/suggestions/addresses/address_suggestion_generator.cc ++++ b/components/autofill/core/browser/suggestions/addresses/address_suggestion_generator.cc +@@ -63,6 +63,8 @@ + #include "ui/native_theme/native_theme.h" // nogncheck + #endif + ++#define CreateUndoOrClearFormSuggestion CreateUndoOrClearFormSuggestion_AddressSuggestionGenerator ++ + namespace autofill { + + namespace { +@@ -1030,3 +1032,5 @@ std::vector AddressSuggestionGenerator::GenerateAddressSuggestions( + } + + } // namespace autofill ++ ++#undef CreateUndoOrClearFormSuggestion diff --git a/components/autofill/core/browser/suggestions/payments/payments_suggestion_generator.cc b/components/autofill/core/browser/suggestions/payments/payments_suggestion_generator.cc -index 7c3b745dbb..e0d25a19dc 100644 +index 8fd9f6ea50..904a395eed 100644 --- a/components/autofill/core/browser/suggestions/payments/payments_suggestion_generator.cc +++ b/components/autofill/core/browser/suggestions/payments/payments_suggestion_generator.cc -@@ -58,6 +58,9 @@ +@@ -63,6 +63,9 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" @@ -415,15 +668,34 @@ index 7c3b745dbb..e0d25a19dc 100644 namespace autofill { namespace { -@@ -1728,3 +1731,6 @@ void FilterCardsToSuggestForCvcFields( - } +@@ -1819,3 +1822,6 @@ std::vector GetOrderedCardsToSuggest( } + } // namespace autofill + +#undef CreateSeparator +#undef CreateUndoOrClearFormSuggestion +diff --git a/components/autofill/core/browser/suggestions/valuables/valuable_suggestion_generator.cc b/components/autofill/core/browser/suggestions/valuables/valuable_suggestion_generator.cc +index 903049ee7a..34514a5cd1 100644 +--- a/components/autofill/core/browser/suggestions/valuables/valuable_suggestion_generator.cc ++++ b/components/autofill/core/browser/suggestions/valuables/valuable_suggestion_generator.cc +@@ -22,6 +22,8 @@ + #include "ui/gfx/image/image.h" + #include "url/gurl.h" + ++#define CreateUndoOrClearFormSuggestion CreateUndoOrClearFormSuggestion_ValuableSuggestionGenerator ++ + namespace autofill { + namespace { + +@@ -374,3 +376,5 @@ void LoyaltyCardSuggestionGenerator::GenerateSuggestions( + } + + } // namespace autofill ++ ++#undef CreateUndoOrClearFormSuggestion diff --git a/components/autofill/core/browser/ui/autofill_resource_utils.cc b/components/autofill/core/browser/ui/autofill_resource_utils.cc -index db548c5cac..86ddfdc48b 100644 +index da8953fe2d..d85da01128 100644 --- a/components/autofill/core/browser/ui/autofill_resource_utils.cc +++ b/components/autofill/core/browser/ui/autofill_resource_utils.cc @@ -16,6 +16,8 @@ @@ -435,14 +707,14 @@ index db548c5cac..86ddfdc48b 100644 namespace autofill { namespace { -@@ -104,3 +106,5 @@ int GetIconResourceID(Suggestion::Icon resource_name) { +@@ -108,3 +110,5 @@ int GetIconResourceID(Suggestion::Icon resource_name) { } } // namespace autofill + +#undef ShouldUseNewFopDisplay diff --git a/components/autofill/core/browser/webdata/addresses/address_autofill_table.cc b/components/autofill/core/browser/webdata/addresses/address_autofill_table.cc -index ff5fd522ed..581aeb73cf 100644 +index 0d96c0255f..9927640881 100644 --- a/components/autofill/core/browser/webdata/addresses/address_autofill_table.cc +++ b/components/autofill/core/browser/webdata/addresses/address_autofill_table.cc @@ -30,6 +30,13 @@ @@ -459,7 +731,7 @@ index ff5fd522ed..581aeb73cf 100644 namespace autofill { namespace { -@@ -1207,3 +1214,10 @@ bool AddressAutofillTable::Dropper::MigrateToVersion( +@@ -1227,3 +1234,10 @@ bool AddressAutofillTable::Dropper::MigrateToVersion( } } // namespace autofill @@ -471,7 +743,7 @@ index ff5fd522ed..581aeb73cf 100644 +#undef kUseDate +#undef kDateModified diff --git a/components/autofill/core/browser/webdata/addresses/autofill_profile_sync_util.cc b/components/autofill/core/browser/webdata/addresses/autofill_profile_sync_util.cc -index db2912f379..307ffdd5ef 100644 +index f00c84e025..230096d43e 100644 --- a/components/autofill/core/browser/webdata/addresses/autofill_profile_sync_util.cc +++ b/components/autofill/core/browser/webdata/addresses/autofill_profile_sync_util.cc @@ -20,6 +20,9 @@ @@ -484,7 +756,7 @@ index db2912f379..307ffdd5ef 100644 namespace autofill { namespace { -@@ -672,3 +675,6 @@ std::string GetStorageKeyFromAutofillProfileSpecifics( +@@ -699,3 +702,6 @@ std::string GetStorageKeyFromAutofillProfileSpecifics( } } // namespace autofill @@ -492,10 +764,10 @@ index db2912f379..307ffdd5ef 100644 +#undef ConvertSpecificsToProfileVerificationStatus +#undef ConvertProfileToSpecificsVerificationStatus diff --git a/components/autofill/core/browser/webdata/addresses/contact_info_sync_util.cc b/components/autofill/core/browser/webdata/addresses/contact_info_sync_util.cc -index d1156aeb91..63464bcc28 100644 +index e7807feee4..5788b99e8b 100644 --- a/components/autofill/core/browser/webdata/addresses/contact_info_sync_util.cc +++ b/components/autofill/core/browser/webdata/addresses/contact_info_sync_util.cc -@@ -15,6 +15,9 @@ +@@ -16,6 +16,9 @@ #include "components/autofill/core/browser/geo/country_names.h" #include "components/autofill/core/common/autofill_features.h" @@ -505,7 +777,7 @@ index d1156aeb91..63464bcc28 100644 namespace autofill { namespace { -@@ -598,3 +601,6 @@ sync_pb::ContactInfoSpecifics TrimContactInfoSpecificsDataForCaching( +@@ -597,3 +600,6 @@ sync_pb::ContactInfoSpecifics TrimContactInfoSpecificsDataForCaching( } } // namespace autofill @@ -533,11 +805,48 @@ index a6e3eea465..d06df2b791 100644 + +#undef kValue +#undef GetKey +diff --git a/components/autofill/core/browser/webdata/autocomplete/autocomplete_table_label_sensitive.cc b/components/autofill/core/browser/webdata/autocomplete/autocomplete_table_label_sensitive.cc +index f70c8b2f96..cb362a5698 100644 +--- a/components/autofill/core/browser/webdata/autocomplete/autocomplete_table_label_sensitive.cc ++++ b/components/autofill/core/browser/webdata/autocomplete/autocomplete_table_label_sensitive.cc +@@ -32,6 +32,17 @@ + #include "third_party/icu/source/common/unicode/unistr.h" + #include "third_party/icu/source/common/unicode/utypes.h" + ++#define kName kName_AutocompleteTableLabelSensitive ++#define kLabel kLabel_AutocompleteTableLabelSensitive ++#define kValue kValue_AutocompleteTableLabelSensitive ++#define kValueLower kValueLower_AutocompleteTableLabelSensitive ++#define kDateCreated kDateCreated_AutocompleteTableLabelSensitive ++#define kDateLastUsed kDateLastUsed_AutocompleteTableLabelSensitive ++#define kCount kCount_AutocompleteTableLabelSensitive ++#define AutocompleteUpdate AutocompleteUpdate_AutocompleteTableLabelSensitive ++#define GetEndTime GetEndTime_AutocompleteTableLabelSensitive ++#define GetKey GetKey_AutocompleteTableLabelSensitive ++ + namespace autofill { + + namespace { +@@ -502,3 +513,14 @@ bool AutocompleteTableLabelSensitive::InitMainTable() { + } + + } // namespace autofill ++ ++#undef kName ++#undef kLabel ++#undef kValue ++#undef kValueLower ++#undef kDateCreated ++#undef kDateLastUsed ++#undef kCount ++#undef AutocompleteUpdate ++#undef GetEndTime ++#undef GetKey diff --git a/components/autofill/core/browser/webdata/autofill_ai/entity_table.cc b/components/autofill/core/browser/webdata/autofill_ai/entity_table.cc -index 99effb8602..a01d068ab6 100644 +index 583f311658..a74c8314de 100644 --- a/components/autofill/core/browser/webdata/autofill_ai/entity_table.cc +++ b/components/autofill/core/browser/webdata/autofill_ai/entity_table.cc -@@ -30,6 +30,8 @@ +@@ -34,6 +34,8 @@ #include "sql/statement.h" #include "sql/transaction.h" @@ -546,7 +855,7 @@ index 99effb8602..a01d068ab6 100644 namespace autofill { namespace { -@@ -475,3 +477,5 @@ std::optional EntityTable::ValidateInstance( +@@ -573,3 +575,5 @@ std::optional EntityTable::ValidateInstance( } } // namespace autofill @@ -574,10 +883,10 @@ index 0e5e713651..2b226ef7b0 100644 +#undef kValue +#undef GetKey diff --git a/components/autofill/core/browser/webdata/valuables/valuable_sync_bridge.cc b/components/autofill/core/browser/webdata/valuables/valuable_sync_bridge.cc -index 715acb8a3c..22af907f1b 100644 +index e3ca5c5b6a..fa68a9baba 100644 --- a/components/autofill/core/browser/webdata/valuables/valuable_sync_bridge.cc +++ b/components/autofill/core/browser/webdata/valuables/valuable_sync_bridge.cc -@@ -21,6 +21,8 @@ +@@ -20,6 +20,8 @@ #include "components/sync/protocol/entity_data.h" #include "components/webdata/common/web_database.h" @@ -586,7 +895,7 @@ index 715acb8a3c..22af907f1b 100644 namespace autofill { namespace { -@@ -298,3 +300,5 @@ ValuablesTable* ValuableSyncBridge::GetValuablesTable() { +@@ -470,3 +472,5 @@ EntityTable* ValuableSyncBridge::GetEntityTable() { } } // namespace autofill @@ -614,7 +923,7 @@ index 981b6e83af..db7d6060c9 100644 +#undef GetKey +#undef kMerchantDomain diff --git a/components/autofill/core/common/BUILD.gn b/components/autofill/core/common/BUILD.gn -index 92f4398d3a..d493608d3e 100644 +index 7fb02cb952..1f35782a61 100644 --- a/components/autofill/core/common/BUILD.gn +++ b/components/autofill/core/common/BUILD.gn @@ -1,10 +1,10 @@ @@ -630,6 +939,23 @@ index 92f4398d3a..d493608d3e 100644 sources = [ "aliases.h", "autocomplete_parsing_util.cc", +diff --git a/components/bookmarks/browser/BUILD.gn b/components/bookmarks/browser/BUILD.gn +index 08550ce07f..313b64be5c 100644 +--- a/components/bookmarks/browser/BUILD.gn ++++ b/components/bookmarks/browser/BUILD.gn +@@ -2,10 +2,11 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + import("//build/config/ui.gni") + import("//testing/libfuzzer/fuzzer_test.gni") + +-static_library("browser") { ++jumbo_static_library("browser") { + friend = [ + ":unit_tests", + "//components/bookmarks/test", diff --git a/components/cdm/browser/BUILD.gn b/components/cdm/browser/BUILD.gn index 1d6b8c906a..a742782297 100644 --- a/components/cdm/browser/BUILD.gn @@ -694,8 +1020,29 @@ index fbe2ec2264..db4c48eb25 100644 # See //components/cdm/README.md visibility = [ "//android_webview/*", +diff --git a/components/collaboration/internal/BUILD.gn b/components/collaboration/internal/BUILD.gn +index dd0b72f87a..113f14f0b2 100644 +--- a/components/collaboration/internal/BUILD.gn ++++ b/components/collaboration/internal/BUILD.gn +@@ -2,6 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + if (is_android) { + import("//build/config/android/config.gni") + import("//build/config/android/rules.gni") +@@ -108,7 +109,7 @@ static_library("comments_internal") { + } + } + +-static_library("messaging_internal") { ++jumbo_static_library("messaging_internal") { + sources = [ + "messaging/configuration.cc", + "messaging/configuration.h", diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn -index f594e7c9e0..a383c4f6fe 100644 +index 862c666aab..82f695e717 100644 --- a/components/content_settings/core/browser/BUILD.gn +++ b/components/content_settings/core/browser/BUILD.gn @@ -3,9 +3,10 @@ @@ -703,14 +1050,14 @@ index f594e7c9e0..a383c4f6fe 100644 import("//build/config/features.gni") +import("//build/config/jumbo.gni") - import("//ppapi/buildflags/buildflags.gni") + import("//content/public/common/features.gni") -static_library("browser") { +jumbo_static_library("browser") { sources = [ "content_settings_default_provider.cc", "content_settings_default_provider.h", -@@ -111,7 +112,7 @@ source_set("cookie_settings") { +@@ -117,7 +118,7 @@ source_set("cookie_settings") { ] } @@ -720,10 +1067,10 @@ index f594e7c9e0..a383c4f6fe 100644 sources = [ "content_settings_partitioned_origin_value_map_unittest.cc", diff --git a/components/content_settings/core/browser/content_settings_default_provider.cc b/components/content_settings/core/browser/content_settings_default_provider.cc -index 4d550b6b82..ec8b472e61 100644 +index 6898bffa23..66bf19206a 100644 --- a/components/content_settings/core/browser/content_settings_default_provider.cc +++ b/components/content_settings/core/browser/content_settings_default_provider.cc -@@ -32,6 +32,8 @@ +@@ -38,6 +38,8 @@ #include "components/prefs/scoped_user_pref_update.h" #include "url/gurl.h" @@ -732,17 +1079,17 @@ index 4d550b6b82..ec8b472e61 100644 namespace content_settings { namespace { -@@ -496,3 +498,5 @@ void DefaultProvider::RecordHistogramMetrics() { +@@ -574,3 +576,5 @@ void DefaultProvider::RecordHistogramMetrics() { } } // namespace content_settings + +#undef kBug364820109AlreadyWorkedAroundPref diff --git a/components/content_settings/core/browser/content_settings_pref_provider.cc b/components/content_settings/core/browser/content_settings_pref_provider.cc -index c7aeb13ca4..0374277c77 100644 +index 9212d9f169..c18792ec69 100644 --- a/components/content_settings/core/browser/content_settings_pref_provider.cc +++ b/components/content_settings/core/browser/content_settings_pref_provider.cc -@@ -38,6 +38,8 @@ +@@ -40,6 +40,8 @@ #include "services/tracing/public/cpp/perfetto/macros.h" #include "third_party/perfetto/protos/perfetto/trace/track_event/chrome_content_settings_event_info.pbzero.h" @@ -751,14 +1098,34 @@ index c7aeb13ca4..0374277c77 100644 namespace content_settings { namespace { -@@ -456,3 +458,5 @@ void PrefProvider::SetClockForTesting(const base::Clock* clock) { +@@ -525,3 +527,5 @@ void PrefProvider::SetClockForTesting(const base::Clock* clock) { } } // namespace content_settings + +#undef kBug364820109AlreadyWorkedAroundPref +diff --git a/components/content_settings/core/browser/permission_settings_registry.cc b/components/content_settings/core/browser/permission_settings_registry.cc +index 5d4cd56991..019aea1d25 100644 +--- a/components/content_settings/core/browser/permission_settings_registry.cc ++++ b/components/content_settings/core/browser/permission_settings_registry.cc +@@ -20,13 +20,13 @@ namespace content_settings { + namespace { + + base::LazyInstance::DestructorAtExit +- g_content_settings_registry_instance = LAZY_INSTANCE_INITIALIZER; ++ g_permission_settings_registry_instance = LAZY_INSTANCE_INITIALIZER; + + } // namespace + + // static + PermissionSettingsRegistry* PermissionSettingsRegistry::GetInstance() { +- return g_content_settings_registry_instance.Pointer(); ++ return g_permission_settings_registry_instance.Pointer(); + } + + PermissionSettingsRegistry::PermissionSettingsRegistry() diff --git a/components/content_settings/core/common/BUILD.gn b/components/content_settings/core/common/BUILD.gn -index 9220f260f9..f9e08f9f38 100644 +index 3628c17fdf..2d1c1e3e56 100644 --- a/components/content_settings/core/common/BUILD.gn +++ b/components/content_settings/core/common/BUILD.gn @@ -3,10 +3,11 @@ @@ -798,8 +1165,62 @@ index e59ecdf412..be88428ae9 100644 testonly = true sources = [ "content_settings_mock_provider.cc", +diff --git a/components/data_sharing/internal/BUILD.gn b/components/data_sharing/internal/BUILD.gn +index 69cf229f71..3562fb847f 100644 +--- a/components/data_sharing/internal/BUILD.gn ++++ b/components/data_sharing/internal/BUILD.gn +@@ -2,13 +2,14 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + if (is_android) { + import("//build/config/android/config.gni") + import("//build/config/android/rules.gni") + import("//third_party/jni_zero/jni_zero.gni") + } + +-static_library("internal") { ++jumbo_static_library("internal") { + visibility = [ + ":*", + "//chrome/browser", +diff --git a/components/data_sharing/internal/data_sharing_network_loader_impl.cc b/components/data_sharing/internal/data_sharing_network_loader_impl.cc +index c0f48ed9ef..7be94157e2 100644 +--- a/components/data_sharing/internal/data_sharing_network_loader_impl.cc ++++ b/components/data_sharing/internal/data_sharing_network_loader_impl.cc +@@ -15,6 +15,8 @@ + using endpoint_fetcher::EndpointFetcher; + using endpoint_fetcher::EndpointResponse; + ++#define kTimeout kTimeout_DataSharingNetworkLoaderImpl ++ + namespace data_sharing { + + namespace { +@@ -128,3 +130,5 @@ DataSharingNetworkLoaderImpl::GetNetworkTrafficAnnotationTag( + } + + } // namespace data_sharing ++ ++#undef kTimeout +diff --git a/components/dom_distiller/core/BUILD.gn b/components/dom_distiller/core/BUILD.gn +index 2000609c4c..4d2667e7f0 100644 +--- a/components/dom_distiller/core/BUILD.gn ++++ b/components/dom_distiller/core/BUILD.gn +@@ -2,7 +2,9 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-static_library("core") { ++import("//build/config/jumbo.gni") ++ ++jumbo_static_library("core") { + sources = [ + "article_distillation_update.cc", + "article_distillation_update.h", diff --git a/components/domain_reliability/BUILD.gn b/components/domain_reliability/BUILD.gn -index 5f37a844e9..fd404074fa 100644 +index 7a2f8ba364..a3ded3eb6f 100644 --- a/components/domain_reliability/BUILD.gn +++ b/components/domain_reliability/BUILD.gn @@ -2,6 +2,8 @@ @@ -830,7 +1251,7 @@ index 5f37a844e9..fd404074fa 100644 sources = [ "config_unittest.cc", diff --git a/components/download/internal/common/BUILD.gn b/components/download/internal/common/BUILD.gn -index 3d5f34cb0b..36a4a07973 100644 +index b97f5f0814..46045e0e19 100644 --- a/components/download/internal/common/BUILD.gn +++ b/components/download/internal/common/BUILD.gn @@ -2,6 +2,7 @@ @@ -850,8 +1271,28 @@ index 3d5f34cb0b..36a4a07973 100644 visibility = [ ":for_tests", "//components/download/public/common:public", +diff --git a/components/download/public/background_service/BUILD.gn b/components/download/public/background_service/BUILD.gn +index f5b1cb64a8..6d725c1889 100644 +--- a/components/download/public/background_service/BUILD.gn ++++ b/components/download/public/background_service/BUILD.gn +@@ -3,13 +3,14 @@ + # found in the LICENSE file. + + import("//build/config/features.gni") ++import("//build/config/jumbo.gni") + + if (is_android) { + import("//build/config/android/config.gni") + import("//build/config/android/rules.gni") + } + +-component("public") { ++jumbo_component("public") { + defines = [ "IS_COMPONENTS_DOWNLOAD_PUBLIC_BACKGROUND_SERVICE_IMPL" ] + + sources = [ diff --git a/components/download/public/common/BUILD.gn b/components/download/public/common/BUILD.gn -index 62e2c75bea..e860ede5d3 100644 +index cb4b26aff5..2908e9097c 100644 --- a/components/download/public/common/BUILD.gn +++ b/components/download/public/common/BUILD.gn @@ -2,6 +2,7 @@ @@ -871,8 +1312,55 @@ index 62e2c75bea..e860ede5d3 100644 sources = [ "all_download_event_notifier.h", "base_file.h", +diff --git a/components/drive/BUILD.gn b/components/drive/BUILD.gn +index b03770e3a0..28644ffde4 100644 +--- a/components/drive/BUILD.gn ++++ b/components/drive/BUILD.gn +@@ -2,9 +2,10 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + import("//third_party/protobuf/proto_library.gni") + +-component("drive") { ++jumbo_component("drive") { + defines = [ "COMPONENTS_DRIVE_IMPLEMENTATION" ] + + sources = [ +diff --git a/components/enterprise/BUILD.gn b/components/enterprise/BUILD.gn +index 164699d3fa..6894dd1378 100644 +--- a/components/enterprise/BUILD.gn ++++ b/components/enterprise/BUILD.gn +@@ -2,9 +2,10 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + import("//components/enterprise/buildflags/buildflags.gni") + +-static_library("enterprise") { ++jumbo_static_library("enterprise") { + sources = [ + "browser/reporting/browser_report_generator.cc", + "browser/reporting/browser_report_generator.h", +diff --git a/components/favicon/core/BUILD.gn b/components/favicon/core/BUILD.gn +index a60f3430c5..1cd0f66525 100644 +--- a/components/favicon/core/BUILD.gn ++++ b/components/favicon/core/BUILD.gn +@@ -2,7 +2,9 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-static_library("core") { ++import("//build/config/jumbo.gni") ++ ++jumbo_static_library("core") { + sources = [ + "core_favicon_service.cc", + "core_favicon_service.h", diff --git a/components/feature_engagement/internal/BUILD.gn b/components/feature_engagement/internal/BUILD.gn -index 4084241bc7..396ba1e636 100644 +index 14b7fb9eb9..29ca526170 100644 --- a/components/feature_engagement/internal/BUILD.gn +++ b/components/feature_engagement/internal/BUILD.gn @@ -2,13 +2,15 @@ @@ -892,7 +1380,7 @@ index 4084241bc7..396ba1e636 100644 visibility = [ ":*", "//components/feature_engagement", -@@ -94,7 +96,7 @@ static_library("internal") { +@@ -107,7 +109,7 @@ static_library("internal") { } } @@ -917,7 +1405,7 @@ index eb975dc8f5..9421d1719a 100644 visibility = [ "//components/feature_engagement/internal:unit_tests" ] diff --git a/components/feature_engagement/public/BUILD.gn b/components/feature_engagement/public/BUILD.gn -index 1c3746c2c9..c53a09b659 100644 +index 32140190cf..d7084496a7 100644 --- a/components/feature_engagement/public/BUILD.gn +++ b/components/feature_engagement/public/BUILD.gn @@ -2,6 +2,8 @@ @@ -947,8 +1435,45 @@ index 1c3746c2c9..c53a09b659 100644 testonly = true visibility = [ "//components/feature_engagement:unit_tests" ] +diff --git a/components/feedback/BUILD.gn b/components/feedback/BUILD.gn +index 2faf25c182..4fe8aa3ca6 100644 +--- a/components/feedback/BUILD.gn ++++ b/components/feedback/BUILD.gn +@@ -3,9 +3,10 @@ + # found in the LICENSE file. + + import("//build/config/features.gni") ++import("//build/config/jumbo.gni") + import("//testing/libfuzzer/fuzzer_test.gni") + +-static_library("feedback") { ++jumbo_static_library("feedback") { + sources = [ + "features.cc", + "features.h", +diff --git a/components/gcm_driver/BUILD.gn b/components/gcm_driver/BUILD.gn +index 727e2b700e..f710134593 100644 +--- a/components/gcm_driver/BUILD.gn ++++ b/components/gcm_driver/BUILD.gn +@@ -3,6 +3,7 @@ + # found in the LICENSE file. + + import("//build/buildflag_header.gni") ++import("//build/config/jumbo.gni") + import("//components/gcm_driver/config.gni") + + buildflag_header("gcm_buildflags") { +@@ -10,7 +11,7 @@ buildflag_header("gcm_buildflags") { + flags = [ "USE_GCM_FROM_PLATFORM=$use_gcm_from_platform" ] + } + +-static_library("gcm_driver") { ++jumbo_static_library("gcm_driver") { + sources = [ + "features.cc", + "features.h", diff --git a/components/global_media_controls/BUILD.gn b/components/global_media_controls/BUILD.gn -index 85b88c042d..8f096f3832 100644 +index 3565975a1c..bb90475b47 100644 --- a/components/global_media_controls/BUILD.gn +++ b/components/global_media_controls/BUILD.gn @@ -2,7 +2,9 @@ @@ -1021,6 +1546,154 @@ index d12cd543e3..b6d9838916 100644 sources = [ "guest_view_container.cc", "guest_view_container.h", +diff --git a/components/history/core/browser/BUILD.gn b/components/history/core/browser/BUILD.gn +index e6af16d627..1c5201e86b 100644 +--- a/components/history/core/browser/BUILD.gn ++++ b/components/history/core/browser/BUILD.gn +@@ -2,6 +2,8 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") ++ + component("features") { + sources = [ + "features.cc", +@@ -16,7 +18,7 @@ component("features") { + defines = [ "IS_HISTORY_FEATURES_IMPL" ] + } + +-static_library("browser") { ++jumbo_static_library("browser") { + sources = [ + "browsing_history_driver.h", + "browsing_history_service.cc", +diff --git a/components/history_clusters/core/BUILD.gn b/components/history_clusters/core/BUILD.gn +index 22bd00604b..3547a37394 100644 +--- a/components/history_clusters/core/BUILD.gn ++++ b/components/history_clusters/core/BUILD.gn +@@ -4,9 +4,10 @@ + + import("//build/buildflag_header.gni") + import("//build/config/chrome_build.gni") ++import("//build/config/jumbo.gni") + import("//mojo/public/tools/bindings/mojom.gni") + +-static_library("core") { ++jumbo_static_library("core") { + sources = [ + "cluster_finalizer.h", + "cluster_interaction_state_processor.cc", +diff --git a/components/history_clusters/core/on_device_clustering_backend.cc b/components/history_clusters/core/on_device_clustering_backend.cc +index 555aa9ccab..0199555021 100644 +--- a/components/history_clusters/core/on_device_clustering_backend.cc ++++ b/components/history_clusters/core/on_device_clustering_backend.cc +@@ -38,6 +38,8 @@ + #include "components/site_engagement/core/site_engagement_score_provider.h" + #include "components/url_formatter/url_formatter.h" + ++#define kEngagementScoreCacheSize kEngagementScoreCacheSize_OnDeviceClusteringBackend ++ + namespace history_clusters { + + namespace { +@@ -396,3 +398,5 @@ OnDeviceClusteringBackend::GetClusterTriggerabilityOnBackgroundThread( + } + + } // namespace history_clusters ++ ++#undef kEngagementScoreCacheSize +diff --git a/components/history_embeddings/BUILD.gn b/components/history_embeddings/BUILD.gn +index b065d399c6..3bf087c937 100644 +--- a/components/history_embeddings/BUILD.gn ++++ b/components/history_embeddings/BUILD.gn +@@ -2,9 +2,10 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + import("//components/optimization_guide/features.gni") + +-static_library("history_embeddings") { ++jumbo_static_library("history_embeddings") { + sources = [ + "answerer.cc", + "answerer.h", +diff --git a/components/input/BUILD.gn b/components/input/BUILD.gn +index cfb2567c72..5f4e4eb7c1 100644 +--- a/components/input/BUILD.gn ++++ b/components/input/BUILD.gn +@@ -2,10 +2,11 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + import("//build/config/ui.gni") + import("//mojo/public/tools/bindings/mojom.gni") + +-component("input") { ++jumbo_component("input") { + defines = [ "IS_INPUT_IMPL" ] + sources = [ + "child_frame_input_helper.cc", +diff --git a/components/input/input_router_impl.cc b/components/input/input_router_impl.cc +index 8ec0b9c4de..8e691c5a72 100644 +--- a/components/input/input_router_impl.cc ++++ b/components/input/input_router_impl.cc +@@ -719,7 +719,7 @@ void InputRouterImpl::FilterAndSendWebInputEvent( + }); + bool send_touch_event = + base::FeatureList::IsEnabled( +- features::kSendEmptyGestureScrollUpdate) && ++ ::features::kSendEmptyGestureScrollUpdate) && + event->Event().GetType() == + blink::WebInputEvent::Type::kGestureScrollUpdate && + last_touch_move_event_.has_value(); +@@ -733,7 +733,7 @@ void InputRouterImpl::FilterAndSendWebInputEvent( + } + } else { + bool store_touch_move_event = +- base::FeatureList::IsEnabled(features::kSendEmptyGestureScrollUpdate) && ++ base::FeatureList::IsEnabled(::features::kSendEmptyGestureScrollUpdate) && + event->Event().GetType() == blink::WebInputEvent::Type::kTouchMove; + bool dispatch_last_event = + store_touch_move_event && last_touch_move_event_.has_value(); +diff --git a/components/keyed_service/core/BUILD.gn b/components/keyed_service/core/BUILD.gn +index 3ecedd2080..266f2baf89 100644 +--- a/components/keyed_service/core/BUILD.gn ++++ b/components/keyed_service/core/BUILD.gn +@@ -4,8 +4,9 @@ + + import("//build/buildflag_header.gni") + import("//build/config/features.gni") ++import("//build/config/jumbo.gni") + +-component("core") { ++jumbo_component("core") { + output_name = "keyed_service_core" + sources = [ + "dependency_graph.cc", +diff --git a/components/lens/BUILD.gn b/components/lens/BUILD.gn +index 08748c24b2..1e83f55272 100644 +--- a/components/lens/BUILD.gn ++++ b/components/lens/BUILD.gn +@@ -3,6 +3,7 @@ + # found in the LICENSE file. + + import("//build/buildflag_header.gni") ++import("//build/config/jumbo.gni") + import("//components/lens/features.gni") + import("//mojo/public/tools/bindings/mojom.gni") + import("//pdf/features.gni") +@@ -16,7 +17,7 @@ buildflag_header("buildflags") { + ] + } + +-static_library("lens") { ++jumbo_static_library("lens") { + sources = [ + "contextual_input.cc", + "contextual_input.h", diff --git a/components/leveldb_proto/BUILD.gn b/components/leveldb_proto/BUILD.gn index 61c6c9630a..cc3338df60 100644 --- a/components/leveldb_proto/BUILD.gn @@ -1042,10 +1715,10 @@ index 61c6c9630a..cc3338df60 100644 "internal/leveldb_database.cc", "internal/leveldb_database.h", diff --git a/components/leveldb_proto/internal/proto_leveldb_wrapper.cc b/components/leveldb_proto/internal/proto_leveldb_wrapper.cc -index e5e1fb41c3..1f27b267ff 100644 +index 0edf01631e..ddf01a5b64 100644 --- a/components/leveldb_proto/internal/proto_leveldb_wrapper.cc +++ b/components/leveldb_proto/internal/proto_leveldb_wrapper.cc -@@ -14,6 +14,9 @@ +@@ -15,6 +15,9 @@ #include "components/leveldb_proto/internal/proto_leveldb_wrapper_metrics.h" #include "components/leveldb_proto/public/proto_database.h" @@ -1055,15 +1728,32 @@ index e5e1fb41c3..1f27b267ff 100644 namespace leveldb_proto { namespace { -@@ -423,3 +426,6 @@ ProtoLevelDBWrapper::task_runner() { +@@ -424,3 +427,6 @@ ProtoLevelDBWrapper::task_runner() { } } // namespace leveldb_proto + +#undef UpdateEntriesFromTaskRunner +#undef UpdateEntriesWithRemoveFilterFromTaskRunner +diff --git a/components/live_caption/BUILD.gn b/components/live_caption/BUILD.gn +index 9964868b34..59d654389c 100644 +--- a/components/live_caption/BUILD.gn ++++ b/components/live_caption/BUILD.gn +@@ -2,10 +2,11 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + import("//build/config/ui.gni") + + if (!is_android && !is_ios) { +- static_library("live_caption") { ++ jumbo_static_library("live_caption") { + sources = [ + "caption_bubble_context.h", + "caption_bubble_context_remote.cc", diff --git a/components/lookalikes/core/BUILD.gn b/components/lookalikes/core/BUILD.gn -index f94ade81ca..b59e9d626a 100644 +index 0cbdecaea2..c23c326089 100644 --- a/components/lookalikes/core/BUILD.gn +++ b/components/lookalikes/core/BUILD.gn @@ -2,10 +2,11 @@ @@ -1097,8 +1787,38 @@ index f94ade81ca..b59e9d626a 100644 testonly = true sources = [ "lookalike_url_util_unittest.cc", +diff --git a/components/media_message_center/BUILD.gn b/components/media_message_center/BUILD.gn +index 1759277e53..a4124a1390 100644 +--- a/components/media_message_center/BUILD.gn ++++ b/components/media_message_center/BUILD.gn +@@ -2,7 +2,9 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-component("media_message_center") { ++import("//build/config/jumbo.gni") ++ ++jumbo_component("media_message_center") { + sources = [ + "media_controls_progress_view.cc", + "media_controls_progress_view.h", +diff --git a/components/media_router/common/BUILD.gn b/components/media_router/common/BUILD.gn +index 4a33857f65..a637c2596d 100644 +--- a/components/media_router/common/BUILD.gn ++++ b/components/media_router/common/BUILD.gn +@@ -2,7 +2,9 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-static_library("common") { ++import("//build/config/jumbo.gni") ++ ++jumbo_static_library("common") { + sources = [ + # media_sink_internal needs to be included with Android due to typemapping. + # Ideally, Android shouldn't be the case since it does not use Mojo for diff --git a/components/media_router/common/providers/cast/certificate/BUILD.gn b/components/media_router/common/providers/cast/certificate/BUILD.gn -index 02ca68bf87..c97e32a113 100644 +index 2927e047c8..e1edefe105 100644 --- a/components/media_router/common/providers/cast/certificate/BUILD.gn +++ b/components/media_router/common/providers/cast/certificate/BUILD.gn @@ -2,7 +2,9 @@ @@ -1148,8 +1868,29 @@ index 02ca68bf87..c97e32a113 100644 testonly = true sources = [ "cast_cert_validator_unittest.cc", +diff --git a/components/media_router/common/providers/cast/channel/BUILD.gn b/components/media_router/common/providers/cast/channel/BUILD.gn +index 10efd31eac..badca146f6 100644 +--- a/components/media_router/common/providers/cast/channel/BUILD.gn ++++ b/components/media_router/common/providers/cast/channel/BUILD.gn +@@ -2,6 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + import("//testing/libfuzzer/fuzzer_test.gni") + import("//third_party/libprotobuf-mutator/fuzzable_proto_library.gni") + import("//third_party/openscreen/src/build_overrides/data_headers_template.gni") +@@ -12,7 +13,7 @@ source_set("capability") { + deps = [ "//base" ] + } + +-static_library("channel") { ++jumbo_static_library("channel") { + sources = [ + "cast_auth_util.cc", + "cast_auth_util.h", diff --git a/components/metrics/BUILD.gn b/components/metrics/BUILD.gn -index 21f19c3e2c..a80bc8b9a2 100644 +index 687c1f99c4..c8df6de24c 100644 --- a/components/metrics/BUILD.gn +++ b/components/metrics/BUILD.gn @@ -4,6 +4,7 @@ @@ -1160,7 +1901,7 @@ index 21f19c3e2c..a80bc8b9a2 100644 import("//testing/test.gni") import("//tools/grit/grit_rule.gni") -@@ -148,7 +149,7 @@ if (!is_cronet_build || is_ios) { +@@ -143,7 +144,7 @@ if (!is_cronet_build || is_ios) { } } @@ -1168,8 +1909,8 @@ index 21f19c3e2c..a80bc8b9a2 100644 + jumbo_static_library("metrics") { sources = [ "call_stacks/call_stack_profile_metrics_provider.cc", - "call_stacks/call_stack_profile_metrics_provider.h", -@@ -345,7 +346,7 @@ if (!is_cronet_build || is_ios) { + "child_histogram_fetcher_impl.cc", +@@ -347,7 +348,7 @@ if (!is_cronet_build || is_ios) { } } @@ -1199,23 +1940,179 @@ index 925da2a15e..56d3e83490 100644 + +#undef ReadInstallDate +#undef RoundSecondsToHour -diff --git a/components/metrics/metrics_log.cc b/components/metrics/metrics_log.cc -index f04294ce6d..67121dad5e 100644 ---- a/components/metrics/metrics_log.cc -+++ b/components/metrics/metrics_log.cc -@@ -372,8 +372,8 @@ void MetricsLog::RecordCoreSystemProfile(MetricsServiceClient* client, - // Exclude these switches which are very frequently on the command line but - // serve no meaningful purpose. - static const char* const kSwitchesToFilter[] = { -- switches::kFlagSwitchesBegin, -- switches::kFlagSwitchesEnd, -+ ::switches::kFlagSwitchesBegin, -+ ::switches::kFlagSwitchesEnd, - }; +diff --git a/components/metrics/private_metrics/BUILD.gn b/components/metrics/private_metrics/BUILD.gn +index 5f5e2990a1..ab8269c878 100644 +--- a/components/metrics/private_metrics/BUILD.gn ++++ b/components/metrics/private_metrics/BUILD.gn +@@ -2,6 +2,8 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. - for (const char* filter_switch : kSwitchesToFilter) ++import("//build/config/jumbo.gni") ++ + component("dwa_recorder") { + sources = [ + "//components/metrics/dwa/dwa_recorder.cc", +@@ -29,7 +31,7 @@ component("private_metrics_recorder") { + } + + # TODO(crbug.com/433729993): Build dwa static library under private_metrics static library. +-static_library("private_metrics") { ++jumbo_static_library("private_metrics") { + sources = [ + "//components/metrics/dwa/dwa_entry_builder.cc", + "//components/metrics/dwa/dwa_entry_builder.h", +diff --git a/components/mirroring/service/BUILD.gn b/components/mirroring/service/BUILD.gn +index 20a2c0bda7..f89f611595 100644 +--- a/components/mirroring/service/BUILD.gn ++++ b/components/mirroring/service/BUILD.gn +@@ -2,10 +2,11 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + import("//testing/test.gni") + import("//third_party/libaom/options.gni") + +-component("mirroring_service") { ++jumbo_component("mirroring_service") { + sources = [ + "captured_audio_input.cc", + "captured_audio_input.h", +diff --git a/components/mirroring/service/mirroring_logger.cc b/components/mirroring/service/mirroring_logger.cc +index c0a89b6206..8bfcbc4e2a 100644 +--- a/components/mirroring/service/mirroring_logger.cc ++++ b/components/mirroring/service/mirroring_logger.cc +@@ -12,6 +12,8 @@ + #include "base/strings/stringprintf.h" + #include "components/mirroring/mojom/session_observer.mojom.h" + ++#define kLogPrefix kLogPrefix_MirroringLogger ++ + namespace mirroring { + + constexpr char kLogPrefix[] = "mirroring."; +@@ -78,3 +80,5 @@ void MirroringLogger::LogErrorInternal(const std::string& message) { + } + + } // namespace mirroring ++ ++#undef kLogPrefix +diff --git a/components/no_state_prefetch/browser/BUILD.gn b/components/no_state_prefetch/browser/BUILD.gn +index a080009cd3..e3f45b14b1 100644 +--- a/components/no_state_prefetch/browser/BUILD.gn ++++ b/components/no_state_prefetch/browser/BUILD.gn +@@ -2,9 +2,10 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + import("//components/guest_view/buildflags/buildflags.gni") + +-static_library("browser") { ++jumbo_static_library("browser") { + sources = [ + "no_state_prefetch_config.cc", + "no_state_prefetch_config.h", +diff --git a/components/no_state_prefetch/browser/no_state_prefetch_contents.cc b/components/no_state_prefetch/browser/no_state_prefetch_contents.cc +index 4b6db00e25..590cadc6cb 100644 +--- a/components/no_state_prefetch/browser/no_state_prefetch_contents.cc ++++ b/components/no_state_prefetch/browser/no_state_prefetch_contents.cc +@@ -50,6 +50,9 @@ using content::RenderFrameHost; + using content::SessionStorageNamespace; + using content::WebContents; + ++#define ToPreloadingFailureReason ToPreloadingFailureReason_NoStatePrefetchContents ++#define SetPreloadingTriggeringOutcome SetPreloadingTriggeringOutcome_NoStatePrefetchContents ++ + namespace prerender { + + class NoStatePrefetchContentsFactoryImpl +@@ -634,3 +637,6 @@ void NoStatePrefetchContents::AddNoStatePrefetchCancelerReceiver( + } + + } // namespace prerender ++ ++#undef ToPreloadingFailureReason ++#undef SetPreloadingTriggeringOutcome +diff --git a/components/ntp_tiles/BUILD.gn b/components/ntp_tiles/BUILD.gn +index 43f193bd38..ad3d42a1f1 100644 +--- a/components/ntp_tiles/BUILD.gn ++++ b/components/ntp_tiles/BUILD.gn +@@ -2,6 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + import("//components/supervised_user/buildflags.gni") + import("//extensions/buildflags/buildflags.gni") + import("//mojo/public/tools/bindings/mojom.gni") +@@ -10,7 +11,7 @@ if (is_android) { + import("//build/config/android/rules.gni") + } + +-static_library("ntp_tiles") { ++jumbo_static_library("ntp_tiles") { + sources = [ + "constants.cc", + "constants.h", +diff --git a/components/offline_pages/core/BUILD.gn b/components/offline_pages/core/BUILD.gn +index 1d702bedae..f05acd3b41 100644 +--- a/components/offline_pages/core/BUILD.gn ++++ b/components/offline_pages/core/BUILD.gn +@@ -2,11 +2,12 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + if (is_android) { + import("//build/config/android/rules.gni") + } + +-static_library("core") { ++jumbo_static_library("core") { + sources = [ + "archive_manager.cc", + "archive_manager.h", +diff --git a/components/offline_pages/core/background/BUILD.gn b/components/offline_pages/core/background/BUILD.gn +index e2ab2ec451..1a89b0a471 100644 +--- a/components/offline_pages/core/background/BUILD.gn ++++ b/components/offline_pages/core/background/BUILD.gn +@@ -2,11 +2,12 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + if (is_android) { + import("//build/config/android/rules.gni") + } + +-static_library("background_offliner") { ++jumbo_static_library("background_offliner") { + sources = [ + "change_requests_state_task.cc", + "change_requests_state_task.h", +diff --git a/components/offline_pages/core/snapshot_controller.cc b/components/offline_pages/core/snapshot_controller.cc +index e3163383fd..768aada6a2 100644 +--- a/components/offline_pages/core/snapshot_controller.cc ++++ b/components/offline_pages/core/snapshot_controller.cc +@@ -11,6 +11,8 @@ + #include "base/time/time.h" + #include "components/offline_pages/core/offline_page_feature.h" + ++#define kDelayForTests kDelayForTests_SnapshotController ++ + namespace { + // Default delay, in milliseconds, between the main document parsed event and + // snapshot. Note: this snapshot might not occur if the OnLoad event and +@@ -119,3 +121,5 @@ int64_t SnapshotController::GetDelayAfterDocumentOnLoadCompletedForTest() { + } + + } // namespace offline_pages ++ ++#undef kDelayForTests diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn -index 1746099de0..bc9c1cb8ee 100644 +index 7c5f40f9fe..b42306af46 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn @@ -4,6 +4,7 @@ @@ -1235,7 +2132,7 @@ index 1746099de0..bc9c1cb8ee 100644 sources = [ "actions/contextual_search_action.cc", "actions/contextual_search_action.h", -@@ -714,7 +715,7 @@ if (is_android) { +@@ -730,7 +731,7 @@ if (is_android) { } } @@ -1264,10 +2161,10 @@ index ac3ab6bb6c..1e4ce67663 100644 + +#undef is_android diff --git a/components/omnibox/browser/autocomplete_grouper_sections.cc b/components/omnibox/browser/autocomplete_grouper_sections.cc -index 8d3742b3c8..085bf47601 100644 +index 5b18aa4fd0..868086df19 100644 --- a/components/omnibox/browser/autocomplete_grouper_sections.cc +++ b/components/omnibox/browser/autocomplete_grouper_sections.cc -@@ -21,6 +21,8 @@ +@@ -20,6 +20,8 @@ #include "components/omnibox/common/omnibox_feature_configs.h" #include "third_party/omnibox_proto/groups.pb.h" @@ -1276,17 +2173,17 @@ index 8d3742b3c8..085bf47601 100644 namespace { constexpr size_t kMobileMostVisitedTilesLimit = 10; constexpr bool is_android = !!BUILDFLAG(IS_ANDROID); -@@ -890,3 +892,5 @@ IOSIpadWebZpsSection::IOSIpadWebZpsSection( - }), - }, - group_configs) {} +@@ -847,3 +849,5 @@ IOSLensMultimodalZpsSection::IOSLensMultimodalZpsSection( + }), + }, + group_configs) {} + +#undef is_android diff --git a/components/omnibox/browser/autocomplete_match.cc b/components/omnibox/browser/autocomplete_match.cc -index ad535382f8..12da9fed8c 100644 +index eafe5ba9ac..c4fbec2001 100644 --- a/components/omnibox/browser/autocomplete_match.cc +++ b/components/omnibox/browser/autocomplete_match.cc -@@ -69,6 +69,8 @@ +@@ -62,6 +62,8 @@ #include "components/vector_icons/vector_icons.h" // nogncheck #endif @@ -1295,17 +2192,17 @@ index ad535382f8..12da9fed8c 100644 constexpr bool kIsDesktop = !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS); constexpr bool kIsAndroid = BUILDFLAG(IS_ANDROID); -@@ -2406,3 +2408,5 @@ void AutocompleteMatch::ValidateClassifications( +@@ -2408,3 +2410,5 @@ void AutocompleteMatch::ValidateClassifications( } #endif // DCHECK_IS_ON() } + +#undef kIsDesktop diff --git a/components/omnibox/browser/autocomplete_result.cc b/components/omnibox/browser/autocomplete_result.cc -index d1026d8f7e..cc612f6940 100644 +index 78c5fac661..418da276cb 100644 --- a/components/omnibox/browser/autocomplete_result.cc +++ b/components/omnibox/browser/autocomplete_result.cc -@@ -69,6 +69,9 @@ using metrics::OmniboxEventProto; +@@ -71,6 +71,9 @@ using metrics::OmniboxEventProto; typedef AutocompleteMatchType ACMatchType; @@ -1315,7 +2212,7 @@ index d1026d8f7e..cc612f6940 100644 namespace { constexpr bool is_android = !!BUILDFLAG(IS_ANDROID); -@@ -1661,3 +1664,6 @@ std::ostream& operator<<(std::ostream& os, const AutocompleteResult& result) { +@@ -1722,3 +1725,6 @@ std::ostream& operator<<(std::ostream& os, const AutocompleteResult& result) { os << "}" << std::endl; return os; } @@ -1323,10 +2220,10 @@ index d1026d8f7e..cc612f6940 100644 +#undef is_android +#undef is_ios diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc -index 9be3080c78..cefecbd46f 100644 +index 7a0c032e34..f96b53be79 100644 --- a/components/omnibox/browser/base_search_provider.cc +++ b/components/omnibox/browser/base_search_provider.cc -@@ -44,6 +44,9 @@ +@@ -45,6 +45,9 @@ #include "url/gurl.h" #include "url/origin.h" @@ -1336,7 +2233,7 @@ index 9be3080c78..cefecbd46f 100644 namespace { constexpr bool is_android = !!BUILDFLAG(IS_ANDROID); constexpr bool is_ios = !!BUILDFLAG(IS_IOS); -@@ -789,3 +792,6 @@ void BaseSearchProvider::OnDeletionComplete( +@@ -773,3 +776,6 @@ void BaseSearchProvider::OnDeletionComplete( return loader.get() == source; }); } @@ -1364,11 +2261,11 @@ index d50b0815d2..df2633dbca 100644 + +#undef ScoringSignals diff --git a/components/omnibox/browser/omnibox_popup_selection.cc b/components/omnibox/browser/omnibox_popup_selection.cc -index 960505110b..f0a276faaa 100644 +index 943bc53e2c..8473b72ca5 100644 --- a/components/omnibox/browser/omnibox_popup_selection.cc +++ b/components/omnibox/browser/omnibox_popup_selection.cc -@@ -12,6 +12,8 @@ - #include "components/omnibox/browser/autocomplete_result.h" +@@ -14,6 +14,8 @@ + #include "components/omnibox/common/omnibox_features.h" #include "components/search_engines/template_url_service.h" +#define kIsDesktop kIsDesktop_OmniboxPopupSelection @@ -1376,14 +2273,14 @@ index 960505110b..f0a276faaa 100644 constexpr bool kIsDesktop = !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS); constexpr size_t OmniboxPopupSelection::kNoMatch = static_cast(-1); -@@ -210,3 +212,5 @@ OmniboxPopupSelection::GetAllAvailableSelectionsSorted( +@@ -255,3 +257,5 @@ OmniboxPopupSelection::GetAllAvailableSelectionsSorted( << "This algorithm depends on a sorted list of available selections."; return available_selections; } + +#undef kIsDesktop diff --git a/components/omnibox/browser/open_tab_provider.cc b/components/omnibox/browser/open_tab_provider.cc -index 0c28a4951f..539f7c82ef 100644 +index b1ba1e427e..a2f6dfbc48 100644 --- a/components/omnibox/browser/open_tab_provider.cc +++ b/components/omnibox/browser/open_tab_provider.cc @@ -32,6 +32,8 @@ @@ -1395,14 +2292,133 @@ index 0c28a4951f..539f7c82ef 100644 namespace { constexpr bool is_android = !!BUILDFLAG(IS_ANDROID); -@@ -259,3 +261,5 @@ AutocompleteMatch OpenTabProvider::CreateNullResultMessageMatch( +@@ -258,3 +260,5 @@ AutocompleteMatch OpenTabProvider::CreateNullResultMessageMatch( return match; } + +#undef is_android +diff --git a/components/omnibox/browser/shortcuts_provider.cc b/components/omnibox/browser/shortcuts_provider.cc +index 0a5934d76a..754b43b0c3 100644 +--- a/components/omnibox/browser/shortcuts_provider.cc ++++ b/components/omnibox/browser/shortcuts_provider.cc +@@ -54,6 +54,8 @@ + #include "components/history_clusters/core/config.h" // nogncheck + #endif // !BUILDFLAG(IS_IOS) + ++#define kIsDesktop kIsDesktop_ShortcutsProvider ++ + constexpr bool kIsDesktop = !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS); + + namespace { +@@ -610,3 +612,5 @@ ShortcutsBackend::ShortcutMap::const_iterator ShortcutsProvider::FindFirstMatch( + ? it + : backend->shortcuts_map().end(); + } ++ ++#undef kIsDesktop +diff --git a/components/optimization_guide/core/BUILD.gn b/components/optimization_guide/core/BUILD.gn +index d4966e6a0f..bc3f0607c4 100644 +--- a/components/optimization_guide/core/BUILD.gn ++++ b/components/optimization_guide/core/BUILD.gn +@@ -7,6 +7,7 @@ import("//mojo/public/tools/bindings/mojom.gni") + if (is_android) { + import("//build/config/android/rules.gni") + } ++import("//build/config/jumbo.gni") + import("//components/optimization_guide/features.gni") + + # bloomfilter is isolated because of the allowlisted murmurhash3 dep. +@@ -22,7 +23,7 @@ source_set("bloomfilter") { + configs += [ "//build/config/compiler:wexit_time_destructors" ] + } + +-static_library("filters") { ++jumbo_static_library("filters") { + sources = [ + "filters/hints_component_info.h", + "filters/hints_component_util.cc", +@@ -53,7 +54,7 @@ mojom("interfaces") { + public_deps = [ "//mojo/public/mojom/base" ] + } + +-component("features") { ++jumbo_component("features") { + sources = [ + "feature_registry/enterprise_policy_registry.cc", + "feature_registry/enterprise_policy_registry.h", +@@ -99,7 +100,7 @@ component("features") { + output_proto_descriptors_cc_file = "$target_gen_dir/model_execution/on_device_model_execution_proto_descriptors.cc" + output_proto_enum_templates_h_file = "$target_gen_dir/model_execution/on_device_model_execution_proto_enum_templates.h" + +-source_set("hints") { ++jumbo_source_set("hints") { + sources = [ + "hints/command_line_top_host_provider.cc", + "hints/command_line_top_host_provider.h", +@@ -154,7 +155,7 @@ source_set("hints") { + visibility = [ ":*" ] + } + +-source_set("core_util") { ++jumbo_source_set("core_util") { + sources = [ + "access_token_helper.cc", + "access_token_helper.h", +@@ -188,7 +189,7 @@ source_set("core_util") { + ] + } + +-source_set("model_execution") { ++jumbo_source_set("model_execution") { + # TODO: crbug.com/421262905 - Should not need these without model_execution + sources = [ + "model_execution/optimization_guide_model_execution_error.cc", +@@ -367,7 +368,7 @@ static_library("core") { + } + } + +-static_library("prediction") { ++jumbo_static_library("prediction") { + sources = [ + "delivery/model_enums.h", + "delivery/model_info.cc", +diff --git a/components/optimization_guide/core/delivery/prediction_model_download_manager.cc b/components/optimization_guide/core/delivery/prediction_model_download_manager.cc +index a304121919..b731b205a7 100644 +--- a/components/optimization_guide/core/delivery/prediction_model_download_manager.cc ++++ b/components/optimization_guide/core/delivery/prediction_model_download_manager.cc +@@ -196,7 +196,7 @@ bool PredictionModelDownloadManager::ShouldFetchModels() const { + } + return (switches::ShouldSkipGoogleApiKeyConfigurationCheck() || + google_apis::HasAPIKeyConfigured()) && +- local_state_->GetBoolean(prefs::kComponentUpdatesEnabled); ++ local_state_->GetBoolean(::prefs::kComponentUpdatesEnabled); + } + + void PredictionModelDownloadManager::AddObserver( +diff --git a/components/page_content_annotations/core/BUILD.gn b/components/page_content_annotations/core/BUILD.gn +index 947f68048e..995b61d1b1 100644 +--- a/components/page_content_annotations/core/BUILD.gn ++++ b/components/page_content_annotations/core/BUILD.gn +@@ -2,6 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + import("//components/optimization_guide/features.gni") + import("//testing/libfuzzer/fuzzer_test.gni") + +@@ -18,7 +19,7 @@ component("features") { + defines = [ "IS_PAGE_CONTENT_ANNOTATIONS_FEATURES_IMPL" ] + } + +-static_library("core") { ++jumbo_static_library("core") { + sources = [ + "page_content_annotation_job.cc", + "page_content_annotation_job.h", diff --git a/components/password_manager/content/browser/BUILD.gn b/components/password_manager/content/browser/BUILD.gn -index ee92615a2b..2f63f890e5 100644 +index 6b58d489e6..a145f24d34 100644 --- a/components/password_manager/content/browser/BUILD.gn +++ b/components/password_manager/content/browser/BUILD.gn @@ -2,7 +2,9 @@ @@ -1417,7 +2433,7 @@ index ee92615a2b..2f63f890e5 100644 "bad_message.cc", "bad_message.h", diff --git a/components/password_manager/core/browser/BUILD.gn b/components/password_manager/core/browser/BUILD.gn -index 4d343194b0..8fefd65872 100644 +index b8e5317ab3..604fe98bbe 100644 --- a/components/password_manager/core/browser/BUILD.gn +++ b/components/password_manager/core/browser/BUILD.gn @@ -4,6 +4,7 @@ @@ -1435,9 +2451,9 @@ index 4d343194b0..8fefd65872 100644 -static_library("browser") { +jumbo_static_library("browser") { sources = [ - "browser_credential_manager_factory.cc", - "browser_credential_manager_factory.h", -@@ -348,7 +349,7 @@ if (is_android) { + "browser_save_password_progress_logger.cc", + "browser_save_password_progress_logger.h", +@@ -357,7 +358,7 @@ if (is_android) { } } @@ -1446,7 +2462,7 @@ index 4d343194b0..8fefd65872 100644 sources = [ "password_hash_data.cc", "password_hash_data.h", -@@ -377,7 +378,7 @@ static_library("hash_password_manager") { +@@ -386,7 +387,7 @@ static_library("hash_password_manager") { configs += [ "//build/config/compiler:wexit_time_destructors" ] } @@ -1456,7 +2472,7 @@ index 4d343194b0..8fefd65872 100644 sources = [ "fake_form_fetcher.cc", diff --git a/components/password_manager/core/browser/leak_detection/BUILD.gn b/components/password_manager/core/browser/leak_detection/BUILD.gn -index 707013621e..94bd9a1c82 100644 +index 830ba7ddb5..52057ad326 100644 --- a/components/password_manager/core/browser/leak_detection/BUILD.gn +++ b/components/password_manager/core/browser/leak_detection/BUILD.gn @@ -2,6 +2,7 @@ @@ -1467,16 +2483,16 @@ index 707013621e..94bd9a1c82 100644 import("//third_party/libprotobuf-mutator/fuzzable_proto_library.gni") fuzzable_proto_library("proto") { -@@ -25,7 +26,7 @@ source_set("leak_detection_interface_headers") { +@@ -29,7 +30,7 @@ source_set("leak_detection_interface_headers") { configs += [ "//build/config/compiler:wexit_time_destructors" ] } -source_set("leak_detection") { +jumbo_source_set("leak_detection") { sources = [ - "bulk_leak_check_impl.cc", - "bulk_leak_check_impl.h", -@@ -74,7 +75,7 @@ source_set("leak_detection") { + "encryption_utils.cc", + "encryption_utils.h", +@@ -82,7 +83,7 @@ source_set("leak_detection") { configs += [ "//build/config/compiler:wexit_time_destructors" ] } @@ -1484,8 +2500,8 @@ index 707013621e..94bd9a1c82 100644 +jumbo_source_set("test_support") { testonly = true sources = [ - "mock_bulk_leak_check_service.cc", -@@ -95,7 +96,7 @@ source_set("test_support") { + "mock_leak_detection_check_factory.cc", +@@ -107,7 +108,7 @@ source_set("test_support") { ] } @@ -1493,7 +2509,7 @@ index 707013621e..94bd9a1c82 100644 +jumbo_source_set("unit_tests") { testonly = true sources = [ - "bulk_leak_check_impl_unittest.cc", + "encryption_utils_unittest.cc", diff --git a/components/password_manager/core/browser/sync_credentials_filter.cc b/components/password_manager/core/browser/sync_credentials_filter.cc index 10303e9673..e6c387a93b 100644 --- a/components/password_manager/core/browser/sync_credentials_filter.cc @@ -1523,7 +2539,7 @@ index 9c94ec1b89..529c2c7ec4 100644 "credential_manager_types.cc", "credential_manager_types.h", diff --git a/components/payments/content/BUILD.gn b/components/payments/content/BUILD.gn -index 569cee8d02..cd0b333e83 100644 +index 249362d3e0..5a288b93fc 100644 --- a/components/payments/content/BUILD.gn +++ b/components/payments/content/BUILD.gn @@ -2,7 +2,9 @@ @@ -1537,7 +2553,7 @@ index 569cee8d02..cd0b333e83 100644 sources = [ "android_app_communication.cc", "android_app_communication.h", -@@ -133,7 +135,7 @@ static_library("content") { +@@ -137,7 +139,7 @@ static_library("content") { } # Files used by content and utility. @@ -1546,7 +2562,7 @@ index 569cee8d02..cd0b333e83 100644 sources = [ "web_app_manifest.cc", "web_app_manifest.h", -@@ -145,7 +147,7 @@ static_library("content_common") { +@@ -149,7 +151,7 @@ static_library("content_common") { ] } @@ -1555,7 +2571,7 @@ index 569cee8d02..cd0b333e83 100644 sources = [ "developer_console_logger.cc", "developer_console_logger.h", -@@ -193,7 +195,7 @@ static_library("utils") { +@@ -197,7 +199,7 @@ static_library("utils") { ] } @@ -1563,7 +2579,7 @@ index 569cee8d02..cd0b333e83 100644 +jumbo_static_library("test_support") { testonly = true sources = [ - "mock_payment_manifest_web_data_service.cc", + "mock_web_payments_web_data_service.cc", diff --git a/components/payments/content/icon/BUILD.gn b/components/payments/content/icon/BUILD.gn index 517b3dd3da..a9b2aba727 100644 --- a/components/payments/content/icon/BUILD.gn @@ -1580,7 +2596,7 @@ index 517b3dd3da..a9b2aba727 100644 "icon_size.cc", "icon_size.h", diff --git a/components/payments/core/BUILD.gn b/components/payments/core/BUILD.gn -index 37941d57d2..bf108681d9 100644 +index a432456da8..7b84191b42 100644 --- a/components/payments/core/BUILD.gn +++ b/components/payments/core/BUILD.gn @@ -3,8 +3,9 @@ @@ -1595,7 +2611,7 @@ index 37941d57d2..bf108681d9 100644 "android_app_description.cc", "android_app_description.h", @@ -118,7 +119,7 @@ static_library("currency_formatter") { - public_deps = [ "//third_party/icu:icu" ] + public_deps = [ "//third_party/icu" ] } -static_library("error_strings") { @@ -1620,8 +2636,8 @@ index 37941d57d2..bf108681d9 100644 testonly = true sources = [ "const_csp_checker.cc", -@@ -169,7 +170,7 @@ static_library("test_support") { - ] +@@ -173,7 +174,7 @@ static_library("test_support") { + configs += [ "//build/config/compiler:no_exit_time_destructors" ] } -source_set("unit_tests") { @@ -1630,7 +2646,7 @@ index 37941d57d2..bf108681d9 100644 sources = [ "android_app_description_tools_unittest.cc", diff --git a/components/performance_manager/BUILD.gn b/components/performance_manager/BUILD.gn -index ac60dfaadf..dffa35d2f4 100644 +index 385e2c4d4e..202748ff15 100644 --- a/components/performance_manager/BUILD.gn +++ b/components/performance_manager/BUILD.gn @@ -2,6 +2,7 @@ @@ -1650,7 +2666,7 @@ index ac60dfaadf..dffa35d2f4 100644 sources = [ "binders.cc", "browser_child_process_host_proxy.cc", -@@ -299,6 +300,10 @@ static_library("performance_manager") { +@@ -304,6 +305,10 @@ static_library("performance_manager") { "worker_watcher.cc", "worker_watcher.h", ] @@ -1661,7 +2677,7 @@ index ac60dfaadf..dffa35d2f4 100644 deps = [ "//components/content_settings/core/common", -@@ -342,6 +347,7 @@ static_library("performance_manager") { +@@ -347,6 +352,7 @@ static_library("performance_manager") { "//chromeos/dbus/power", "//chromeos/dbus/power:power_manager_proto", ] @@ -1917,7 +2933,7 @@ index 49ff1c11c2..5074638b1b 100644 + +#undef kDescriberName diff --git a/components/performance_manager/graph/frame_node_impl_describer.cc b/components/performance_manager/graph/frame_node_impl_describer.cc -index ee2a27b953..867d51fac7 100644 +index 1629abfefd..8cc3122766 100644 --- a/components/performance_manager/graph/frame_node_impl_describer.cc +++ b/components/performance_manager/graph/frame_node_impl_describer.cc @@ -14,6 +14,8 @@ @@ -1929,14 +2945,14 @@ index ee2a27b953..867d51fac7 100644 namespace performance_manager { namespace { -@@ -114,3 +116,5 @@ base::Value::Dict FrameNodeImplDescriber::DescribeFrameNodeData( +@@ -103,3 +105,5 @@ base::Value::Dict FrameNodeImplDescriber::DescribeFrameNodeData( } } // namespace performance_manager + +#undef kDescriberName diff --git a/components/performance_manager/graph/process_node_impl_describer.cc b/components/performance_manager/graph/process_node_impl_describer.cc -index 7b1dc78ef7..d763e8e75a 100644 +index ee51ab1fc8..7905a53a79 100644 --- a/components/performance_manager/graph/process_node_impl_describer.cc +++ b/components/performance_manager/graph/process_node_impl_describer.cc @@ -23,6 +23,8 @@ @@ -1955,7 +2971,7 @@ index 7b1dc78ef7..d763e8e75a 100644 + +#undef kDescriberName diff --git a/components/performance_manager/graph/worker_node_impl_describer.cc b/components/performance_manager/graph/worker_node_impl_describer.cc -index 5ec53278b8..5b9894d540 100644 +index d7f9c64157..460671a372 100644 --- a/components/performance_manager/graph/worker_node_impl_describer.cc +++ b/components/performance_manager/graph/worker_node_impl_describer.cc @@ -12,6 +12,8 @@ @@ -1967,7 +2983,7 @@ index 5ec53278b8..5b9894d540 100644 namespace performance_manager { namespace { -@@ -66,3 +68,5 @@ base::Value::Dict WorkerNodeImplDescriber::DescribeWorkerNodeData( +@@ -67,3 +69,5 @@ base::Value::Dict WorkerNodeImplDescriber::DescribeWorkerNodeData( } } // namespace performance_manager @@ -2012,7 +3028,7 @@ index 3813e46e04..3dd851f91c 100644 + +#undef g_instance diff --git a/components/performance_manager/resource_attribution/cpu_measurement_monitor.cc b/components/performance_manager/resource_attribution/cpu_measurement_monitor.cc -index fd30d8effb..1fe8ad8e90 100644 +index 9193f6685c..461cd1104a 100644 --- a/components/performance_manager/resource_attribution/cpu_measurement_monitor.cc +++ b/components/performance_manager/resource_attribution/cpu_measurement_monitor.cc @@ -50,6 +50,8 @@ @@ -2024,17 +3040,17 @@ index fd30d8effb..1fe8ad8e90 100644 namespace resource_attribution { namespace { -@@ -1116,3 +1118,5 @@ size_t ScopedCPUTimeResult::EstimateMemoryUsage() const { +@@ -1128,3 +1130,5 @@ size_t ScopedCPUTimeResult::EstimateMemoryUsage() const { } } // namespace resource_attribution + +#undef OriginInBrowsingInstanceContextForNode diff --git a/components/performance_manager/resource_attribution/memory_measurement_provider.cc b/components/performance_manager/resource_attribution/memory_measurement_provider.cc -index 61f7cbccdd..98392874b1 100644 +index 627beb3501..43f6205f61 100644 --- a/components/performance_manager/resource_attribution/memory_measurement_provider.cc +++ b/components/performance_manager/resource_attribution/memory_measurement_provider.cc -@@ -26,6 +26,8 @@ +@@ -27,6 +27,8 @@ #include "url/gurl.h" #include "url/origin.h" @@ -2043,14 +3059,48 @@ index 61f7cbccdd..98392874b1 100644 namespace resource_attribution { namespace { -@@ -199,3 +201,5 @@ base::Value::Dict MemoryMeasurementProvider::DescribeContextData( +@@ -207,3 +209,5 @@ base::Value::Dict MemoryMeasurementProvider::DescribeContextData( } } // namespace resource_attribution + +#undef OriginInBrowsingInstanceContextForNode +diff --git a/components/persistent_cache/BUILD.gn b/components/persistent_cache/BUILD.gn +index a79b4013ec..3cde314d9c 100644 +--- a/components/persistent_cache/BUILD.gn ++++ b/components/persistent_cache/BUILD.gn +@@ -2,7 +2,9 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-component("persistent_cache") { ++import("//build/config/jumbo.gni") ++ ++jumbo_component("persistent_cache") { + sources = [ + "backend.cc", + "backend.h", +diff --git a/components/persistent_cache/persistent_cache_collection.cc b/components/persistent_cache/persistent_cache_collection.cc +index 72c12a0e29..9efa5ab73e 100644 +--- a/components/persistent_cache/persistent_cache_collection.cc ++++ b/components/persistent_cache/persistent_cache_collection.cc +@@ -11,6 +11,8 @@ + #include "components/persistent_cache/entry.h" + #include "components/persistent_cache/persistent_cache.h" + ++#define kLruCacheCapacity kLruCacheCapacity_PersistentCacheCollection ++ + namespace { + constexpr size_t kLruCacheCapacity = 100; + +@@ -116,3 +118,5 @@ PersistentCache* PersistentCacheCollection::GetOrCreateCache( + } + + } // namespace persistent_cache ++ ++#undef kLruCacheCapacity diff --git a/components/policy/content/BUILD.gn b/components/policy/content/BUILD.gn -index 257e9ff47b..9ce4764d8f 100644 +index a28cd68225..108d32f535 100644 --- a/components/policy/content/BUILD.gn +++ b/components/policy/content/BUILD.gn @@ -3,11 +3,12 @@ @@ -2067,7 +3117,7 @@ index 257e9ff47b..9ce4764d8f 100644 sources = [ "proceed_until_response_navigation_throttle.cc", "proceed_until_response_navigation_throttle.h", -@@ -29,7 +30,7 @@ source_set("safe_sites_navigation_throttle") { +@@ -31,7 +32,7 @@ source_set("safe_sites_navigation_throttle") { ] } @@ -2077,7 +3127,7 @@ index 257e9ff47b..9ce4764d8f 100644 "policy_blocklist_navigation_throttle.cc", "policy_blocklist_navigation_throttle.h", diff --git a/components/policy/core/browser/BUILD.gn b/components/policy/core/browser/BUILD.gn -index e1f356347f..b8dc6c6124 100644 +index 08f79c4eb7..82be567db1 100644 --- a/components/policy/core/browser/BUILD.gn +++ b/components/policy/core/browser/BUILD.gn @@ -3,6 +3,7 @@ @@ -2097,7 +3147,7 @@ index e1f356347f..b8dc6c6124 100644 visibility = [ "//components/policy/*" ] sources = [ "boolean_disabling_policy_handler.cc", -@@ -114,7 +115,7 @@ source_set("internal") { +@@ -113,7 +114,7 @@ source_set("internal") { ] } @@ -2145,7 +3195,7 @@ index 96abca8595..f1c4927588 100644 + +#undef ValidateHost diff --git a/components/policy/core/common/BUILD.gn b/components/policy/core/common/BUILD.gn -index dba951de34..280f76fb5a 100644 +index b20b751ae8..d3f5e3cc43 100644 --- a/components/policy/core/common/BUILD.gn +++ b/components/policy/core/common/BUILD.gn @@ -3,6 +3,7 @@ @@ -2183,7 +3233,7 @@ index dba951de34..280f76fb5a 100644 visibility = [ "//components/policy/*", "//components/privacy_sandbox/*", -@@ -386,7 +387,7 @@ source_set("internal") { +@@ -384,7 +385,7 @@ source_set("internal") { } } @@ -2193,7 +3243,7 @@ index dba951de34..280f76fb5a 100644 sources = [ "cloud/mock_cloud_external_data_manager.cc", diff --git a/components/policy/core/common/cloud/profile_cloud_policy_manager.cc b/components/policy/core/common/cloud/profile_cloud_policy_manager.cc -index a6367b7eaa..08472ae1a9 100644 +index 6a1ed3a99f..8d2031f2e6 100644 --- a/components/policy/core/common/cloud/profile_cloud_policy_manager.cc +++ b/components/policy/core/common/cloud/profile_cloud_policy_manager.cc @@ -21,6 +21,8 @@ @@ -2212,7 +3262,7 @@ index a6367b7eaa..08472ae1a9 100644 + +#undef kPolicy diff --git a/components/policy/core/common/cloud/profile_cloud_policy_store.cc b/components/policy/core/common/cloud/profile_cloud_policy_store.cc -index 39c5bad05e..f4d95c3530 100644 +index 7d87699915..3fc0ed02bb 100644 --- a/components/policy/core/common/cloud/profile_cloud_policy_store.cc +++ b/components/policy/core/common/cloud/profile_cloud_policy_store.cc @@ -16,6 +16,8 @@ @@ -2231,10 +3281,10 @@ index 39c5bad05e..f4d95c3530 100644 + +#undef kPolicy diff --git a/components/policy/core/common/policy_proto_decoders.cc b/components/policy/core/common/policy_proto_decoders.cc -index 1ad007a2b2..2119d57c4a 100644 +index 2c04ea596b..7653a68b2f 100644 --- a/components/policy/core/common/policy_proto_decoders.cc +++ b/components/policy/core/common/policy_proto_decoders.cc -@@ -26,6 +26,8 @@ +@@ -22,6 +22,8 @@ #include "components/policy/proto/cloud_policy.pb.h" #include "components/strings/grit/components_strings.h" @@ -2243,7 +3293,7 @@ index 1ad007a2b2..2119d57c4a 100644 namespace policy { namespace em = enterprise_management; -@@ -270,3 +272,5 @@ bool ParseComponentPolicy(base::Value::Dict json_dict, +@@ -267,3 +269,5 @@ bool ParseComponentPolicy(base::Value::Dict json_dict, } } // namespace policy @@ -2280,7 +3330,7 @@ index 478121da0b..681c13411c 100644 "print_composite_client.cc", "print_composite_client.h", diff --git a/components/safe_browsing/content/browser/BUILD.gn b/components/safe_browsing/content/browser/BUILD.gn -index 1fc1f8d683..3b6f8076cf 100644 +index 33dca51e9b..9d81e19269 100644 --- a/components/safe_browsing/content/browser/BUILD.gn +++ b/components/safe_browsing/content/browser/BUILD.gn @@ -3,6 +3,7 @@ @@ -2301,7 +3351,7 @@ index 1fc1f8d683..3b6f8076cf 100644 "async_check_tracker.cc", "async_check_tracker.h", diff --git a/components/safe_browsing/core/browser/BUILD.gn b/components/safe_browsing/core/browser/BUILD.gn -index 9e6f073dc0..054d08a2ae 100644 +index 23c52e7724..148ef8a5eb 100644 --- a/components/safe_browsing/core/browser/BUILD.gn +++ b/components/safe_browsing/core/browser/BUILD.gn @@ -3,8 +3,9 @@ @@ -2315,6 +3365,79 @@ index 9e6f073dc0..054d08a2ae 100644 sources = [ "database_manager_mechanism.cc", "database_manager_mechanism.h", +diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUILD.gn +index cdf50752a9..e6b5ca7c8d 100644 +--- a/components/search_engines/BUILD.gn ++++ b/components/search_engines/BUILD.gn +@@ -3,13 +3,14 @@ + # found in the LICENSE file. + + import("//build/config/features.gni") ++import("//build/config/jumbo.gni") + import("//tools/json_to_struct/json_to_struct.gni") + if (is_android) { + import("//build/config/android/config.gni") + import("//build/config/android/rules.gni") + } + +-static_library("search_engines") { ++jumbo_static_library("search_engines") { + sources = [ + "choice_made_location.h", + "default_search_manager.cc", +diff --git a/components/security_interstitials/content/BUILD.gn b/components/security_interstitials/content/BUILD.gn +index 3dcddc38dc..88ff687d81 100644 +--- a/components/security_interstitials/content/BUILD.gn ++++ b/components/security_interstitials/content/BUILD.gn +@@ -1,11 +1,13 @@ + # Copyright 2016 The Chromium Authors + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. ++ ++import("//build/config/jumbo.gni") + import("//components/captive_portal/core/features.gni") + import("//components/guest_view/buildflags/buildflags.gni") + import("//third_party/protobuf/proto_library.gni") + +-static_library("security_interstitial_page") { ++jumbo_static_library("security_interstitial_page") { + sources = [ + "bad_clock_blocking_page.cc", + "bad_clock_blocking_page.h", +diff --git a/components/security_interstitials/core/BUILD.gn b/components/security_interstitials/core/BUILD.gn +index f4acf4f863..12cc2e9352 100644 +--- a/components/security_interstitials/core/BUILD.gn ++++ b/components/security_interstitials/core/BUILD.gn +@@ -2,7 +2,9 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-static_library("core") { ++import("//build/config/jumbo.gni") ++ ++jumbo_static_library("core") { + sources = [ + "bad_clock_ui.cc", + "bad_clock_ui.h", +diff --git a/components/security_interstitials/core/https_only_mode_allowlist.cc b/components/security_interstitials/core/https_only_mode_allowlist.cc +index 97144fecc4..0fb4d3644d 100644 +--- a/components/security_interstitials/core/https_only_mode_allowlist.cc ++++ b/components/security_interstitials/core/https_only_mode_allowlist.cc +@@ -11,6 +11,8 @@ + #include "components/content_settings/core/browser/content_settings_pref_provider.h" + #include "url/gurl.h" + ++#define GetSecureGURLForHost GetSecureGURLForHost_HttpsOnlyModeEnforcelist ++ + namespace { + + // Key for the expiration time of a decision in the per-site HTTP allowlist +@@ -132,3 +134,5 @@ void HttpsOnlyModeAllowlist::SetClockForTesting(base::Clock* clock) { + } + + } // namespace security_interstitials ++ ++#undef GetSecureGURLForHost diff --git a/components/security_state/content/BUILD.gn b/components/security_state/content/BUILD.gn index 384b41b15b..b477272b7d 100644 --- a/components/security_state/content/BUILD.gn @@ -2359,6 +3482,131 @@ index 497dcf5126..1f69e4ad02 100644 testonly = true sources = [ "security_state_unittest.cc" ] +diff --git a/components/segmentation_platform/internal/BUILD.gn b/components/segmentation_platform/internal/BUILD.gn +index 8849faaa8b..10da011880 100644 +--- a/components/segmentation_platform/internal/BUILD.gn ++++ b/components/segmentation_platform/internal/BUILD.gn +@@ -7,10 +7,11 @@ if (is_android) { + import("//build/config/android/rules.gni") + import("//third_party/jni_zero/jni_zero.gni") + } ++import("//build/config/jumbo.gni") + import("//components/optimization_guide/features.gni") + import("//testing/libfuzzer/fuzzer_test.gni") + +-static_library("internal") { ++jumbo_static_library("internal") { + #TODO(crbug.com/347191610): Refactor code to eliminate visibility + #requirement below for `visited_url_ranking`. + visibility = [ +diff --git a/components/segmentation_platform/internal/selection/result_refresh_manager.cc b/components/segmentation_platform/internal/selection/result_refresh_manager.cc +index 470858214f..545e5fe8d7 100644 +--- a/components/segmentation_platform/internal/selection/result_refresh_manager.cc ++++ b/components/segmentation_platform/internal/selection/result_refresh_manager.cc +@@ -11,6 +11,8 @@ + #include "components/segmentation_platform/public/constants.h" + #include "components/segmentation_platform/public/features.h" + ++#define kModelInitializationTimeoutMs kModelInitializationTimeoutMs_ResultRefreshManager ++ + namespace segmentation_platform { + + namespace { +@@ -160,3 +162,5 @@ void ResultRefreshManager::OnGetCachedResultOrRunModel( + } + + } // namespace segmentation_platform ++ ++#undef kModelInitializationTimeoutMs +diff --git a/components/services/app_service/public/cpp/BUILD.gn b/components/services/app_service/public/cpp/BUILD.gn +index 31ebb53d40..531950b6d5 100644 +--- a/components/services/app_service/public/cpp/BUILD.gn ++++ b/components/services/app_service/public/cpp/BUILD.gn +@@ -2,11 +2,13 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") ++ + # Component for the core data structures and types used by App Service. Large + # parts of the codebase are dependent on this target (via + # //chromeos/crosapi/mojom), so this must have minimal deps to avoid circular + # chains. +-component("app_types") { ++jumbo_component("app_types") { + output_name = "APP_TYPES" + sources = [ + "app.cc", +diff --git a/components/services/app_service/public/cpp/permission.cc b/components/services/app_service/public/cpp/permission.cc +index e3c99e943d..31fbe87403 100644 +--- a/components/services/app_service/public/cpp/permission.cc ++++ b/components/services/app_service/public/cpp/permission.cc +@@ -10,6 +10,8 @@ + #include "base/containers/to_value_list.h" + #include "base/strings/to_string.h" + ++#define kIsManagedKey kIsManagedKey_Permission ++ + namespace apps { + + namespace { +@@ -179,3 +181,5 @@ Permissions ConvertListToPermissions(const base::Value::List* list) { + } + + } // namespace apps ++ ++#undef kIsManagedKey +diff --git a/components/sessions/BUILD.gn b/components/sessions/BUILD.gn +index 4106b61276..b1fe253c57 100644 +--- a/components/sessions/BUILD.gn ++++ b/components/sessions/BUILD.gn +@@ -2,6 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + if (is_android) { + import("//build/config/android/config.gni") + } +@@ -11,7 +12,7 @@ config("implementation") { + } + + if (!is_ios) { +- component("sessions") { ++ jumbo_component("sessions") { + sources = [ + "content/content_live_tab.cc", + "content/content_live_tab.h", +@@ -75,7 +76,7 @@ if (!is_ios) { + } + } + +-component("session_id") { ++jumbo_component("session_id") { + sources = [ + "core/session_id.cc", + "core/session_id.h", +diff --git a/components/signin/core/browser/BUILD.gn b/components/signin/core/browser/BUILD.gn +index 1adf58a3ac..4b2ac7fd7c 100644 +--- a/components/signin/core/browser/BUILD.gn ++++ b/components/signin/core/browser/BUILD.gn +@@ -2,6 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + import("//components/signin/features.gni") + + if (is_android) { +@@ -9,7 +10,7 @@ if (is_android) { + } + + # This target contains code that is used by clients of //components/signin. +-static_library("browser") { ++jumbo_static_library("browser") { + sources = [ + "about_signin_internals.cc", + "about_signin_internals.h", diff --git a/components/storage_monitor/BUILD.gn b/components/storage_monitor/BUILD.gn index 2c5c06c4cf..dce03c6f25 100644 --- a/components/storage_monitor/BUILD.gn @@ -2374,8 +3622,98 @@ index 2c5c06c4cf..dce03c6f25 100644 sources = [ "media_storage_util.cc", "media_storage_util.h", +diff --git a/components/subresource_filter/content/browser/BUILD.gn b/components/subresource_filter/content/browser/BUILD.gn +index ab406c0619..c686c5da7d 100644 +--- a/components/subresource_filter/content/browser/BUILD.gn ++++ b/components/subresource_filter/content/browser/BUILD.gn +@@ -3,8 +3,9 @@ + # found in the LICENSE file. + + import("//build/config/features.gni") ++import("//build/config/jumbo.gni") + +-static_library("browser") { ++jumbo_static_library("browser") { + sources = [ + "ad_tagging_utils.cc", + "ad_tagging_utils.h", +diff --git a/components/subresource_filter/core/common/BUILD.gn b/components/subresource_filter/core/common/BUILD.gn +index 81c9bdf29a..a1f7e05ccc 100644 +--- a/components/subresource_filter/core/common/BUILD.gn ++++ b/components/subresource_filter/core/common/BUILD.gn +@@ -2,9 +2,10 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + import("//testing/libfuzzer/fuzzer_test.gni") + +-static_library("common") { ++jumbo_static_library("common") { + sources = [ + "activation_decision.h", + "activation_list.cc", +diff --git a/components/supervised_user/core/browser/BUILD.gn b/components/supervised_user/core/browser/BUILD.gn +index 25112b9d49..af1c25ee3f 100644 +--- a/components/supervised_user/core/browser/BUILD.gn ++++ b/components/supervised_user/core/browser/BUILD.gn +@@ -5,6 +5,7 @@ + if (is_android) { + import("//build/config/android/rules.gni") + } ++import("//build/config/jumbo.gni") + + static_library("fetcher_config") { + sources = [ +@@ -90,7 +91,7 @@ static_library("fetcher") { + ] + } + +-static_library("browser") { ++jumbo_static_library("browser") { + sources = [ + "child_account_service.cc", + "child_account_service.h", +diff --git a/components/supervised_user/core/browser/kids_chrome_management_url_checker_client.cc b/components/supervised_user/core/browser/kids_chrome_management_url_checker_client.cc +index ea41641007..0f04049fe2 100644 +--- a/components/supervised_user/core/browser/kids_chrome_management_url_checker_client.cc ++++ b/components/supervised_user/core/browser/kids_chrome_management_url_checker_client.cc +@@ -28,6 +28,8 @@ + #include "third_party/protobuf/src/google/protobuf/message_lite.h" + #include "url/gurl.h" + ++#define OnResponse OnResponse_KidsChromeManagementURLCheckerClient ++ + namespace supervised_user { + namespace { + +@@ -143,3 +145,5 @@ void KidsChromeManagementURLCheckerClient::CheckURL( + base::BindOnce(&OnResponse, url, std::move(callback))); + } + } // namespace supervised_user ++ ++#undef OnResponse +diff --git a/components/supervised_user/core/browser/supervised_user_preferences.cc b/components/supervised_user/core/browser/supervised_user_preferences.cc +index 9ce64a100a..0cf88de8cd 100644 +--- a/components/supervised_user/core/browser/supervised_user_preferences.cc ++++ b/components/supervised_user/core/browser/supervised_user_preferences.cc +@@ -17,6 +17,8 @@ + #include "components/supervised_user/core/common/pref_names.h" + #include "components/supervised_user/core/common/supervised_user_constants.h" + ++#define Custodian Custodian_SupervisedUserPreferences ++ + namespace supervised_user { + + namespace { +@@ -199,3 +201,5 @@ void SetGoogleSafeSearch(PrefService& pref_service, + static_cast(status)); + } + } // namespace supervised_user ++ ++#undef Custodian diff --git a/components/sync/BUILD.gn b/components/sync/BUILD.gn -index 11f1385c64..57a61894b4 100644 +index c5bf365a88..2c804547d9 100644 --- a/components/sync/BUILD.gn +++ b/components/sync/BUILD.gn @@ -3,6 +3,7 @@ @@ -2387,7 +3725,7 @@ index 11f1385c64..57a61894b4 100644 group("sync") { diff --git a/components/sync/base/BUILD.gn b/components/sync/base/BUILD.gn -index 6277a377e0..f01a841f4f 100644 +index 5b22bad636..b8e42fc282 100644 --- a/components/sync/base/BUILD.gn +++ b/components/sync/base/BUILD.gn @@ -3,6 +3,7 @@ @@ -2407,8 +3745,72 @@ index 6277a377e0..f01a841f4f 100644 sources = [ "account_pref_utils.cc", "account_pref_utils.h", +diff --git a/components/sync/engine/BUILD.gn b/components/sync/engine/BUILD.gn +index 44845bd11c..bf7d1ff652 100644 +--- a/components/sync/engine/BUILD.gn ++++ b/components/sync/engine/BUILD.gn +@@ -2,7 +2,9 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-static_library("engine") { ++import("//build/config/jumbo.gni") ++ ++jumbo_static_library("engine") { + sources = [ + "active_devices_invalidation_info.cc", + "active_devices_invalidation_info.h", +diff --git a/components/sync/model/BUILD.gn b/components/sync/model/BUILD.gn +index 0bab27cca4..e5bcdfc0cc 100644 +--- a/components/sync/model/BUILD.gn ++++ b/components/sync/model/BUILD.gn +@@ -2,7 +2,9 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-static_library("model") { ++import("//build/config/jumbo.gni") ++ ++jumbo_static_library("model") { + sources = [ + "blocking_data_type_store.h", + "blocking_data_type_store_impl.cc", +diff --git a/components/sync/nigori/BUILD.gn b/components/sync/nigori/BUILD.gn +index 9417a6b73a..30bde206e9 100644 +--- a/components/sync/nigori/BUILD.gn ++++ b/components/sync/nigori/BUILD.gn +@@ -2,7 +2,9 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-static_library("nigori") { ++import("//build/config/jumbo.gni") ++ ++jumbo_static_library("nigori") { + sources = [ + "cross_user_sharing_keys.cc", + "cross_user_sharing_keys.h", +diff --git a/components/sync/nigori/nigori_state.cc b/components/sync/nigori/nigori_state.cc +index 4bb51b0c7d..bf66b5faad 100644 +--- a/components/sync/nigori/nigori_state.cc ++++ b/components/sync/nigori/nigori_state.cc +@@ -24,6 +24,8 @@ + #include "components/sync/protocol/nigori_local_data.pb.h" + #include "components/sync/protocol/nigori_specifics.pb.h" + ++#define PublicKeyFromProto PublicKeyFromProto_NigoriState ++ + namespace syncer { + + namespace { +@@ -437,3 +439,5 @@ bool NigoriState::NeedsGenerateCrossUserSharingKeyPair() const { + } + + } // namespace syncer ++ ++#undef PublicKeyFromProto diff --git a/components/sync/protocol/BUILD.gn b/components/sync/protocol/BUILD.gn -index 5f71ba85f0..2bc9860ca6 100644 +index 50219aea28..25ea991339 100644 --- a/components/sync/protocol/BUILD.gn +++ b/components/sync/protocol/BUILD.gn @@ -2,6 +2,7 @@ @@ -2429,7 +3831,7 @@ index 5f71ba85f0..2bc9860ca6 100644 "collaboration_metadata.cc", "collaboration_metadata.h", diff --git a/components/sync/service/BUILD.gn b/components/sync/service/BUILD.gn -index 618c38fc54..52ae610818 100644 +index 5bee8df71b..54522287d2 100644 --- a/components/sync/service/BUILD.gn +++ b/components/sync/service/BUILD.gn @@ -3,8 +3,9 @@ @@ -2444,7 +3846,7 @@ index 618c38fc54..52ae610818 100644 "active_devices_provider.h", "backend_migrator.cc", diff --git a/components/sync/service/history_sync_session_durations_metrics_recorder.cc b/components/sync/service/history_sync_session_durations_metrics_recorder.cc -index 98fa0a3162..e18ed0d8e3 100644 +index 4e9f835055..6929888261 100644 --- a/components/sync/service/history_sync_session_durations_metrics_recorder.cc +++ b/components/sync/service/history_sync_session_durations_metrics_recorder.cc @@ -14,6 +14,9 @@ @@ -2457,34 +3859,18 @@ index 98fa0a3162..e18ed0d8e3 100644 namespace syncer { namespace { -@@ -145,3 +148,6 @@ void HistorySyncSessionDurationsMetricsRecorder::LogHistorySyncDuration( +@@ -152,3 +155,6 @@ void HistorySyncSessionDurationsMetricsRecorder::LogHistorySyncDuration( } } // namespace syncer + +#undef SubtractInactiveTime +#undef LogDuration -diff --git a/components/sync/service/sync_service_impl.cc b/components/sync/service/sync_service_impl.cc -index 7452cf8460..50c6984efa 100644 ---- a/components/sync/service/sync_service_impl.cc -+++ b/components/sync/service/sync_service_impl.cc -@@ -2256,9 +2256,9 @@ SyncServiceImpl::DeterminePreviouslySyncingGaiaIdInfoForMetrics() const { - // SyncServiceImpl. - const GaiaId previously_syncing_gaia_id = GaiaId( - HasSyncConsent() ? sync_client_->GetPrefService()->GetString( -- prefs::kGoogleServicesSecondLastSyncingGaiaId) -+ ::prefs::kGoogleServicesSecondLastSyncingGaiaId) - : sync_client_->GetPrefService()->GetString( -- prefs::kGoogleServicesLastSyncingGaiaId)); -+ ::prefs::kGoogleServicesLastSyncingGaiaId)); - - if (previously_syncing_gaia_id.empty()) { - // It is known that no previous gaia ID existed that turned sync on. diff --git a/components/sync/service/sync_session_durations_metrics_recorder.cc b/components/sync/service/sync_session_durations_metrics_recorder.cc -index 4b2021d817..62a3d49d56 100644 +index 8f1cbf70f9..a9c29fe231 100644 --- a/components/sync/service/sync_session_durations_metrics_recorder.cc +++ b/components/sync/service/sync_session_durations_metrics_recorder.cc -@@ -11,6 +11,9 @@ +@@ -12,6 +12,9 @@ #include "base/time/time.h" #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" @@ -2494,7 +3880,7 @@ index 4b2021d817..62a3d49d56 100644 namespace syncer { namespace { -@@ -352,3 +355,6 @@ SyncSessionDurationsMetricsRecorder::DetermineSyncStatus() const { +@@ -359,3 +362,6 @@ SyncSessionDurationsMetricsRecorder::DetermineSyncStatus() const { } } // namespace syncer @@ -2520,6 +3906,40 @@ index 1ee3436ad9..ee88cee049 100644 sources = [ "device_count_metrics_provider.cc", "device_count_metrics_provider.h", +diff --git a/components/sync_sessions/BUILD.gn b/components/sync_sessions/BUILD.gn +index 39218fce13..452ec69033 100644 +--- a/components/sync_sessions/BUILD.gn ++++ b/components/sync_sessions/BUILD.gn +@@ -2,7 +2,9 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-static_library("sync_sessions") { ++import("//build/config/jumbo.gni") ++ ++jumbo_static_library("sync_sessions") { + sources = [ + "features.cc", + "features.h", +diff --git a/components/sync_sessions/session_sync_bridge.cc b/components/sync_sessions/session_sync_bridge.cc +index f630048c84..d422f1117a 100644 +--- a/components/sync_sessions/session_sync_bridge.cc ++++ b/components/sync_sessions/session_sync_bridge.cc +@@ -31,6 +31,8 @@ + #include "components/sync_sessions/synced_window_delegate.h" + #include "components/sync_sessions/synced_window_delegates_getter.h" + ++#define MoveToEntityData MoveToEntityData_SessionSyncBridge ++ + namespace sync_sessions { + namespace { + +@@ -515,3 +517,5 @@ SessionSyncBridge::SyncingState::SyncingState() = default; + SessionSyncBridge::SyncingState::~SyncingState() = default; + + } // namespace sync_sessions ++ ++#undef MoveToEntityData diff --git a/components/sync_user_events/BUILD.gn b/components/sync_user_events/BUILD.gn index 4f3989a48d..c04130e6cb 100644 --- a/components/sync_user_events/BUILD.gn @@ -2535,8 +3955,39 @@ index 4f3989a48d..c04130e6cb 100644 sources = [ "global_id_mapper.h", "no_op_user_event_service.cc", +diff --git a/components/translate/core/browser/BUILD.gn b/components/translate/core/browser/BUILD.gn +index c1167e0450..37117d24bd 100644 +--- a/components/translate/core/browser/BUILD.gn ++++ b/components/translate/core/browser/BUILD.gn +@@ -2,9 +2,10 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + import("//build/config/ui.gni") + +-static_library("browser") { ++jumbo_static_library("browser") { + sources = [ + "language_state.cc", + "language_state.h", +diff --git a/components/trusted_vault/BUILD.gn b/components/trusted_vault/BUILD.gn +index 73ae7f66fe..5d374394cd 100644 +--- a/components/trusted_vault/BUILD.gn ++++ b/components/trusted_vault/BUILD.gn +@@ -2,7 +2,9 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-static_library("trusted_vault") { ++import("//build/config/jumbo.gni") ++ ++jumbo_static_library("trusted_vault") { + sources = [ + "trusted_vault_client.h", + "trusted_vault_server_constants.cc", diff --git a/components/ui_devtools/BUILD.gn b/components/ui_devtools/BUILD.gn -index 55ffddee33..2fcce25bab 100644 +index 0f2babc65f..df823dd7d2 100644 --- a/components/ui_devtools/BUILD.gn +++ b/components/ui_devtools/BUILD.gn @@ -2,6 +2,7 @@ @@ -2556,8 +4007,90 @@ index 55ffddee33..2fcce25bab 100644 sources = rebase_path(_protocol_generated, ".", target_gen_dir) sources += [ "agent_util.cc", +diff --git a/components/ukm/BUILD.gn b/components/ukm/BUILD.gn +index 891776217b..e3cf70e5e2 100644 +--- a/components/ukm/BUILD.gn ++++ b/components/ukm/BUILD.gn +@@ -2,6 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + import("//testing/test.gni") + + component("ukm_recorder") { +@@ -41,7 +42,7 @@ component("ukm_recorder") { + # The Url-Keyed Metrics (UKM) service is responsible for gathering and + # uploading reports that contain fine grained performance metrics including + # URLs for top-level navigations. +-static_library("ukm") { ++jumbo_static_library("ukm") { + sources = [ + "app_source_url_recorder.cc", + "app_source_url_recorder.h", +diff --git a/components/unexportable_keys/BUILD.gn b/components/unexportable_keys/BUILD.gn +index bb07e4dfd7..5b9eb8d911 100644 +--- a/components/unexportable_keys/BUILD.gn ++++ b/components/unexportable_keys/BUILD.gn +@@ -2,7 +2,9 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-component("unexportable_keys") { ++import("//build/config/jumbo.gni") ++ ++jumbo_component("unexportable_keys") { + sources = [ + "background_long_task_scheduler.cc", + "background_long_task_scheduler.h", +diff --git a/components/update_client/BUILD.gn b/components/update_client/BUILD.gn +index a0f3587427..6d71784701 100644 +--- a/components/update_client/BUILD.gn ++++ b/components/update_client/BUILD.gn +@@ -3,6 +3,7 @@ + # found in the LICENSE file. + + import("//build/buildflag_header.gni") ++import("//build/config/jumbo.gni") + import("//net/features.gni") + import("//testing/libfuzzer/fuzzer_test.gni") + +@@ -84,7 +85,7 @@ group("common_impl") { + ] + } + +-static_library("update_client") { ++jumbo_static_library("update_client") { + include_dirs = [ "//third_party/puffin/src/include" ] + sources = [ + "action_runner.cc", +diff --git a/components/update_client/op_zucchini.cc b/components/update_client/op_zucchini.cc +index 9d51fcfbe5..86f02e31fd 100644 +--- a/components/update_client/op_zucchini.cc ++++ b/components/update_client/op_zucchini.cc +@@ -32,6 +32,11 @@ + #include "components/update_client/utils.h" + #include "components/zucchini/zucchini.h" + ++#define Patch Patch_OpZucchini ++#define PatchDone PatchDone_OpZucchini ++#define VerifyAndCleanUp VerifyAndCleanUp_OpZucchini ++#define CacheLookupDone CacheLookupDone_OpZucchini ++ + namespace update_client { + + namespace { +@@ -165,3 +170,8 @@ base::OnceClosure ZucchiniOperation( + } + + } // namespace update_client ++ ++#undef Patch ++#undef PatchDone ++#undef VerifyAndCleanUp ++#undef CacheLookupDone diff --git a/components/url_formatter/BUILD.gn b/components/url_formatter/BUILD.gn -index 7670c903db..44384ade48 100644 +index a3e74d1252..e3ec649df7 100644 --- a/components/url_formatter/BUILD.gn +++ b/components/url_formatter/BUILD.gn @@ -2,13 +2,14 @@ @@ -2595,7 +4128,7 @@ index 7670c903db..44384ade48 100644 sources = [ "elide_url_unittest.cc", diff --git a/components/variations/BUILD.gn b/components/variations/BUILD.gn -index 32ce3e7daf..251b0eee33 100644 +index 5ae80aba8b..dd443066ce 100644 --- a/components/variations/BUILD.gn +++ b/components/variations/BUILD.gn @@ -4,6 +4,7 @@ @@ -2635,7 +4168,7 @@ index 2e09785c24..3709503f4d 100644 + +#undef g_instance diff --git a/components/variations/variations_ids_provider.cc b/components/variations/variations_ids_provider.cc -index 384ad77ec8..57e87e6a45 100644 +index 2bbcd93a8e..ce911609c5 100644 --- a/components/variations/variations_ids_provider.cc +++ b/components/variations/variations_ids_provider.cc @@ -22,6 +22,8 @@ @@ -2647,14 +4180,30 @@ index 384ad77ec8..57e87e6a45 100644 namespace variations { namespace { -@@ -587,3 +589,5 @@ bool VariationsIdsProvider::IsDuplicateId(VariationID id) { +@@ -658,3 +660,5 @@ bool VariationsIdsProvider::UpdateIsNeeded(base::Time current_time) const { } } // namespace variations + +#undef g_instance +diff --git a/components/web_package/BUILD.gn b/components/web_package/BUILD.gn +index ab6e506030..b5df536707 100644 +--- a/components/web_package/BUILD.gn ++++ b/components/web_package/BUILD.gn +@@ -2,9 +2,10 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + import("//testing/libfuzzer/fuzzer_test.gni") + +-static_library("web_package") { ++jumbo_static_library("web_package") { + sources = [ + "input_reader.cc", + "input_reader.h", diff --git a/components/webauthn/content/browser/BUILD.gn b/components/webauthn/content/browser/BUILD.gn -index 5d17d9f9ab..f3e00ee818 100644 +index edf9ea01a2..fb88ed803f 100644 --- a/components/webauthn/content/browser/BUILD.gn +++ b/components/webauthn/content/browser/BUILD.gn @@ -2,7 +2,9 @@ @@ -2668,6 +4217,139 @@ index 5d17d9f9ab..f3e00ee818 100644 if (is_component_build) { check_includes = false } +diff --git a/components/webcrypto/BUILD.gn b/components/webcrypto/BUILD.gn +index 8de62d024c..3332514af1 100644 +--- a/components/webcrypto/BUILD.gn ++++ b/components/webcrypto/BUILD.gn +@@ -2,10 +2,11 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + import("//testing/libfuzzer/fuzzer_test.gni") + import("//testing/test.gni") + +-static_library("webcrypto") { ++jumbo_static_library("webcrypto") { + sources = [ + "algorithm_dispatch.cc", + "algorithm_dispatch.h", +diff --git a/components/webcrypto/algorithms/aes.cc b/components/webcrypto/algorithms/aes.cc +index 872f43ad27..bdbb7596da 100644 +--- a/components/webcrypto/algorithms/aes.cc ++++ b/components/webcrypto/algorithms/aes.cc +@@ -15,6 +15,8 @@ + #include "third_party/blink/public/platform/web_crypto_algorithm_params.h" + #include "third_party/blink/public/platform/web_crypto_key_algorithm.h" + ++#define SynthesizeImportAlgorithmForClone SynthesizeImportAlgorithmForClone_Aes ++ + namespace webcrypto { + + namespace { +@@ -221,3 +223,5 @@ Status AesAlgorithm::GetKeyLength( + } + + } // namespace webcrypto ++ ++#undef SynthesizeImportAlgorithmForClone +diff --git a/components/webcrypto/algorithms/aes_cbc.cc b/components/webcrypto/algorithms/aes_cbc.cc +index b6f74ae235..c4792e7116 100644 +--- a/components/webcrypto/algorithms/aes_cbc.cc ++++ b/components/webcrypto/algorithms/aes_cbc.cc +@@ -19,6 +19,8 @@ + #include "third_party/boringssl/src/include/openssl/aes.h" + #include "third_party/boringssl/src/include/openssl/cipher.h" + ++#define GetAESCipherByKeyLength GetAESCipherByKeyLength_AesCbc ++ + namespace webcrypto { + + namespace { +@@ -122,3 +124,5 @@ std::unique_ptr CreateAesCbcImplementation() { + } + + } // namespace webcrypto ++ ++#undef GetAESCipherByKeyLength +diff --git a/components/webcrypto/algorithms/ed25519.cc b/components/webcrypto/algorithms/ed25519.cc +index 84f80d9ede..8c9bfaa181 100644 +--- a/components/webcrypto/algorithms/ed25519.cc ++++ b/components/webcrypto/algorithms/ed25519.cc +@@ -22,6 +22,9 @@ + #include "third_party/boringssl/src/include/openssl/curve25519.h" + #include "third_party/boringssl/src/include/openssl/evp.h" + ++#define ReadBytes ReadBytes_Ed25519 ++#define SynthesizeImportAlgorithmForClone SynthesizeImportAlgorithmForClone_Ed25519 ++ + namespace webcrypto { + + namespace { +@@ -509,3 +512,6 @@ std::unique_ptr CreateEd25519Implementation() { + } + + } // namespace webcrypto ++ ++#undef ReadBytes ++#undef SynthesizeImportAlgorithmForClone +diff --git a/components/webcrypto/algorithms/pbkdf2.cc b/components/webcrypto/algorithms/pbkdf2.cc +index cd362f04fc..d7e42668be 100644 +--- a/components/webcrypto/algorithms/pbkdf2.cc ++++ b/components/webcrypto/algorithms/pbkdf2.cc +@@ -17,6 +17,8 @@ + #include "third_party/blink/public/platform/web_crypto_key_algorithm.h" + #include "third_party/boringssl/src/include/openssl/evp.h" + ++#define kAllKeyUsages kAllKeyUsages_Pbkdf2 ++ + namespace webcrypto { + + namespace { +@@ -135,3 +137,5 @@ std::unique_ptr CreatePbkdf2Implementation() { + } + + } // namespace webcrypto ++ ++#undef kAllKeyUsages +diff --git a/components/webcrypto/algorithms/rsa.cc b/components/webcrypto/algorithms/rsa.cc +index 8c8547acf7..e2c868b42d 100644 +--- a/components/webcrypto/algorithms/rsa.cc ++++ b/components/webcrypto/algorithms/rsa.cc +@@ -25,6 +25,8 @@ + #include "third_party/boringssl/src/include/openssl/evp.h" + #include "third_party/boringssl/src/include/openssl/rsa.h" + ++#define SynthesizeImportAlgorithmForClone SynthesizeImportAlgorithmForClone_Rsa ++ + namespace webcrypto { + + namespace { +@@ -588,3 +590,5 @@ Status RsaHashedAlgorithm::DeserializeKeyForClone( + } + + } // namespace webcrypto ++ ++#undef SynthesizeImportAlgorithmForClone +diff --git a/components/webcrypto/algorithms/x25519.cc b/components/webcrypto/algorithms/x25519.cc +index bb36da9846..ae6fddb9a2 100644 +--- a/components/webcrypto/algorithms/x25519.cc ++++ b/components/webcrypto/algorithms/x25519.cc +@@ -20,6 +20,8 @@ + #include "third_party/boringssl/src/include/openssl/curve25519.h" + #include "third_party/boringssl/src/include/openssl/evp.h" + ++#define SynthesizeImportAlgorithmForClone SynthesizeImportAlgorithmForClone_X25519 ++ + namespace webcrypto { + + namespace { +@@ -535,3 +537,5 @@ std::unique_ptr CreateX25519Implementation() { + } + + } // namespace webcrypto ++ ++#undef SynthesizeImportAlgorithmForClone diff --git a/components/wifi/BUILD.gn b/components/wifi/BUILD.gn index c05f146af7..61361ec6f7 100644 --- a/components/wifi/BUILD.gn @@ -2692,6 +4374,66 @@ index c05f146af7..61361ec6f7 100644 sources = [ "fake_wifi_service.cc", "fake_wifi_service.h", +diff --git a/components/zucchini/BUILD.gn b/components/zucchini/BUILD.gn +index edb281cb0e..b5dda120aa 100644 +--- a/components/zucchini/BUILD.gn ++++ b/components/zucchini/BUILD.gn +@@ -3,6 +3,7 @@ + # found in the LICENSE file. + + import("//build/buildflag_header.gni") ++import("//build/config/jumbo.gni") + import("//chrome/process_version_rc_template.gni") + import("//testing/test.gni") + +@@ -24,7 +25,7 @@ buildflag_header("buildflags") { + ] + } + +-static_library("zucchini_lib") { ++jumbo_static_library("zucchini_lib") { + sources = [ + "abs32_utils.cc", + "abs32_utils.h", +diff --git a/third_party/dom_distiller_js/protoc_plugins/util/writer.py b/third_party/dom_distiller_js/protoc_plugins/util/writer.py +index 9ee673abd6..8f80074b5c 100644 +--- a/third_party/dom_distiller_js/protoc_plugins/util/writer.py ++++ b/third_party/dom_distiller_js/protoc_plugins/util/writer.py +@@ -43,3 +43,6 @@ class CodeWriter(object): + def WriteCStyleHeader(self): + self.Output("// GENERATED FILE") + self.Output("// This file generated by DomDistillerJs protoc plugin.") ++ self.Output("") ++ self.Output("#pragma once") ++ self.Output("") +diff --git a/third_party/dom_distiller_js/test_sample_json_converter.h.golden b/third_party/dom_distiller_js/test_sample_json_converter.h.golden +index 9ea16e3ba3..b95bdb67c4 100644 +--- a/third_party/dom_distiller_js/test_sample_json_converter.h.golden ++++ b/third_party/dom_distiller_js/test_sample_json_converter.h.golden +@@ -1,5 +1,8 @@ + // GENERATED FILE + // This file generated by DomDistillerJs protoc plugin. ++ ++#pragma once ++ + #include "test_sample.pb.h" + + // base dependencies +diff --git a/components/metrics/metrics_log.cc b/components/metrics/metrics_log.cc +index 0dd92ced79..94bb77e394 100644 +--- a/components/metrics/metrics_log.cc ++++ b/components/metrics/metrics_log.cc +@@ -382,8 +382,8 @@ void MetricsLog::RecordCoreSystemProfile(MetricsServiceClient* client, + // Exclude these switches which are very frequently on the command line but + // serve no meaningful purpose. + static const char* const kSwitchesToFilter[] = { +- switches::kFlagSwitchesBegin, +- switches::kFlagSwitchesEnd, ++ ::switches::kFlagSwitchesBegin, ++ ::switches::kFlagSwitchesEnd, + }; + + for (const char* filter_switch : kSwitchesToFilter) --- a/components/autofill/core/browser/manual_testing_import.cc.orig 2025-07-29 14:24:46.826102408 +0000 +++ b/components/autofill/core/browser/manual_testing_import.cc 2025-07-29 14:25:30.361625348 +0000 @@ -25,6 +25,8 @@ diff --git a/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0108-ui.patch b/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0108-ui.patch index 10facd9f17..b786211742 100644 --- a/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0108-ui.patch +++ b/x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0108-ui.patch @@ -5,88 +5,92 @@ Subject: [PATCH] reland jumbo 8 Enable jumbo build for the following component(s)/source_set(s): -- //ui/accessibility:ax_base -- //ui/accessibility:accessibility_internal - //ui/accessibility/platform:platform +- //ui/accessibility:accessibility_internal +- //ui/accessibility:ax_base - //ui/aura:aura -- //ui/base:base +- //ui/base/clipboard:clipboard - //ui/base/clipboard:clipboard_types - //ui/base/clipboard:url_file_parser -- //ui/base/clipboard:clipboard -- //ui/base/ime:ime_types -- //ui/base/ime:ime - //ui/base/ime/init:init - //ui/base/ime/linux:linux +- //ui/base/ime:ime +- //ui/base/ime:ime_types - //ui/base/prediction:prediction - //ui/base/x:x +- //ui/base:base +- //ui/color:color - //ui/color:color_headers - //ui/color:color_provider_key -- //ui/color:color - //ui/color:mixers - //ui/compositor:compositor -- //ui/display:display - //ui/display/manager:manager - //ui/display/types:types - //ui/display/util:util -- //ui/events:dom_keycode_converter -- //ui/events:events_base -- //ui/events:events -- //ui/events:keyboard_hook -- //ui/events:gesture_detection -- //ui/events:velocity_tracker -- //ui/events/blink:blink_features +- //ui/display:display - //ui/events/blink:blink -- //ui/events/devices:devices +- //ui/events/blink:blink_features - //ui/events/devices/x11:x11 +- //ui/events/devices:devices - //ui/events/ipc:ipc -- //ui/events/keycodes:xkb - //ui/events/keycodes:x11 -- //ui/events/platform:platform +- //ui/events/keycodes:xkb +- //ui/events/ozone/evdev:evdev - //ui/events/platform/x11:x11 -- //ui/gfx:color_utils -- //ui/gfx:gfx_skia -- //ui/gfx:gfx -- //ui/gfx:color_space -- //ui/gfx:memory_buffer_sources -- //ui/gfx:gfx_switches +- //ui/events/platform:platform +- //ui/events:dom_keycode_converter +- //ui/events:events +- //ui/events:events_base +- //ui/events:gesture_detection +- //ui/events:keyboard_hook +- //ui/events:velocity_tracker - //ui/gfx/animation:animation - //ui/gfx/codec:codec - //ui/gfx/geometry:geometry -- //ui/gfx/ipc:ipc +- //ui/gfx/geometry:geometry_skia - //ui/gfx/ipc/buffer_types:buffer_types - //ui/gfx/ipc/color:color - //ui/gfx/ipc/geometry:geometry - //ui/gfx/ipc/skia:skia +- //ui/gfx/ipc:ipc - //ui/gfx/range:range - //ui/gfx/x:x -- //ui/gl:gl +- //ui/gfx:color_space +- //ui/gfx:color_utils +- //ui/gfx:gfx +- //ui/gfx:gfx_skia +- //ui/gfx:gfx_switches +- //ui/gfx:memory_buffer_sources - //ui/gl/init:init +- //ui/gl:gl - //ui/gtk:gtk - //ui/latency:latency -- //ui/message_center:message_center - //ui/message_center/public/cpp:cpp +- //ui/message_center:message_center - //ui/native_theme:native_theme - //ui/native_theme:native_theme_browser -- //ui/ozone:ozone_base - //ui/ozone:ozone +- //ui/ozone:ozone_base - //ui/platform_window/stub:stub - //ui/platform_window/win:win +- //ui/platform_window:platform_window # - //ui/resources:? - //ui/shell_dialogs:shell_dialogs - //ui/snapshot:snapshot - //ui/snapshot:snapshot_export - //ui/surface:surface - //ui/touch_selection:touch_selection -- //ui/views:views - //ui/views/controls/webview:webview +- //ui/views:views - //ui/views_content_client:views_content_client - //ui/web_dialogs:web_dialogs -- //ui/wm:wm - //ui/wm/public:public +- //ui/wm:wm --- ui/accessibility/BUILD.gn | 5 +++-- ui/accessibility/platform/BUILD.gn | 3 ++- + .../inspect/ax_inspect_utils_auralinux.cc | 2 ++ ui/aura/BUILD.gn | 5 +++-- ui/base/BUILD.gn | 11 ++++++++--- ui/base/clipboard/BUILD.gn | 9 +++++---- @@ -115,6 +119,7 @@ Enable jumbo build for the following component(s)/source_set(s): ui/events/devices/x11/BUILD.gn | 3 ++- ui/events/ipc/BUILD.gn | 4 +++- ui/events/keycodes/BUILD.gn | 5 +++-- + ui/events/ozone/evdev/BUILD.gn | 3 ++- ui/events/platform/BUILD.gn | 3 ++- ui/events/platform/x11/BUILD.gn | 3 ++- ui/gfx/BUILD.gn | 15 ++++++++------- @@ -122,7 +127,8 @@ Enable jumbo build for the following component(s)/source_set(s): ui/gfx/codec/BUILD.gn | 3 ++- ui/gfx/codec/jpeg_codec.cc | 4 ++++ ui/gfx/codec/png_codec.cc | 4 ++++ - ui/gfx/geometry/BUILD.gn | 4 +++- + ui/gfx/geometry/BUILD.gn | 6 ++++-- + ui/gfx/geometry/transform_operations.cc | 4 ++++ ui/gfx/ipc/BUILD.gn | 4 +++- ui/gfx/ipc/buffer_types/BUILD.gn | 4 +++- ui/gfx/ipc/color/BUILD.gn | 4 +++- @@ -136,12 +142,12 @@ Enable jumbo build for the following component(s)/source_set(s): ui/gl/gl_display_egl_util.cc | 4 ++++ ui/gl/init/BUILD.gn | 3 ++- ui/gtk/BUILD.gn | 10 ++++++++-- - ui/gtk/ime_compat_check.cc | 6 ++++++ ui/latency/BUILD.gn | 5 +++-- ui/message_center/BUILD.gn | 3 ++- ui/message_center/public/cpp/BUILD.gn | 3 ++- - ui/native_theme/BUILD.gn | 7 ++++--- + ui/native_theme/BUILD.gn | 3 ++- ui/ozone/BUILD.gn | 11 ++++++----- + ui/platform_window/BUILD.gn | 3 ++- ui/platform_window/stub/BUILD.gn | 4 +++- ui/platform_window/win/BUILD.gn | 4 +++- ui/resources/BUILD.gn | 1 + @@ -149,9 +155,11 @@ Enable jumbo build for the following component(s)/source_set(s): ui/snapshot/BUILD.gn | 5 +++-- ui/surface/BUILD.gn | 3 ++- ui/touch_selection/BUILD.gn | 3 ++- - ui/views/BUILD.gn | 7 ++++--- + ui/views/BUILD.gn | 11 ++++++++--- + .../view_ax_platform_node_delegate.cc | 2 +- ui/views/animation/pulsing_ink_drop_mask.cc | 6 ++++++ ui/views/animation/pulsing_path_ink_drop_mask.cc | 6 ++++++ + ui/views/border.cc | 2 +- ui/views/bubble/bubble_frame_view.cc | 2 +- ui/views/controls/webview/BUILD.gn | 3 ++- ui/views/examples/BUILD.gn | 5 +++-- @@ -161,10 +169,10 @@ Enable jumbo build for the following component(s)/source_set(s): ui/web_dialogs/BUILD.gn | 6 ++++-- ui/wm/BUILD.gn | 5 +++-- ui/wm/public/BUILD.gn | 3 ++- - 76 files changed, 283 insertions(+), 107 deletions(-) + 81 files changed, 292 insertions(+), 110 deletions(-) diff --git a/ui/accessibility/BUILD.gn b/ui/accessibility/BUILD.gn -index c32f5a6380..99788856e9 100644 +index 3c7b11706a..1e6453522b 100644 --- a/ui/accessibility/BUILD.gn +++ b/ui/accessibility/BUILD.gn @@ -3,6 +3,7 @@ @@ -184,7 +192,7 @@ index c32f5a6380..99788856e9 100644 defines = [ "AX_BASE_IMPLEMENTATION" ] sources = [ -@@ -158,7 +159,7 @@ group("accessibility") { +@@ -162,7 +163,7 @@ group("accessibility") { ] } @@ -194,7 +202,7 @@ index c32f5a6380..99788856e9 100644 sources = [ diff --git a/ui/accessibility/platform/BUILD.gn b/ui/accessibility/platform/BUILD.gn -index 09b5f1a016..0aae08b595 100644 +index 54d483d6b3..a5bb2f6d49 100644 --- a/ui/accessibility/platform/BUILD.gn +++ b/ui/accessibility/platform/BUILD.gn @@ -3,6 +3,7 @@ @@ -214,8 +222,26 @@ index 09b5f1a016..0aae08b595 100644 output_name = "accessibility_platform" defines = [ "IS_AX_PLATFORM_IMPL" ] +diff --git a/ui/accessibility/platform/inspect/ax_inspect_utils_auralinux.cc b/ui/accessibility/platform/inspect/ax_inspect_utils_auralinux.cc +index 00c2c5dc9e..08ac87ba7c 100644 +--- a/ui/accessibility/platform/inspect/ax_inspect_utils_auralinux.cc ++++ b/ui/accessibility/platform/inspect/ax_inspect_utils_auralinux.cc +@@ -47,11 +47,13 @@ const char* GetNameForPlatformConstant( + #define QUOTE(X) \ + { X, #X } + ++#ifndef ATSPI_CHECK_VERSION + #define ATSPI_CHECK_VERSION(major, minor, micro) \ + (major) < ATSPI_MAJOR_VERSION || \ + ((major) == ATSPI_MAJOR_VERSION && (minor) < ATSPI_MINOR_VERSION) || \ + ((major) == ATSPI_MAJOR_VERSION && (minor) == ATSPI_MINOR_VERSION && \ + (micro) <= ATSPI_MICRO_VERSION) ++#endif + + #define CHECK_ATSPI_ERROR_NULLPTR(error) \ + if (error) { \ diff --git a/ui/aura/BUILD.gn b/ui/aura/BUILD.gn -index ce631d038e..8fa4338b5b 100644 +index 3de89188dd..f1eb3c392e 100644 --- a/ui/aura/BUILD.gn +++ b/ui/aura/BUILD.gn @@ -2,10 +2,11 @@ @@ -241,7 +267,7 @@ index ce631d038e..8fa4338b5b 100644 sources = [ "test/aura_test_base.cc", diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn -index eb8a8d2a27..a629c34956 100644 +index 1428a0aa8d..e9786252fb 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn @@ -6,6 +6,7 @@ import("//build/buildflag_header.gni") @@ -252,7 +278,7 @@ index eb8a8d2a27..a629c34956 100644 import("//build/config/linux/gtk/gtk.gni") import("//build/config/linux/pangocairo/pangocairo.gni") import("//build/config/locales.gni") -@@ -113,7 +114,7 @@ source_set("types") { +@@ -115,7 +116,7 @@ source_set("types") { } } @@ -261,7 +287,7 @@ index eb8a8d2a27..a629c34956 100644 output_name = "ui_base" sources = [ -@@ -231,6 +232,10 @@ component("base") { +@@ -223,6 +224,10 @@ component("base") { libs = [] @@ -272,7 +298,7 @@ index eb8a8d2a27..a629c34956 100644 if (is_android) { sources += [ "device_form_factor_android.cc", -@@ -703,7 +708,7 @@ component("features") { +@@ -693,7 +698,7 @@ component("features") { } if (is_win || is_mac || is_linux || is_chromeos) { @@ -281,7 +307,7 @@ index eb8a8d2a27..a629c34956 100644 testonly = true sources = [ "test/skia_gold_matching_algorithm.cc", -@@ -745,7 +750,7 @@ if (use_blink) { +@@ -753,7 +758,7 @@ if (is_android) { } } @@ -291,7 +317,7 @@ index eb8a8d2a27..a629c34956 100644 sources = [ "data_transfer_policy/mock_data_transfer_policy_controller.cc", diff --git a/ui/base/clipboard/BUILD.gn b/ui/base/clipboard/BUILD.gn -index 0bbbe28771..272d814434 100644 +index c375288ca4..427fcf5408 100644 --- a/ui/base/clipboard/BUILD.gn +++ b/ui/base/clipboard/BUILD.gn @@ -4,6 +4,7 @@ @@ -329,7 +355,7 @@ index 0bbbe28771..272d814434 100644 output_name = "ui_base_clipboard" sources = [ -@@ -198,7 +199,7 @@ component("clipboard") { +@@ -199,7 +200,7 @@ component("clipboard") { } } @@ -339,7 +365,7 @@ index 0bbbe28771..272d814434 100644 if (use_blink) { diff --git a/ui/base/ime/BUILD.gn b/ui/base/ime/BUILD.gn -index 7d597d81b1..795254d6aa 100644 +index 63e2515f5a..71b3d02d29 100644 --- a/ui/base/ime/BUILD.gn +++ b/ui/base/ime/BUILD.gn @@ -2,6 +2,7 @@ @@ -367,9 +393,9 @@ index 7d597d81b1..795254d6aa 100644 +jumbo_component("ime") { output_name = "ui_base_ime" sources = [ - "constants.cc", + "constants.h", diff --git a/ui/base/ime/ash/BUILD.gn b/ui/base/ime/ash/BUILD.gn -index a79042808e..48979f29c8 100644 +index c5cd011135..cee3672eb6 100644 --- a/ui/base/ime/ash/BUILD.gn +++ b/ui/base/ime/ash/BUILD.gn @@ -2,6 +2,8 @@ @@ -459,7 +485,7 @@ index fc5cb85b07..8e50ead627 100644 sources = [ diff --git a/ui/base/ime/win/BUILD.gn b/ui/base/ime/win/BUILD.gn -index 9bcd262118..9db7511f41 100644 +index 8972a21f80..503331ceda 100644 --- a/ui/base/ime/win/BUILD.gn +++ b/ui/base/ime/win/BUILD.gn @@ -2,9 +2,11 @@ @@ -484,7 +510,7 @@ index 9bcd262118..9db7511f41 100644 defines = [ "IS_UI_BASE_IME_WIN_IMPL" ] diff --git a/ui/base/prediction/BUILD.gn b/ui/base/prediction/BUILD.gn -index 2e653b3df7..dae3070134 100644 +index ed391d69a3..f8a05f3818 100644 --- a/ui/base/prediction/BUILD.gn +++ b/ui/base/prediction/BUILD.gn @@ -2,7 +2,9 @@ @@ -499,7 +525,7 @@ index 2e653b3df7..dae3070134 100644 "empty_filter.cc", "empty_filter.h", diff --git a/ui/base/x/BUILD.gn b/ui/base/x/BUILD.gn -index 113877faf2..dfbc2c76a4 100644 +index c238a1b0cf..dc880044dd 100644 --- a/ui/base/x/BUILD.gn +++ b/ui/base/x/BUILD.gn @@ -2,6 +2,7 @@ @@ -520,10 +546,10 @@ index 113877faf2..dfbc2c76a4 100644 sources = [ diff --git a/ui/base/x/selection_owner.cc b/ui/base/x/selection_owner.cc -index d106cb0f2c..c3ee94940b 100644 +index 35a1178e20..88f994fb95 100644 --- a/ui/base/x/selection_owner.cc +++ b/ui/base/x/selection_owner.cc -@@ -72,11 +72,13 @@ bool GetAtomPairArrayProperty( +@@ -69,11 +69,13 @@ bool GetAtomPairArrayProperty( return true; } @@ -538,7 +564,7 @@ index d106cb0f2c..c3ee94940b 100644 void SetSelectionOwner(x11::Window window, x11::Atom selection, x11::Time time = x11::Time::CurrentTime) { -@@ -346,3 +348,5 @@ SelectionOwner::IncrementalTransfer::operator=(IncrementalTransfer&&) = default; +@@ -342,3 +344,5 @@ SelectionOwner::IncrementalTransfer::operator=(IncrementalTransfer&&) = default; SelectionOwner::IncrementalTransfer::~IncrementalTransfer() = default; } // namespace ui @@ -591,7 +617,7 @@ index 1ef1fcf743..844464732e 100644 +#undef kXdndActionLink +#undef kXdndActionList diff --git a/ui/base/x/x11_drag_drop_client.cc b/ui/base/x/x11_drag_drop_client.cc -index a70b7acf35..375198eccd 100644 +index f1c43001fe..e99c24c004 100644 --- a/ui/base/x/x11_drag_drop_client.cc +++ b/ui/base/x/x11_drag_drop_client.cc @@ -31,6 +31,12 @@ @@ -607,7 +633,7 @@ index a70b7acf35..375198eccd 100644 namespace ui { // Window property on the source window and message used by the XDS protocol. -@@ -730,3 +736,9 @@ void XDragDropClient::EndMoveLoop() { +@@ -732,3 +738,9 @@ void XDragDropClient::EndMoveLoop() { } } // namespace ui @@ -618,7 +644,7 @@ index a70b7acf35..375198eccd 100644 +#undef kXdndActionLink +#undef kXdndActionList diff --git a/ui/color/BUILD.gn b/ui/color/BUILD.gn -index 7d9a7d263c..e7daed6aa9 100644 +index 64a92227ea..d8a6912b30 100644 --- a/ui/color/BUILD.gn +++ b/ui/color/BUILD.gn @@ -3,6 +3,7 @@ @@ -647,7 +673,7 @@ index 7d9a7d263c..e7daed6aa9 100644 sources = [ "color_metrics.cc", "color_mixer.cc", -@@ -141,7 +142,7 @@ if (is_win) { +@@ -143,7 +144,7 @@ if (is_win) { } } @@ -657,7 +683,7 @@ index 7d9a7d263c..e7daed6aa9 100644 "color_mixers.cc", "color_mixers.h", diff --git a/ui/compositor/BUILD.gn b/ui/compositor/BUILD.gn -index 27afd8eef3..4fb478d97a 100644 +index f1ed7c7da8..5cf86b05b1 100644 --- a/ui/compositor/BUILD.gn +++ b/ui/compositor/BUILD.gn @@ -2,10 +2,11 @@ @@ -683,7 +709,7 @@ index 27afd8eef3..4fb478d97a 100644 sources = [ "test/begin_main_frame_waiter.cc", diff --git a/ui/display/BUILD.gn b/ui/display/BUILD.gn -index 491b8006c8..1927d4e15f 100644 +index ca9b2b6f9a..ff39e7d684 100644 --- a/ui/display/BUILD.gn +++ b/ui/display/BUILD.gn @@ -2,6 +2,7 @@ @@ -703,7 +729,7 @@ index 491b8006c8..1927d4e15f 100644 sources = [ "display.cc", "display.h", -@@ -181,7 +182,7 @@ if (is_chromeos) { +@@ -183,7 +184,7 @@ if (is_chromeos) { } } @@ -713,7 +739,7 @@ index 491b8006c8..1927d4e15f 100644 sources = [ "test/display_matchers.cc", diff --git a/ui/display/manager/BUILD.gn b/ui/display/manager/BUILD.gn -index 607aad6384..ae298c25d3 100644 +index c59e6e0dcb..bff4b73c52 100644 --- a/ui/display/manager/BUILD.gn +++ b/ui/display/manager/BUILD.gn @@ -2,11 +2,12 @@ @@ -763,7 +789,7 @@ index cfb992fb9e..fb41100de8 100644 sources = [ "display_util.cc", diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn -index 5a04e40511..8837b47f8f 100644 +index b48f9cf24a..554eff5943 100644 --- a/ui/events/BUILD.gn +++ b/ui/events/BUILD.gn @@ -3,6 +3,7 @@ @@ -792,7 +818,7 @@ index 5a04e40511..8837b47f8f 100644 sources = [ "base_event_utils.cc", "base_event_utils.h", -@@ -232,7 +233,7 @@ component("events_base") { +@@ -230,7 +231,7 @@ component("events_base") { } } @@ -801,8 +827,8 @@ index 5a04e40511..8837b47f8f 100644 public = [ "cocoa/cocoa_event_utils.h", "event.h", -@@ -443,7 +444,7 @@ component("events") { - } +@@ -450,7 +451,7 @@ component("events") { + configs += [ "//build/config/compiler:no_exit_time_destructors" ] } -component("keyboard_hook") { @@ -810,7 +836,7 @@ index 5a04e40511..8837b47f8f 100644 public = [ "keyboard_hook.h" ] defines = [ "IS_KEYBOARD_HOOK_IMPL" ] -@@ -497,7 +498,7 @@ component("keyboard_hook") { +@@ -504,7 +505,7 @@ component("keyboard_hook") { } } @@ -819,7 +845,7 @@ index 5a04e40511..8837b47f8f 100644 sources = [ "gesture_detection/filtered_gesture_provider.cc", "gesture_detection/filtered_gesture_provider.h", -@@ -555,7 +556,7 @@ component("gesture_detection") { +@@ -562,7 +563,7 @@ component("gesture_detection") { } } @@ -828,7 +854,7 @@ index 5a04e40511..8837b47f8f 100644 sources = [ "velocity_tracker/bitset_32.h", "velocity_tracker/motion_event.cc", -@@ -578,7 +579,7 @@ component("velocity_tracker") { +@@ -585,7 +586,7 @@ component("velocity_tracker") { ] } @@ -838,7 +864,7 @@ index 5a04e40511..8837b47f8f 100644 "test/event_generator.cc", "test/event_generator.h", diff --git a/ui/events/blink/BUILD.gn b/ui/events/blink/BUILD.gn -index d707bb6e0c..8b4d97f467 100644 +index 82effa0b84..3a6d0dfbd9 100644 --- a/ui/events/blink/BUILD.gn +++ b/ui/events/blink/BUILD.gn @@ -2,9 +2,10 @@ @@ -863,7 +889,7 @@ index d707bb6e0c..8b4d97f467 100644 "blink_event_util.cc", "blink_event_util.h", diff --git a/ui/events/devices/BUILD.gn b/ui/events/devices/BUILD.gn -index ba8245d736..5fd9d5e8e7 100644 +index 31e12b0195..e62ccdbd80 100644 --- a/ui/events/devices/BUILD.gn +++ b/ui/events/devices/BUILD.gn @@ -3,6 +3,7 @@ @@ -944,6 +970,27 @@ index 4f4fbfb769..30a0b6e142 100644 output_name = "keycodes_x11" sources = [ +diff --git a/ui/events/ozone/evdev/BUILD.gn b/ui/events/ozone/evdev/BUILD.gn +index d37eb09cfd..bf3c2e6733 100644 +--- a/ui/events/ozone/evdev/BUILD.gn ++++ b/ui/events/ozone/evdev/BUILD.gn +@@ -3,6 +3,7 @@ + # found in the LICENSE file. + + import("//build/config/chromeos/args.gni") ++import("//build/config/jumbo.gni") + import("//build/config/linux/pkg_config.gni") + import("//build/config/ui.gni") + +@@ -43,7 +44,7 @@ if (use_libinput) { + } + } + +-component("evdev") { ++jumbo_component("evdev") { + output_name = "events_ozone_evdev" + + sources = [ diff --git a/ui/events/platform/BUILD.gn b/ui/events/platform/BUILD.gn index 1b54f4b46f..1b6b162b06 100644 --- a/ui/events/platform/BUILD.gn @@ -980,7 +1027,7 @@ index c8abb820bd..7028f735b4 100644 sources = [ diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn -index 66307a0b27..dd8cc31c4b 100644 +index f6a40abfe9..8c4f0f710d 100644 --- a/ui/gfx/BUILD.gn +++ b/ui/gfx/BUILD.gn @@ -3,6 +3,7 @@ @@ -991,7 +1038,7 @@ index 66307a0b27..dd8cc31c4b 100644 import("//build/config/ozone.gni") import("//build/config/ui.gni") import("//device/vr/buildflags/buildflags.gni") -@@ -21,7 +22,7 @@ if (is_android) { +@@ -22,7 +23,7 @@ if (is_android) { } # Used for color generation at build time without importing all the gfx. @@ -1000,7 +1047,7 @@ index 66307a0b27..dd8cc31c4b 100644 sources = [ "color_palette.h", "color_utils.cc", -@@ -35,7 +36,7 @@ component("color_utils") { +@@ -36,7 +37,7 @@ component("color_utils") { ] } @@ -1009,7 +1056,7 @@ index 66307a0b27..dd8cc31c4b 100644 sources = [ "gfx_skia_export.h", "skia_span_util.cc", -@@ -69,7 +70,7 @@ config("gfx_impl_define") { +@@ -70,7 +71,7 @@ config("gfx_impl_define") { defines = [ "IS_GFX_IMPL" ] } @@ -1018,7 +1065,7 @@ index 66307a0b27..dd8cc31c4b 100644 sources = [ "break_list.h", "color_analysis.cc", -@@ -451,7 +452,7 @@ component("gfx") { +@@ -450,7 +451,7 @@ component("gfx") { } } @@ -1027,7 +1074,7 @@ index 66307a0b27..dd8cc31c4b 100644 sources = [ "color_space.cc", "color_space.h", -@@ -594,7 +595,7 @@ group("memory_buffer") { +@@ -593,7 +594,7 @@ group("memory_buffer") { } # Cannot be a static_library in component builds due to exported functions @@ -1036,7 +1083,7 @@ index 66307a0b27..dd8cc31c4b 100644 visibility = [ ":*" ] # Depend on through ":memory_buffer". # TODO(brettw) refactor this so these sources are in a coherent directory -@@ -694,7 +695,7 @@ source_set("memory_buffer_sources") { +@@ -690,7 +691,7 @@ source_set("memory_buffer_sources") { } # TODO(ccameron): This can be moved into a separate source_set. @@ -1045,7 +1092,7 @@ index 66307a0b27..dd8cc31c4b 100644 sources = [ "switches.cc", "switches.h", -@@ -706,7 +707,7 @@ component("gfx_switches") { +@@ -702,7 +703,7 @@ component("gfx_switches") { deps = [ "//base" ] } @@ -1076,7 +1123,7 @@ index a8ee2ddc03..24b9dc8fd3 100644 "animation.cc", "animation.h", diff --git a/ui/gfx/codec/BUILD.gn b/ui/gfx/codec/BUILD.gn -index 327eb6d2d0..def3b7850b 100644 +index 9bb4c91504..0c751935ea 100644 --- a/ui/gfx/codec/BUILD.gn +++ b/ui/gfx/codec/BUILD.gn @@ -3,10 +3,11 @@ @@ -1112,26 +1159,26 @@ index 6b233181ea..ef823b815d 100644 + +#undef PreparationOutput diff --git a/ui/gfx/codec/png_codec.cc b/ui/gfx/codec/png_codec.cc -index aea66652b6..0f0876b22f 100644 +index 94d5c65d60..2e0f5db620 100644 --- a/ui/gfx/codec/png_codec.cc +++ b/ui/gfx/codec/png_codec.cc -@@ -28,6 +28,8 @@ - #include "third_party/skia/experimental/rust_png/decoder/SkPngRustDecoder.h" - #endif +@@ -20,6 +20,8 @@ + #include "ui/gfx/codec/vector_wstream.h" + #include "ui/gfx/geometry/size.h" +#define PreparationOutput PreparationOutput_PNGCodec + namespace gfx { PNGCodec::DecodeOutput::DecodeOutput() = default; -@@ -319,3 +321,5 @@ PNGCodec::Comment::Comment(const std::string& k, const std::string& t) +@@ -301,3 +303,5 @@ PNGCodec::Comment::Comment(const std::string& k, const std::string& t) PNGCodec::Comment::~Comment() = default; } // namespace gfx + +#undef PreparationOutput diff --git a/ui/gfx/geometry/BUILD.gn b/ui/gfx/geometry/BUILD.gn -index 98aeed5091..03fe83f5bd 100644 +index a5e3e1be9f..1155f333a2 100644 --- a/ui/gfx/geometry/BUILD.gn +++ b/ui/gfx/geometry/BUILD.gn @@ -2,7 +2,9 @@ @@ -1145,6 +1192,34 @@ index 98aeed5091..03fe83f5bd 100644 sources = [ "axis_transform2d.cc", "axis_transform2d.h", +@@ -84,7 +86,7 @@ component("geometry") { + } + } + +-component("geometry_skia") { ++jumbo_component("geometry_skia") { + sources = [ + "linear_gradient.cc", + "linear_gradient.h", +diff --git a/ui/gfx/geometry/transform_operations.cc b/ui/gfx/geometry/transform_operations.cc +index da9798ae40..247e2cd50f 100644 +--- a/ui/gfx/geometry/transform_operations.cc ++++ b/ui/gfx/geometry/transform_operations.cc +@@ -14,6 +14,8 @@ + #include "ui/gfx/geometry/transform_util.h" + #include "ui/gfx/geometry/vector3d_f.h" + ++#define TanDegrees TanDegrees_TransformOperations ++ + namespace gfx { + + TransformOperations::TransformOperations() = default; +@@ -388,3 +390,5 @@ bool TransformOperations::ComputeDecomposedTransform( + } + + } // namespace gfx ++ ++#undef TanDegrees diff --git a/ui/gfx/ipc/BUILD.gn b/ui/gfx/ipc/BUILD.gn index 83f5cd0b14..44f4ad493c 100644 --- a/ui/gfx/ipc/BUILD.gn @@ -1257,7 +1332,7 @@ index 802404b7c8..d987b2bb2b 100644 sources = [ diff --git a/ui/gfx/x/randr_output_manager.cc b/ui/gfx/x/randr_output_manager.cc -index f26bd4949a..682112d205 100644 +index bffe824a14..33ece7f22c 100644 --- a/ui/gfx/x/randr_output_manager.cc +++ b/ui/gfx/x/randr_output_manager.cc @@ -51,6 +51,11 @@ @@ -1272,7 +1347,7 @@ index f26bd4949a..682112d205 100644 namespace { constexpr auto kInvalidMode = static_cast(0); -@@ -559,3 +564,8 @@ std::string RandROutputManager::GetModeNameForOutput( +@@ -558,3 +563,8 @@ std::string RandROutputManager::GetModeNameForOutput( } } // namespace x11 @@ -1305,7 +1380,7 @@ index 51db6c7cfc..3424804225 100644 +#undef kDisabledCrtc +#undef PixelsToMillimeters diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn -index 9c8e7e1ca7..28b865c773 100644 +index 795c5b51db..4292c46627 100644 --- a/ui/gl/BUILD.gn +++ b/ui/gl/BUILD.gn @@ -4,6 +4,7 @@ @@ -1316,7 +1391,7 @@ index 9c8e7e1ca7..28b865c773 100644 import("//build/config/linux/pkg_config.gni") import("//build/config/ozone.gni") import("//build/config/ui.gni") -@@ -51,7 +52,7 @@ component("gl_enums") { +@@ -55,7 +56,7 @@ source_set("gl_headers") { public_deps = [ "//third_party/angle:includes" ] } @@ -1325,7 +1400,7 @@ index 9c8e7e1ca7..28b865c773 100644 output_name = "gl_wrapper" # Avoid colliding with OS X"s libGL.dylib. sources = [ -@@ -352,6 +353,10 @@ component("gl") { +@@ -356,6 +357,10 @@ component("gl") { defines += [ "GL_SILENCE_DEPRECATION" ] } @@ -1336,7 +1411,7 @@ index 9c8e7e1ca7..28b865c773 100644 if (is_android) { sources += [ "android/egl_fence_utils.cc", -@@ -433,11 +438,15 @@ if (is_mac) { +@@ -437,11 +442,15 @@ if (is_mac) { "//third_party/swiftshader/src/Vulkan:icd_file", "//third_party/swiftshader/src/Vulkan:swiftshader_libvulkan", ] @@ -1353,7 +1428,7 @@ index 9c8e7e1ca7..28b865c773 100644 testonly = true sources = [ "egl_bindings_autogen_mock.cc", -@@ -462,7 +471,7 @@ static_library("gl_unittest_utils") { +@@ -466,7 +475,7 @@ static_library("gl_unittest_utils") { ] } @@ -1399,7 +1474,7 @@ index 8ecd6bdc7e..377240cc6d 100644 public = [ diff --git a/ui/gtk/BUILD.gn b/ui/gtk/BUILD.gn -index dc98ce8281..def91dbc0b 100644 +index 967f63763b..08bcd53160 100644 --- a/ui/gtk/BUILD.gn +++ b/ui/gtk/BUILD.gn @@ -3,6 +3,7 @@ @@ -1422,15 +1497,15 @@ index dc98ce8281..def91dbc0b 100644 sources = [ "gtk_color_mixers.cc", "gtk_color_mixers.h", -@@ -104,6 +104,7 @@ component("gtk") { +@@ -102,6 +102,7 @@ component("gtk") { "window_frame_provider_gtk.cc", "window_frame_provider_gtk.h", ] + jumbo_excluded_sources = [] - defines = [ "IS_GTK_IMPL" ] - configs += [ - "//build/config/linux/pangocairo", -@@ -159,6 +160,11 @@ component("gtk") { + + if (enable_printing) { + sources += [ +@@ -168,6 +169,11 @@ component("gtk") { "x/gtk_ui_platform_x11.cc", "x/gtk_ui_platform_x11.h", ] @@ -1443,28 +1518,23 @@ index dc98ce8281..def91dbc0b 100644 "//ui/base/x", "//ui/events/platform/x11", diff --git a/ui/latency/BUILD.gn b/ui/latency/BUILD.gn -index 4690e49781..44d8a67de8 100644 +index 19184a5b6c..2df6fbd33b 100644 --- a/ui/latency/BUILD.gn +++ b/ui/latency/BUILD.gn -@@ -3,6 +3,7 @@ +@@ -2,9 +2,10 @@ + # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. - import("//build/buildflag_header.gni") +import("//build/config/jumbo.gni") import("//testing/test.gni") - declare_args() { -@@ -16,7 +17,7 @@ buildflag_header("jank_tracker_for_experiments_buildflags") { - flags = [ "JANK_TRACKER_FOR_EXPERIMENTS=$use_jank_tracker_for_experiments" ] - } - -source_set("latency") { +jumbo_source_set("latency") { sources = [ "latency_info.cc", "latency_info.h", -@@ -41,7 +42,7 @@ source_set("latency") { - ] +@@ -24,7 +25,7 @@ source_set("latency") { + configs += [ "//build/config/compiler:no_exit_time_destructors" ] } -source_set("test_support") { @@ -1473,7 +1543,7 @@ index 4690e49781..44d8a67de8 100644 sources = [ "latency_info_test_support.cc" ] diff --git a/ui/message_center/BUILD.gn b/ui/message_center/BUILD.gn -index e602c3c450..1855b8ded7 100644 +index 3047e2c9da..2e8b143de3 100644 --- a/ui/message_center/BUILD.gn +++ b/ui/message_center/BUILD.gn @@ -3,6 +3,7 @@ @@ -1494,7 +1564,7 @@ index e602c3c450..1855b8ded7 100644 "//base", "//ui/base", diff --git a/ui/message_center/public/cpp/BUILD.gn b/ui/message_center/public/cpp/BUILD.gn -index e15d9b3c19..5b5cdee474 100644 +index be78eb231f..2bbfee8e3b 100644 --- a/ui/message_center/public/cpp/BUILD.gn +++ b/ui/message_center/public/cpp/BUILD.gn @@ -2,10 +2,11 @@ @@ -1511,7 +1581,7 @@ index e15d9b3c19..5b5cdee474 100644 sources = [ diff --git a/ui/native_theme/BUILD.gn b/ui/native_theme/BUILD.gn -index 2c6223daf0..628198c597 100644 +index 0f0cfc2920..539b257111 100644 --- a/ui/native_theme/BUILD.gn +++ b/ui/native_theme/BUILD.gn @@ -2,10 +2,11 @@ @@ -1527,22 +1597,8 @@ index 2c6223daf0..628198c597 100644 sources = [ "caption_style.cc", "caption_style.h", -@@ -112,11 +113,11 @@ if (is_win) { - libs = [ "uxtheme.lib" ] - } - } else { -- source_set("native_theme_browser") { -+ jumbo_source_set("native_theme_browser") { - } - } - --source_set("test_support") { -+jumbo_source_set("test_support") { - testonly = true - - deps = [ diff --git a/ui/ozone/BUILD.gn b/ui/ozone/BUILD.gn -index a1c589b979..398d84e913 100644 +index 5ec68d1ff7..19fdbd21be 100644 --- a/ui/ozone/BUILD.gn +++ b/ui/ozone/BUILD.gn @@ -3,6 +3,7 @@ @@ -1562,7 +1618,7 @@ index a1c589b979..398d84e913 100644 sources = [ "public/gl_ozone.h", "public/gpu_platform_support_host.cc", -@@ -253,7 +254,7 @@ source_set("ozone_switches") { +@@ -280,7 +281,7 @@ source_set("ozone_switches") { ] } @@ -1571,7 +1627,7 @@ index a1c589b979..398d84e913 100644 visibility = [] visibility = [ "*" ] public_deps = [ ":platform" ] -@@ -270,7 +271,7 @@ source_set("drm_modifiers_filter") { +@@ -297,7 +298,7 @@ source_set("drm_modifiers_filter") { visibility += [ "//gpu/vulkan" ] } @@ -1580,7 +1636,7 @@ index a1c589b979..398d84e913 100644 testonly = true sources = [ -@@ -293,7 +294,7 @@ source_set("test_support_internal") { +@@ -320,7 +321,7 @@ source_set("test_support_internal") { public_deps = [ "//base/test:test_support" ] } @@ -1589,7 +1645,7 @@ index a1c589b979..398d84e913 100644 visibility = [] visibility = [ "//ui/views:test_support" ] -@@ -329,7 +330,7 @@ source_set("ozone_interactive_ui_tests") { +@@ -356,7 +357,7 @@ source_set("ozone_interactive_ui_tests") { deps = ozone_platform_interactive_ui_tests_sources } @@ -1598,6 +1654,22 @@ index a1c589b979..398d84e913 100644 visibility = [] visibility = [ ":*", +diff --git a/ui/platform_window/BUILD.gn b/ui/platform_window/BUILD.gn +index b0a39764e1..3c115bfa87 100644 +--- a/ui/platform_window/BUILD.gn ++++ b/ui/platform_window/BUILD.gn +@@ -2,9 +2,10 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/jumbo.gni") + import("//build/config/ui.gni") + +-component("platform_window") { ++jumbo_component("platform_window") { + sources = [ + "extensions/workspace_extension.cc", + "extensions/workspace_extension.h", diff --git a/ui/platform_window/stub/BUILD.gn b/ui/platform_window/stub/BUILD.gn index 5f41949321..1d64d126b9 100644 --- a/ui/platform_window/stub/BUILD.gn @@ -1629,7 +1701,7 @@ index e172d7b2b4..f57d6db0d7 100644 deps = [ diff --git a/ui/resources/BUILD.gn b/ui/resources/BUILD.gn -index 5430e0711c..afedf73faa 100644 +index 9a38395944..7f571ec3a8 100644 --- a/ui/resources/BUILD.gn +++ b/ui/resources/BUILD.gn @@ -2,6 +2,7 @@ @@ -1704,7 +1776,7 @@ index dace1de6c0..e7f68805e9 100644 "surface_export.h", "transport_dib.cc", diff --git a/ui/touch_selection/BUILD.gn b/ui/touch_selection/BUILD.gn -index ce5ee873dc..7adf1eb56c 100644 +index 5043429e94..83a1accb6f 100644 --- a/ui/touch_selection/BUILD.gn +++ b/ui/touch_selection/BUILD.gn @@ -2,6 +2,7 @@ @@ -1725,7 +1797,7 @@ index ce5ee873dc..7adf1eb56c 100644 sources = [ diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn -index a8f20a6942..6c67c2b786 100644 +index 95a2d5d04a..47b61bb43f 100644 --- a/ui/views/BUILD.gn +++ b/ui/views/BUILD.gn @@ -4,6 +4,7 @@ @@ -1745,7 +1817,18 @@ index a8f20a6942..6c67c2b786 100644 all_dependent_configs = [ ":flags" ] public = [ -@@ -976,7 +977,7 @@ component("views") { +@@ -547,6 +548,10 @@ component("views") { + "window/window_shape.cc", + "windows_stationarity_monitor.cc", + ] ++ jumbo_excluded_sources = [ ++ # explicit specialization of 'GetProperty' after instantiation ++ "view_class_properties.cc", ++ ] + + # Other targets in this file (e.g. tests) get access to the internal headers. + friend = [ ":*" ] +@@ -978,7 +983,7 @@ component("views") { } if (is_win || is_mac || is_linux || is_chromeos) { @@ -1754,7 +1837,7 @@ index a8f20a6942..6c67c2b786 100644 testonly = true sources = [ "test/view_skia_gold_pixel_diff.cc", -@@ -995,7 +996,7 @@ if (is_win || is_mac || is_linux || is_chromeos) { +@@ -997,7 +1002,7 @@ if (is_win || is_mac || is_linux || is_chromeos) { } } @@ -1762,7 +1845,20 @@ index a8f20a6942..6c67c2b786 100644 +jumbo_source_set("test_support") { testonly = true sources = [ - "animation/test/flood_fill_ink_drop_ripple_test_api.cc", + "accessibility/tree/view_accessibility_ax_tree_source_test_api.h", +diff --git a/ui/views/accessibility/view_ax_platform_node_delegate.cc b/ui/views/accessibility/view_ax_platform_node_delegate.cc +index ca7e48f98d..0012187e93 100644 +--- a/ui/views/accessibility/view_ax_platform_node_delegate.cc ++++ b/ui/views/accessibility/view_ax_platform_node_delegate.cc +@@ -713,7 +713,7 @@ gfx::NativeViewAccessible ViewAXPlatformNodeDelegate::HitTestSync( + // Search child widgets first, since they're on top in the z-order. + for (Widget* child_widget : GetChildWidgets().child_widgets) { + View* child_root_view = child_widget->GetRootView(); +- if (features::IsAccessibilityHitTestPointCopyEnabled()) { ++ if (::features::IsAccessibilityHitTestPointCopyEnabled()) { + // Use a per-iteration copy; don't mutate `point` so later iterations and + // the view() hit test use the original ScreenToDIPPoint result. + gfx::Point point_for_child = point; diff --git a/ui/views/animation/pulsing_ink_drop_mask.cc b/ui/views/animation/pulsing_ink_drop_mask.cc index c33e817520..9fa720f76b 100644 --- a/ui/views/animation/pulsing_ink_drop_mask.cc @@ -1785,7 +1881,7 @@ index c33e817520..9fa720f76b 100644 +#undef kFeaturePromoPulseDuration +#undef kFeaturePromoPulseInsetDip diff --git a/ui/views/animation/pulsing_path_ink_drop_mask.cc b/ui/views/animation/pulsing_path_ink_drop_mask.cc -index 0e39d27276..3ca1c18cb9 100644 +index f1ce31754a..4376f21dd5 100644 --- a/ui/views/animation/pulsing_path_ink_drop_mask.cc +++ b/ui/views/animation/pulsing_path_ink_drop_mask.cc @@ -11,6 +11,9 @@ @@ -1798,18 +1894,31 @@ index 0e39d27276..3ca1c18cb9 100644 namespace { // Cycle duration of ink drop pulsing animation used for in-product help. -@@ -106,3 +109,6 @@ void PulsingPathInkDropMask::AnimationProgressed( +@@ -105,3 +108,6 @@ void PulsingPathInkDropMask::AnimationProgressed( layer_container_->SchedulePaint(); } } // namespace views + +#undef kFeaturePromoPulseDuration +#undef kFeaturePromoPulseInsetDip +diff --git a/ui/views/border.cc b/ui/views/border.cc +index 2aafa2e12e..f5df5f6562 100644 +--- a/ui/views/border.cc ++++ b/ui/views/border.cc +@@ -55,7 +55,7 @@ void SolidSidedBorder::Paint(const View& view, gfx::Canvas* canvas) { + gfx::RectF scaled_bounds; + gfx::InsetsF insets_in_pixels; + +- if (!features::IsPixelCanvasRecordingEnabled()) { ++ if (!::features::IsPixelCanvasRecordingEnabled()) { + // Undo DSF so that we can be sure to draw an integral number of pixels for + // the border. Integral scale factors should be unaffected by this, but for + // fractional scale factors this ensures sharp lines. diff --git a/ui/views/bubble/bubble_frame_view.cc b/ui/views/bubble/bubble_frame_view.cc -index e9a2f4f54f..2279cd4bed 100644 +index d5861bde36..f8b5022ea1 100644 --- a/ui/views/bubble/bubble_frame_view.cc +++ b/ui/views/bubble/bubble_frame_view.cc -@@ -156,7 +156,7 @@ std::unique_ptr