electron-host-tools-for-code-oss: bump to 39.2.3

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

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" ]

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.

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("//v8/gni/snapshot_toolchain.gni")
  import("clang.gni")
  
-+import("//v8/gni/snapshot_toolchain.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" ]
- 
+     }

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",

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" ]
+     }
+   }

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,

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<struct timeval, 2> times) {
 -#ifdef __USE_XOPEN2K8
 +#if defined(__USE_XOPEN2K8) || (defined(__ANDROID__) && __ANDROID_API__ < 26)
    // futimens should be available, but futimes might not be

x11-packages/electron-host-tools-for-code-oss/cr-patches/1010-chromium-partition-allocator-memfd.patch

@@ -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 <sys/mman.h>
- #endif
- 
-+#if defined(__ANDROID__) && __ANDROID_API__ < 30
-+#include <sys/syscall.h>
-+#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 <sys/syscall.h>
-+#define memfd_create(name,flags) syscall(SYS_memfd_create,name,flags)
-+#endif
-+
- namespace partition_alloc::internal {
- 
- #if PA_BUILDFLAG(RECORD_ALLOC_INFO)

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

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 {

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

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<const VkBaseInStructure *>(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<const VkSwapchainImageCreateInfoANDROID *>(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<void *>(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<const VkBindImageMemorySwapchainInfoKHR *>(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<VkPhysicalDevicePresentationPropertiesANDROID *>(extensionProperties);
-@@ -4002,7 +4002,7 @@
+@@ -4044,7 +4044,7 @@
  
  	VkBaseOutStructure *extensionProperties = reinterpret_cast<VkBaseOutStructure *>(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<VkAndroidHardwareBufferUsageANDROID *>(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__
  

x11-packages/electron-host-tools-for-code-oss/cr-patches/6001-add-missing-include-guard.patch

@@ -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_

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 <bits/stdint-uintn.h>
+ #endif
+ 

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 ||

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<TimeDelta> 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",
    ]

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<base::SingleThreadTaskRunner> task_runner,
      scoped_refptr<base::SingleThreadTaskRunner> 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 @@

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 <unistd.h>
+ #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

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<int64_t>(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<Any> WasmInJSInliningReducer<Next>::TryInlineWasmCall(
+@@ -1316,6 +1316,8 @@ V<Any> WasmInJSInliningReducer<Next>::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<void*>(params.requested_start_hint),
            reinterpret_cast<void*>(region().begin()),
            reinterpret_cast<void*>(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 <StatsCollector::ScopeId scope_id,
-@@ -799,3 +801,5 @@ Marker::Marker(HeapBase& heap, cppgc::Platform* platform, MarkingConfig config)
+@@ -807,3 +809,5 @@ Marker::Marker(HeapBase& heap, cppgc::Platform* platform, MarkingConfig config)
  
  }  // namespace internal
  }  // namespace cppgc
 +
 +#undef kDefaultDeadlineCheckInterval
 diff --git a/v8/src/heap/minor-mark-sweep.cc b/v8/src/heap/minor-mark-sweep.cc
-index 2930486325..34b44eb912 100644
+index 7dfcaa336c..278397237f 100644
 --- a/v8/src/heap/minor-mark-sweep.cc
 +++ b/v8/src/heap/minor-mark-sweep.cc
-@@ -861,6 +861,8 @@ void MinorMarkSweepCollector::TraceFragmentation() {
+@@ -862,6 +862,8 @@ void MinorMarkSweepCollector::TraceFragmentation() {
                 free_bytes_of_class[3]);
  }
  
@@ -622,7 +617,7 @@ index 2930486325..34b44eb912 100644
  namespace {
  
  // NewSpacePages with more live bytes than this threshold qualify for fast
-@@ -902,6 +904,8 @@ bool ShouldMovePage(PageMetadata* p, intptr_t live_bytes,
+@@ -903,6 +905,8 @@ bool ShouldMovePage(PageMetadata* p, intptr_t live_bytes,
  
  }  // namespace
  
@@ -657,10 +652,10 @@ index bda0e43cef..36a365b257 100644
  
  extern int pkey_alloc(unsigned int flags, unsigned int access_rights) V8_WEAK;
 diff --git a/v8/src/maglev/arm/maglev-ir-arm.cc b/v8/src/maglev/arm/maglev-ir-arm.cc
-index c481a34d69..37be0d7fff 100644
+index d462924aad..37f63d65f8 100644
 --- a/v8/src/maglev/arm/maglev-ir-arm.cc
 +++ b/v8/src/maglev/arm/maglev-ir-arm.cc
-@@ -943,6 +943,8 @@ void Return::GenerateCode(MaglevAssembler* masm, const ProcessingState& state) {
+@@ -1097,6 +1097,8 @@ void Return::GenerateCode(MaglevAssembler* masm, const ProcessingState& state) {
    __ Ret();
  }
  
@@ -670,10 +665,10 @@ index c481a34d69..37be0d7fff 100644
  }  // namespace internal
  }  // namespace v8
 diff --git a/v8/src/maglev/maglev-assembler-inl.h b/v8/src/maglev/maglev-assembler-inl.h
-index 79c90b2446..f4c619d781 100644
+index 62f23d0328..6c4c2d016a 100644
 --- a/v8/src/maglev/maglev-assembler-inl.h
 +++ b/v8/src/maglev/maglev-assembler-inl.h
-@@ -601,11 +601,11 @@ void CheckArgs(Args&&... args) {}
+@@ -603,11 +603,11 @@ void CheckArgs(Args&&... args) {}
  
  #endif  // DEBUG
  
@@ -688,10 +683,10 @@ index 79c90b2446..f4c619d781 100644
          } else {
            masm->PushReverse(std::forward<decltype(stack_args)>(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<DeoptimizationData> MaglevCodeGenerator::GenerateDeoptimizationData(
+@@ -2130,6 +2128,8 @@ Handle<DeoptimizationData> 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<int32_t> 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<CaseFirst> GetCaseFirst(Isolate* isolate,
+@@ -53,6 +53,8 @@ Maybe<CaseFirst> 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<JSObject> options,
-@@ -593,3 +595,5 @@ const std::set<std::string>& JSCollator::GetAvailableLocales() {
+@@ -597,3 +599,5 @@ const std::set<std::string>& 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<String> FormattedToString(
+@@ -1069,7 +1069,7 @@ MaybeDirectHandle<String> FormattedToString(
    return Intl::FormattedToString(isolate, formatted);
  }
  
@@ -794,9 +789,9 @@ index 03c847d8dd..ce88b925fb 100644
      Isolate* isolate, const icu::FormattedValue& formatted,
      const std::vector<std::vector<Part>>* parts,
      JSDurationFormat::Separator separator) {
-@@ -1134,7 +1134,7 @@ MaybeDirectHandle<JSArray> JSDurationFormat::FormatToParts(
+@@ -1132,7 +1132,7 @@ MaybeDirectHandle<JSArray> JSDurationFormat::FormatToParts(
      Isolate* isolate, DirectHandle<JSDurationFormat> df,
-     Handle<Object> duration) {
+     DirectHandle<Object> duration) {
    const char* method_name = "Intl.DurationFormat.prototype.formatToParts";
 -  return FormatCommon<JSArray, true, FormattedListToJSArray>(
 +  return FormatCommon<JSArray, true, FormattedListToJSArray_JSDurationFormat>(
@@ -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<String> IcuFieldIdToType(Isolate* isolate, int32_t field_id) {
+@@ -250,7 +250,7 @@ DirectHandle<String> IcuFieldIdToType(Isolate* isolate, int32_t field_id) {
  
  // A helper function to convert the FormattedList to a
  // MaybeHandle<JSArray> for the implementation of formatToParts.
@@ -816,7 +811,7 @@ index 97a0f6a8f5..eb3b69f0a5 100644
      Isolate* isolate, const icu::FormattedValue& formatted) {
    DirectHandle<JSArray> array = isolate->factory()->NewJSArray(0);
    icu::ConstrainedFieldPosition cfpos;
-@@ -285,7 +285,7 @@ MaybeDirectHandle<JSArray> JSListFormat::FormatListToParts(
+@@ -288,7 +288,7 @@ MaybeDirectHandle<JSArray> JSListFormat::FormatListToParts(
      Isolate* isolate, DirectHandle<JSListFormat> format,
      DirectHandle<FixedArray> list) {
    return FormatListCommon<JSArray>(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<String> JSPluralRules::ResolvePluralRange(
+@@ -222,6 +222,8 @@ MaybeDirectHandle<String> 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<std::string>& JSPluralRules::GetAvailableLocales() {
+@@ -386,3 +388,5 @@ const std::set<std::string>& 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 <signal.h>
+@@ -20,6 +20,7 @@
  #include <sys/mman.h>
+ #include <sys/ucontext.h>
  #include <unistd.h>
 +#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<BailoutReason> TurbolevGraphBuildingPhase::Run(PipelineData* data,
+ #include "src/compiler/turboshaft/undef-assembler-macros.inc"
+ 
+ }  // namespace v8::internal::compiler::turboshaft
++
++#undef TRACE

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

x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0110-device-and-extensions.patch

@@ -32,6 +32,7 @@ Enable jumbo build for the following component(s)/source_set(s):
  device/bluetooth/server_socket.cc                  |  4 ++++
  device/bluetooth/socket.cc                         |  4 ++++
  device/fido/BUILD.gn                               |  3 ++-
+ device/fido/enclave/enclave_authenticator.cc       |  6 ++++++
  device/fido/get_assertion_request_handler.cc       |  4 ++++
  device/fido/make_credential_request_handler.cc     |  4 ++++
  device/gamepad/BUILD.gn                            |  3 ++-
@@ -69,10 +70,10 @@ Enable jumbo build for the following component(s)/source_set(s):
  extensions/renderer/BUILD.gn                       |  5 +++--
  .../renderer/extension_localization_throttle.cc    |  4 ++++
  .../renderer/extension_url_loader_throttle.cc      |  4 ++++
- 55 files changed, 243 insertions(+), 41 deletions(-)
+ 56 files changed, 249 insertions(+), 41 deletions(-)
 
 diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn
-index e69ef178a0..51a328057b 100644
+index 3504d7197b..6d3c3c2045 100644
 --- a/device/bluetooth/BUILD.gn
 +++ b/device/bluetooth/BUILD.gn
 @@ -4,6 +4,7 @@
@@ -126,17 +127,17 @@ index e69ef178a0..51a328057b 100644
  
    defines = [ "DEVICE_BLUETOOTH_IMPLEMENTATION" ]
  
-@@ -586,6 +592,10 @@ component("bluetooth") {
+@@ -583,6 +589,10 @@ component("bluetooth") {
          "floss/floss_version.h",
          "floss/test_helpers.h",
        ]
 +      jumbo_excluded_sources += [
-+        "floss/floss_advertiser_client.cc", # Fail to compile with floss_dbus_client.cc
-+        "bluez/metrics_recorder.cc",        # Conflict with //device/bluetooth:deprecated_experimental_mojo
++        "floss/floss_dbus_client.cc", # Fail to compile with floss_dbus_client.cc
++        "bluez/metrics_recorder.cc",  # Conflict with //device/bluetooth:deprecated_experimental_mojo
 +      ]
-       if (is_chromeos) {
-         import("//chromeos/dbus/config/use_real_dbus_clients.gni")
-         configs += [ "//chromeos/dbus/config:use_real_dbus_clients_config" ]
+       if (is_linux) {
+         sources += [
+           "dbus/dbus_bluez_manager_wrapper_linux.cc",
 diff --git a/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.cc b/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.cc
 index a46c7ee2c6..f3ec47a4fd 100644
 --- a/device/bluetooth/bluez/bluetooth_remote_gatt_characteristic_bluez.cc
@@ -188,7 +189,7 @@ index 8e298f176e..3459a923bd 100644
             << "characteristic: " << GetIdentifier()
             << ", UUID: " << GetUUID().canonical_value()
 diff --git a/device/bluetooth/dbus/bluetooth_admin_policy_client.cc b/device/bluetooth/dbus/bluetooth_admin_policy_client.cc
-index ba06e1e16e..a3e5b3f63a 100644
+index 87ef9e01c6..0bdeaa5528 100644
 --- a/device/bluetooth/dbus/bluetooth_admin_policy_client.cc
 +++ b/device/bluetooth/dbus/bluetooth_admin_policy_client.cc
 @@ -15,6 +15,9 @@
@@ -201,7 +202,7 @@ index ba06e1e16e..a3e5b3f63a 100644
  const char kNoResponseError[] = "org.chromium.Error.NoResponse";
  const char kUnknownAdminPolicyError[] = "org.chromium.Error.UnknownAdminPolicy";
  
-@@ -193,3 +196,6 @@ BluetoothAdminPolicyClient::Create() {
+@@ -190,3 +193,6 @@ BluetoothAdminPolicyClient::Create() {
  }
  
  }  // namespace bluez
@@ -209,7 +210,7 @@ index ba06e1e16e..a3e5b3f63a 100644
 +#undef kNoResponseError
 +#undef kUnknownAdminPolicyError
 diff --git a/device/bluetooth/dbus/bluetooth_advertisement_monitor_manager_client.cc b/device/bluetooth/dbus/bluetooth_advertisement_monitor_manager_client.cc
-index 170d2fcee7..f01252f4f5 100644
+index 719026cc4a..6933c08ced 100644
 --- a/device/bluetooth/dbus/bluetooth_advertisement_monitor_manager_client.cc
 +++ b/device/bluetooth/dbus/bluetooth_advertisement_monitor_manager_client.cc
 @@ -17,6 +17,9 @@
@@ -222,7 +223,7 @@ index 170d2fcee7..f01252f4f5 100644
  namespace {
  const char kNoResponseError[] = "org.chromium.Error.NoResponse";
  const char kFailedError[] = "org.chromium.Error.Failed";
-@@ -221,3 +224,6 @@ BluetoothAdvertisementMonitorManagerClient::Create() {
+@@ -220,3 +223,6 @@ BluetoothAdvertisementMonitorManagerClient::Create() {
  }
  
  }  // namespace bluez
@@ -230,10 +231,10 @@ index 170d2fcee7..f01252f4f5 100644
 +#undef kNoResponseError
 +#undef kFailedError
 diff --git a/device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider_impl.cc b/device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider_impl.cc
-index 5a59853bb9..70d038edd1 100644
+index ba5ed562c9..51c6f7d107 100644
 --- a/device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider_impl.cc
 +++ b/device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider_impl.cc
-@@ -20,6 +20,10 @@
+@@ -17,6 +17,10 @@
  #include "device/bluetooth/dbus/bluetooth_gatt_characteristic_delegate_wrapper.h"
  #include "third_party/cros_system_api/dbus/service_constants.h"
  
@@ -244,7 +245,7 @@ index 5a59853bb9..70d038edd1 100644
  namespace bluez {
  
  namespace {
-@@ -579,3 +583,7 @@ BluetoothGattCharacteristicServiceProviderImpl::object_path() const {
+@@ -567,3 +571,7 @@ BluetoothGattCharacteristicServiceProviderImpl::object_path() const {
  }
  
  }  // namespace bluez
@@ -253,10 +254,10 @@ index 5a59853bb9..70d038edd1 100644
 +#undef kErrorPropertyReadOnly
 +#undef kErrorFailed
 diff --git a/device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider_impl.cc b/device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider_impl.cc
-index 6fbb539e02..2f08f7b634 100644
+index f56fb41778..4062e26010 100644
 --- a/device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider_impl.cc
 +++ b/device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider_impl.cc
-@@ -19,6 +19,10 @@
+@@ -16,6 +16,10 @@
  #include "device/bluetooth/dbus/bluetooth_gatt_attribute_helpers.h"
  #include "third_party/cros_system_api/dbus/service_constants.h"
  
@@ -267,7 +268,7 @@ index 6fbb539e02..2f08f7b634 100644
  namespace bluez {
  
  namespace {
-@@ -422,3 +426,7 @@ BluetoothGattDescriptorServiceProviderImpl::object_path() const {
+@@ -414,3 +418,7 @@ BluetoothGattDescriptorServiceProviderImpl::object_path() const {
  }
  
  }  // namespace bluez
@@ -316,10 +317,10 @@ index 26fefad8ac..34b69fcab2 100644
 +
 +#undef kErrorInvalidArgs
 diff --git a/device/bluetooth/dbus/fake_bluetooth_adapter_client.cc b/device/bluetooth/dbus/fake_bluetooth_adapter_client.cc
-index 598003e425..0e03e41532 100644
+index 3341a25a41..da39c5f310 100644
 --- a/device/bluetooth/dbus/fake_bluetooth_adapter_client.cc
 +++ b/device/bluetooth/dbus/fake_bluetooth_adapter_client.cc
-@@ -20,6 +20,8 @@
+@@ -21,6 +21,8 @@
  #include "device/bluetooth/dbus/fake_bluetooth_device_client.h"
  #include "third_party/cros_system_api/dbus/service_constants.h"
  
@@ -328,7 +329,7 @@ index 598003e425..0e03e41532 100644
  namespace bluez {
  
  namespace {
-@@ -382,3 +384,5 @@ void FakeBluetoothAdapterClient::PostDelayedTask(base::OnceClosure callback) {
+@@ -383,3 +385,5 @@ void FakeBluetoothAdapterClient::PostDelayedTask(base::OnceClosure callback) {
  }
  
  }  // namespace bluez
@@ -491,10 +492,10 @@ index 8e6302786f..9ecd2850a8 100644
 +
 +#undef HoldReferenceUntilDisconnected
 diff --git a/device/bluetooth/socket.cc b/device/bluetooth/socket.cc
-index c62895726b..242b1213b3 100644
+index 21cf46c0eb..a19efcd8d4 100644
 --- a/device/bluetooth/socket.cc
 +++ b/device/bluetooth/socket.cc
-@@ -24,6 +24,8 @@
+@@ -20,6 +20,8 @@
  #include "mojo/public/cpp/system/data_pipe.h"
  #include "net/base/io_buffer.h"
  
@@ -503,14 +504,14 @@ index c62895726b..242b1213b3 100644
  namespace bluetooth {
  namespace {
  // TODO(b/269348144) - BluetoothSocket is constructed in UI thread and must also
-@@ -201,3 +203,5 @@ void Socket::OnBluetoothSocketSendError(const std::string& error_message) {
+@@ -196,3 +198,5 @@ void Socket::OnBluetoothSocketSendError(const std::string& error_message) {
  }
  
  }  // namespace bluetooth
 +
 +#undef HoldReferenceUntilDisconnected
 diff --git a/device/fido/BUILD.gn b/device/fido/BUILD.gn
-index e98293ea22..b02da75bc6 100644
+index 56e36e9355..341e8020b6 100644
 --- a/device/fido/BUILD.gn
 +++ b/device/fido/BUILD.gn
 @@ -3,9 +3,10 @@
@@ -525,11 +526,32 @@ index e98293ea22..b02da75bc6 100644
    # These source files represent the minimal subset of files used for passkey
    # related authentication functions, with a limited amount of dependencies,
    # making it possible to build these on any platform, including iOS.
+diff --git a/device/fido/enclave/enclave_authenticator.cc b/device/fido/enclave/enclave_authenticator.cc
+index fed6a52eae..545ee29486 100644
+--- a/device/fido/enclave/enclave_authenticator.cc
++++ b/device/fido/enclave/enclave_authenticator.cc
+@@ -31,6 +31,9 @@
+ #include "device/fido/public_key_credential_descriptor.h"
+ #include "services/data_decoder/public/cpp/data_decoder.h"
+ 
++#define kLargeBlobKey     kLargeBlobKey_EnclaveAuthenticator
++#define kLargeBlobSizeKey kLargeBlobSizeKey_EnclaveAuthenticator
++
+ namespace device::enclave {
+ 
+ namespace {
+@@ -687,3 +690,6 @@ base::WeakPtr<FidoAuthenticator> EnclaveAuthenticator::GetWeakPtr() {
+ }
+ 
+ }  // namespace device::enclave
++
++#undef kLargeBlobKey
++#undef kLargeBlobSizeKey
 diff --git a/device/fido/get_assertion_request_handler.cc b/device/fido/get_assertion_request_handler.cc
-index e66e4ca678..fb079861c8 100644
+index 3b5657b5d4..4a5c915e35 100644
 --- a/device/fido/get_assertion_request_handler.cc
 +++ b/device/fido/get_assertion_request_handler.cc
-@@ -50,6 +50,8 @@
+@@ -49,6 +49,8 @@
  #include "device/fido/cros/authenticator.h"
  #endif
  
@@ -538,14 +560,14 @@ index e66e4ca678..fb079861c8 100644
  namespace device {
  
  namespace {
-@@ -815,3 +817,5 @@ void GetAssertionRequestHandler::DispatchRequestWithToken(
+@@ -784,3 +786,5 @@ void GetAssertionRequestHandler::DispatchRequestWithToken(
  }
  
  }  // namespace device
 +
 +#undef AtLeastUVPreferred
 diff --git a/device/fido/make_credential_request_handler.cc b/device/fido/make_credential_request_handler.cc
-index 96374c46fd..78af290a7f 100644
+index 388dc9bdfd..f4b7a95e62 100644
 --- a/device/fido/make_credential_request_handler.cc
 +++ b/device/fido/make_credential_request_handler.cc
 @@ -39,6 +39,8 @@
@@ -557,14 +579,14 @@ index 96374c46fd..78af290a7f 100644
  namespace device {
  
  using PINUVDisposition = FidoAuthenticator::PINUVDisposition;
-@@ -1067,3 +1069,5 @@ void MakeCredentialRequestHandler::SpecializeRequestForAuthenticator(
+@@ -1071,3 +1073,5 @@ void MakeCredentialRequestHandler::SpecializeRequestForAuthenticator(
  }
  
  }  // namespace device
 +
 +#undef AtLeastUVPreferred
 diff --git a/device/gamepad/BUILD.gn b/device/gamepad/BUILD.gn
-index f23ad5e81d..4d7c8eff5c 100644
+index 9d1528abf6..060d4b5596 100644
 --- a/device/gamepad/BUILD.gn
 +++ b/device/gamepad/BUILD.gn
 @@ -3,6 +3,7 @@
@@ -585,10 +607,10 @@ index f23ad5e81d..4d7c8eff5c 100644
  
    sources = [
 diff --git a/device/gamepad/dualshock4_controller.cc b/device/gamepad/dualshock4_controller.cc
-index 873c185d2c..dd77bb8cb6 100644
+index 1196712633..17ce5f8bb9 100644
 --- a/device/gamepad/dualshock4_controller.cc
 +++ b/device/gamepad/dualshock4_controller.cc
-@@ -21,6 +21,9 @@
+@@ -16,6 +16,9 @@
  #include "device/gamepad/hid_writer.h"
  #include "device/gamepad/public/cpp/gamepad_features.h"
  
@@ -598,7 +620,7 @@ index 873c185d2c..dd77bb8cb6 100644
  namespace device {
  
  namespace {
-@@ -417,3 +420,6 @@ base::WeakPtr<AbstractHapticGamepad> Dualshock4Controller::GetWeakPtr() {
+@@ -412,3 +415,6 @@ base::WeakPtr<AbstractHapticGamepad> Dualshock4Controller::GetWeakPtr() {
  }
  
  }  // namespace device
@@ -606,10 +628,10 @@ index 873c185d2c..dd77bb8cb6 100644
 +#undef kRumbleMagnitudeMax
 +#undef ControllerData
 diff --git a/device/gamepad/nintendo_controller.cc b/device/gamepad/nintendo_controller.cc
-index c3c7233aa2..fd715889cc 100644
+index cebfe333b8..0978a396f5 100644
 --- a/device/gamepad/nintendo_controller.cc
 +++ b/device/gamepad/nintendo_controller.cc
-@@ -18,6 +18,8 @@
+@@ -15,6 +15,8 @@
  #include "device/gamepad/gamepad_data_fetcher.h"
  #include "device/gamepad/gamepad_id_list.h"
  
@@ -618,7 +640,7 @@ index c3c7233aa2..fd715889cc 100644
  namespace device {
  namespace {
  // Device IDs for the Switch Charging Grip, also used for composite devices.
-@@ -1780,3 +1782,5 @@ base::WeakPtr<AbstractHapticGamepad> NintendoController::GetWeakPtr() {
+@@ -1804,3 +1806,5 @@ base::WeakPtr<AbstractHapticGamepad> NintendoController::GetWeakPtr() {
  }
  
  }  // namespace device
@@ -644,7 +666,7 @@ index fc688b587f..ffdf8a82bb 100644
 +
 +#undef kRumbleMagnitudeMax
 diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
-index 586fd7461e..6154388326 100644
+index 18e75b6da2..4a96501954 100644
 --- a/extensions/BUILD.gn
 +++ b/extensions/BUILD.gn
 @@ -2,6 +2,7 @@
@@ -655,7 +677,7 @@ index 586fd7461e..6154388326 100644
  import("//components/guest_view/buildflags/buildflags.gni")
  import("//extensions/buildflags/buildflags.gni")
  import("//testing/test.gni")
-@@ -78,7 +79,7 @@ grit("extensions_renderer_resources") {
+@@ -79,7 +80,7 @@ grit("extensions_renderer_resources") {
    ]
  }
  
@@ -665,7 +687,7 @@ index 586fd7461e..6154388326 100644
    sources = [
      "browser/api/declarative/test_rules_registry.cc",
 diff --git a/extensions/browser/BUILD.gn b/extensions/browser/BUILD.gn
-index 1280bc121f..bb80bec327 100644
+index fb3bd346b4..2954accbe9 100644
 --- a/extensions/browser/BUILD.gn
 +++ b/extensions/browser/BUILD.gn
 @@ -4,6 +4,7 @@
@@ -735,7 +757,7 @@ index 676a3a6166..baa24d545a 100644
    if (!condition_dict) {
      *error = kExpectedDictionary;
 diff --git a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc
-index d9706e0aac..2ecdb61db9 100644
+index 891c42b88b..0db2a28055 100644
 --- a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc
 +++ b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc
 @@ -35,7 +35,8 @@ using base::CaseInsensitiveCompareASCII;
@@ -748,7 +770,7 @@ index d9706e0aac..2ecdb61db9 100644
  
  namespace extensions {
  
-@@ -788,3 +789,5 @@ bool WebRequestConditionAttributeStages::Equals(
+@@ -790,3 +791,5 @@ bool WebRequestConditionAttributeStages::Equals(
  }
  
  }  // namespace extensions
@@ -774,7 +796,7 @@ index 3105a0d20c..c323b6b748 100644
 +
 +#undef g_factory
 diff --git a/extensions/browser/api/hid/hid_device_manager.cc b/extensions/browser/api/hid/hid_device_manager.cc
-index 1e035a6ee6..d69fe9bfff 100644
+index d6b85308cb..a218811518 100644
 --- a/extensions/browser/api/hid/hid_device_manager.cc
 +++ b/extensions/browser/api/hid/hid_device_manager.cc
 @@ -39,6 +39,9 @@
@@ -787,7 +809,7 @@ index 1e035a6ee6..d69fe9bfff 100644
  namespace extensions {
  
  namespace {
-@@ -436,3 +439,6 @@ void HidDeviceManager::DispatchEvent(
+@@ -437,3 +440,6 @@ void HidDeviceManager::DispatchEvent(
  }
  
  }  // namespace extensions
@@ -795,7 +817,7 @@ index 1e035a6ee6..d69fe9bfff 100644
 +#undef GetHidManagerBinderOverride
 +#undef WillDispatchDeviceEvent
 diff --git a/extensions/browser/api/usb/usb_device_manager.cc b/extensions/browser/api/usb/usb_device_manager.cc
-index 30d0e52ec4..e76b87b689 100644
+index 6849d0ebf5..bafb975057 100644
 --- a/extensions/browser/api/usb/usb_device_manager.cc
 +++ b/extensions/browser/api/usb/usb_device_manager.cc
 @@ -31,6 +31,9 @@ namespace usb = extensions::api::usb;
@@ -835,10 +857,10 @@ index 22b273b1a1..ba85ff21e1 100644
 +
 +#undef g_factory
 diff --git a/extensions/browser/api/web_request/extension_web_request_event_router.cc b/extensions/browser/api/web_request/extension_web_request_event_router.cc
-index 58df0d2adf..a25f659545 100644
+index c70fc41499..c1031df8e6 100644
 --- a/extensions/browser/api/web_request/extension_web_request_event_router.cc
 +++ b/extensions/browser/api/web_request/extension_web_request_event_router.cc
-@@ -65,7 +65,8 @@ namespace {
+@@ -71,7 +71,8 @@ namespace {
  namespace activity_log = web_request_activity_log_constants;
  namespace declarative_keys = declarative_webrequest_constants;
  namespace helpers = extension_web_request_api_helpers;
@@ -848,19 +870,19 @@ index 58df0d2adf..a25f659545 100644
  namespace web_request = api::web_request;
  
  // Describes the action taken by the Web Request API for a given stage of a web
-@@ -2692,3 +2693,5 @@ void WebRequestEventRouter::ClearSignaled(
+@@ -2706,3 +2707,5 @@ void WebRequestEventRouter::ClearSignaled(
  }
  
  }  // namespace extensions
 +
 +#undef keys
 diff --git a/extensions/browser/api/web_request/upload_data_presenter.cc b/extensions/browser/api/web_request/upload_data_presenter.cc
-index b309b210c1..224441f199 100644
+index df9f252b7e..606e7f342c 100644
 --- a/extensions/browser/api/web_request/upload_data_presenter.cc
 +++ b/extensions/browser/api/web_request/upload_data_presenter.cc
-@@ -16,7 +16,8 @@
- #include "extensions/browser/api/web_request/web_request_api_constants.h"
- #include "net/base/upload_file_element_reader.h"
+@@ -19,7 +19,8 @@
+ 
+ static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE));
  
 -namespace keys = extension_web_request_api_constants;
 +namespace keys_upload_data_presenter = extension_web_request_api_constants;
@@ -868,17 +890,17 @@ index b309b210c1..224441f199 100644
  
  namespace {
  
-@@ -146,3 +147,5 @@ void ParsedDataPresenter::Abort() {
+@@ -149,3 +150,5 @@ void ParsedDataPresenter::Abort() {
  }
  
  }  // namespace extensions
 +
 +#undef keys
 diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc
-index e179815e58..8400c3c6d2 100644
+index ad7fe167db..bd0744c2e9 100644
 --- a/extensions/browser/api/web_request/web_request_api.cc
 +++ b/extensions/browser/api/web_request/web_request_api.cc
-@@ -82,10 +82,14 @@ using extension_web_request_api_helpers::ExtraInfoSpec;
+@@ -84,10 +84,14 @@ using extension_web_request_api_helpers::ExtraInfoSpec;
  using extensions::mojom::APIPermissionID;
  
  namespace helpers = extension_web_request_api_helpers;
@@ -894,7 +916,7 @@ index e179815e58..8400c3c6d2 100644
  namespace extensions {
  
  namespace web_request = api::web_request;
-@@ -1219,3 +1223,7 @@ WebRequestHandlerBehaviorChangedFunction::Run() {
+@@ -1166,3 +1170,7 @@ WebRequestHandlerBehaviorChangedFunction::Run() {
  }
  
  }  // namespace extensions
@@ -903,10 +925,10 @@ index e179815e58..8400c3c6d2 100644
 +#undef WebRequestEventListenerFlag
 +#undef g_factory
 diff --git a/extensions/browser/api/web_request/web_request_api_helpers.cc b/extensions/browser/api/web_request/web_request_api_helpers.cc
-index d1bafeda1f..1f8514d00e 100644
+index 262048f73d..cf68c564eb 100644
 --- a/extensions/browser/api/web_request/web_request_api_helpers.cc
 +++ b/extensions/browser/api/web_request/web_request_api_helpers.cc
-@@ -58,7 +58,6 @@ using base::Time;
+@@ -61,7 +61,6 @@ using base::Time;
  using net::cookie_util::ParsedRequestCookie;
  using net::cookie_util::ParsedRequestCookies;
  
@@ -914,7 +936,7 @@ index d1bafeda1f..1f8514d00e 100644
  namespace web_request = extensions::api::web_request;
  using DNRRequestAction = extensions::declarative_net_request::RequestAction;
  
-@@ -1817,6 +1816,7 @@ void ClearCacheOnNavigation() {
+@@ -1801,6 +1800,7 @@ void ClearCacheOnNavigation() {
  // dictionary.
  base::Value::Dict CreateHeaderDictionary(const std::string& name,
                                           const std::string& value) {
@@ -923,10 +945,10 @@ index d1bafeda1f..1f8514d00e 100644
    header.Set(keys::kHeaderNameKey, name);
    if (base::IsStringUTF8(value)) {
 diff --git a/extensions/browser/api/web_request/web_request_event_details.cc b/extensions/browser/api/web_request/web_request_event_details.cc
-index cb1b59814c..f31b1dfba8 100644
+index 2746d57fc2..ac97175110 100644
 --- a/extensions/browser/api/web_request/web_request_event_details.cc
 +++ b/extensions/browser/api/web_request/web_request_event_details.cc
-@@ -31,7 +31,8 @@
+@@ -34,7 +34,8 @@ static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE));
  using extension_web_request_api_helpers::ExtraInfoSpec;
  
  namespace helpers = extension_web_request_api_helpers;
@@ -936,26 +958,26 @@ index cb1b59814c..f31b1dfba8 100644
  
  namespace extensions {
  namespace {
-@@ -202,3 +203,5 @@ base::Value::Dict WebRequestEventDetails::GetAndClearDict() {
+@@ -205,3 +206,5 @@ base::Value::Dict WebRequestEventDetails::GetAndClearDict() {
  }
  
  }  // namespace extensions
 +
 +#undef keys
 diff --git a/extensions/browser/api/web_request/web_request_info.cc b/extensions/browser/api/web_request/web_request_info.cc
-index f40aba6067..9a19e17dd8 100644
+index 9142401889..3f870514a4 100644
 --- a/extensions/browser/api/web_request/web_request_info.cc
 +++ b/extensions/browser/api/web_request/web_request_info.cc
-@@ -39,8 +39,6 @@
- #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
- #endif
+@@ -42,8 +42,6 @@
+ 
+ static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE));
  
 -namespace keys = extension_web_request_api_constants;
 -
  namespace extensions {
  
  namespace {
-@@ -127,6 +125,7 @@ std::optional<base::Value::Dict> CreateRequestBodyData(
+@@ -130,6 +128,7 @@ std::optional<base::Value::Dict> CreateRequestBodyData(
      const std::string& method,
      const net::HttpRequestHeaders& request_headers,
      const std::vector<std::unique_ptr<UploadDataSource>>& data_sources) {
@@ -964,48 +986,48 @@ index f40aba6067..9a19e17dd8 100644
      return std::nullopt;
    }
 diff --git a/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc b/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc
-index 8f02078823..573725366f 100644
+index 6708b4100f..939cd241e5 100644
 --- a/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc
 +++ b/extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc
-@@ -70,6 +70,8 @@
- #include "url/origin.h"
- #include "url/url_constants.h"
+@@ -73,6 +73,8 @@
+ 
+ static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE));
  
 +#define ShutdownNotifierFactory ShutdownNotifierFactory_WebRequestProxyingUrlLoaderFactory
 +
  namespace extensions {
  namespace {
  
-@@ -1699,3 +1701,5 @@ void WebRequestProxyingURLLoaderFactory::EnsureAssociatedFactoryBuilt() {
+@@ -1726,3 +1728,5 @@ void WebRequestProxyingURLLoaderFactory::EnsureAssociatedFactoryBuilt() {
  }
  
  }  // namespace extensions
 +
 +#undef ShutdownNotifierFactory
 diff --git a/extensions/browser/api/web_request/web_request_proxying_websocket.cc b/extensions/browser/api/web_request/web_request_proxying_websocket.cc
-index 8f536df1b7..a0cdce66fd 100644
+index ee783e1828..d56d597f92 100644
 --- a/extensions/browser/api/web_request/web_request_proxying_websocket.cc
 +++ b/extensions/browser/api/web_request/web_request_proxying_websocket.cc
-@@ -18,6 +18,8 @@
- #include "net/cookies/site_for_cookies.h"
- #include "net/http/http_util.h"
+@@ -22,6 +22,8 @@
+ 
+ static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE));
  
 +#define ShutdownNotifierFactory ShutdownNotifierFactory_WebRequestProxyingWebsocket
 +
  namespace extensions {
  namespace {
  
-@@ -565,3 +567,5 @@ void WebRequestProxyingWebSocket::EnsureAssociatedFactoryBuilt() {
+@@ -569,3 +571,5 @@ void WebRequestProxyingWebSocket::EnsureAssociatedFactoryBuilt() {
  }
  
  }  // namespace extensions
 +
 +#undef ShutdownNotifierFactory
 diff --git a/extensions/browser/guest_view/app_view/app_view_guest.cc b/extensions/browser/guest_view/app_view/app_view_guest.cc
-index 0f2c21513e..228ded8563 100644
+index 3b1fe9ef59..e9a6851754 100644
 --- a/extensions/browser/guest_view/app_view/app_view_guest.cc
 +++ b/extensions/browser/guest_view/app_view/app_view_guest.cc
-@@ -220,7 +220,7 @@ void AppViewGuest::CreateInnerPage(
+@@ -219,7 +219,7 @@ void AppViewGuest::CreateInnerPage(
      scoped_refptr<content::SiteInstance> site_instance,
      const base::Value::Dict& create_params,
      GuestPageCreatedCallback callback) {
@@ -1014,7 +1036,7 @@ index 0f2c21513e..228ded8563 100644
    if (!app_id) {
      RejectGuestCreation(std::move(owned_this), std::move(callback));
      return;
-@@ -231,7 +231,7 @@ void AppViewGuest::CreateInnerPage(
+@@ -230,7 +230,7 @@ void AppViewGuest::CreateInnerPage(
      return;
    }
  
@@ -1023,7 +1045,7 @@ index 0f2c21513e..228ded8563 100644
    if (!data) {
      RejectGuestCreation(std::move(owned_this), std::move(callback));
      return;
-@@ -292,7 +292,7 @@ void AppViewGuest::MaybeRecreateGuestContents(
+@@ -291,7 +291,7 @@ void AppViewGuest::MaybeRecreateGuestContents(
  }
  
  const char* AppViewGuest::GetAPINamespace() const {
@@ -1032,7 +1054,7 @@ index 0f2c21513e..228ded8563 100644
  }
  
  int AppViewGuest::GetTaskPrefix() const {
-@@ -360,9 +360,9 @@ void AppViewGuest::LaunchAppAndFireEvent(
+@@ -359,9 +359,9 @@ void AppViewGuest::LaunchAppAndFireEvent(
                                       std::move(callback))));
  
    base::Value::Dict embed_request;
@@ -1065,10 +1087,10 @@ index 0bba776af6..a8a6f355ba 100644
 +
 +#undef g_test_observer
 diff --git a/extensions/browser/script_injection_tracker.cc b/extensions/browser/script_injection_tracker.cc
-index 8f590b9ebd..8aac10c3a1 100644
+index 09e5575f67..7e85c1005c 100644
 --- a/extensions/browser/script_injection_tracker.cc
 +++ b/extensions/browser/script_injection_tracker.cc
-@@ -44,6 +44,8 @@
+@@ -45,6 +45,8 @@
  
  using perfetto::protos::pbzero::ChromeTrackEvent;
  
@@ -1077,17 +1099,17 @@ index 8f590b9ebd..8aac10c3a1 100644
  namespace extensions {
  
  namespace {
-@@ -1009,3 +1011,5 @@ ScopedScriptInjectionTrackerFailureCrashKeys::
+@@ -1015,3 +1017,5 @@ ScopedScriptInjectionTrackerFailureCrashKeys::
  
  }  // namespace debug
  }  // namespace extensions
 +
 +#undef BoolToCrashKeyValue
 diff --git a/extensions/browser/service_worker/service_worker_task_queue.cc b/extensions/browser/service_worker/service_worker_task_queue.cc
-index a47efd7cf2..a68861ee59 100644
+index ba14d50b58..cdfc551129 100644
 --- a/extensions/browser/service_worker/service_worker_task_queue.cc
 +++ b/extensions/browser/service_worker/service_worker_task_queue.cc
-@@ -52,6 +52,9 @@
+@@ -53,6 +53,9 @@
  
  using content::BrowserContext;
  
@@ -1097,7 +1119,7 @@ index a47efd7cf2..a68861ee59 100644
  namespace extensions {
  
  namespace {
-@@ -1174,3 +1177,6 @@ void ServiceWorkerTaskQueue::ActivateIncognitoSplitModeExtensions(
+@@ -1199,3 +1202,6 @@ void ServiceWorkerTaskQueue::ActivateIncognitoSplitModeExtensions(
  }
  
  }  // namespace extensions
@@ -1105,10 +1127,10 @@ index a47efd7cf2..a68861ee59 100644
 +#undef g_test_observer
 +#undef g_allow_multiple_workers_per_extension
 diff --git a/extensions/browser/service_worker/worker_id_set.cc b/extensions/browser/service_worker/worker_id_set.cc
-index a1737fd343..6bdac552ab 100644
+index 37f8079c0f..17d77505b0 100644
 --- a/extensions/browser/service_worker/worker_id_set.cc
 +++ b/extensions/browser/service_worker/worker_id_set.cc
-@@ -24,6 +24,9 @@
+@@ -20,6 +20,9 @@
  #include "extensions/common/extension_id.h"
  #include "third_party/blink/public/mojom/service_worker/service_worker_registration.mojom.h"
  
@@ -1118,15 +1140,15 @@ index a1737fd343..6bdac552ab 100644
  namespace extensions {
  
  namespace {
-@@ -349,3 +352,6 @@ ScopedMultiWorkerCrashKeys::~ScopedMultiWorkerCrashKeys() = default;
- }  // namespace debug
+@@ -194,3 +197,6 @@ WorkerIdSet::AllowMultipleWorkersPerExtensionForTesting() {
+ }
  
  }  // namespace extensions
 +
 +#undef g_allow_multiple_workers_per_extension
 +#undef BoolToCrashKeyValue
 diff --git a/extensions/common/BUILD.gn b/extensions/common/BUILD.gn
-index d16d8a63f5..bc5b19f627 100644
+index 5c2c4d67d6..ba5f52a8ab 100644
 --- a/extensions/common/BUILD.gn
 +++ b/extensions/common/BUILD.gn
 @@ -4,6 +4,7 @@
@@ -1135,9 +1157,9 @@ index d16d8a63f5..bc5b19f627 100644
  import("//build/config/features.gni")
 +import("//build/config/jumbo.gni")
  import("//components/guest_view/buildflags/buildflags.gni")
- import("//components/nacl/features.gni")
  import("//extensions/buildflags/buildflags.gni")
-@@ -252,7 +253,7 @@ mojom("mojom") {
+ import("//mojo/public/tools/bindings/mojom.gni")
+@@ -251,7 +252,7 @@ mojom("mojom") {
  # This must be a static library because extensions common depends on
  # GetTrustedICAPublicKey in extensions/browser which isn't always linked
  # in. TODO(brettw): This reverse dependency should be fixed.
@@ -1146,7 +1168,7 @@ index d16d8a63f5..bc5b19f627 100644
    sources = [
      "alias.h",
      "api/bluetooth/bluetooth_manifest_data.cc",
-@@ -541,6 +542,11 @@ static_library("common") {
+@@ -548,6 +549,11 @@ static_library("common") {
    # from mojom/permission_set_mojom_traits.cc.
    allow_circular_includes_from = [ ":mojom" ]
  
@@ -1159,10 +1181,10 @@ index d16d8a63f5..bc5b19f627 100644
      "//base",
      "//build:android_buildflags",
 diff --git a/extensions/common/api/extension_action/action_info.cc b/extensions/common/api/extension_action/action_info.cc
-index 6f71f1effa..6a9bdcdb46 100644
+index 3956794554..a83c464da5 100644
 --- a/extensions/common/api/extension_action/action_info.cc
 +++ b/extensions/common/api/extension_action/action_info.cc
-@@ -41,10 +41,12 @@ ActionInfoData::ActionInfoData(std::unique_ptr<ActionInfo> info)
+@@ -45,10 +45,12 @@ ActionInfoData::ActionInfoData(std::unique_ptr<ActionInfo> info)
  
  ActionInfoData::~ActionInfoData() = default;
  
@@ -1175,18 +1197,18 @@ index 6f71f1effa..6a9bdcdb46 100644
 +
  // Returns the icon variants parsed from the `extension` manifest.
  // Populates `error` if there are no icon variants.
- ExtensionIconVariants GetIconVariants(const base::Value* value) {
-@@ -272,3 +274,5 @@ const char* ActionInfo::GetManifestKeyForActionType(ActionInfo::Type type) {
+ ExtensionIconVariants GetIconVariants(const Extension& extension,
+@@ -288,3 +290,5 @@ const char* ActionInfo::GetManifestKeyForActionType(ActionInfo::Type type) {
  }
  
  }  // namespace extensions
 +
 +#undef Feature
 diff --git a/extensions/common/manifest_handlers/icon_variants_handler.cc b/extensions/common/manifest_handlers/icon_variants_handler.cc
-index e907385862..45f55c7fb5 100644
+index 8e34249fd9..0ffd0e5b00 100644
 --- a/extensions/common/manifest_handlers/icon_variants_handler.cc
 +++ b/extensions/common/manifest_handlers/icon_variants_handler.cc
-@@ -35,7 +35,9 @@ IconVariantsHandler::~IconVariantsHandler() = default;
+@@ -38,7 +38,9 @@ IconVariantsHandler::~IconVariantsHandler() = default;
  using extensions::api::icon_variants::ManifestKeys;
  using extensions::diagnostics::icon_variants::Id;
  using extensions::diagnostics::icon_variants::Severity;
@@ -1197,26 +1219,26 @@ index e907385862..45f55c7fb5 100644
  
  namespace {
  void AddInstallWarning(Extension& extension, const std::string& warning) {
-@@ -207,3 +209,5 @@ base::span<const char* const> IconVariantsHandler::Keys() const {
+@@ -210,3 +212,5 @@ base::span<const char* const> IconVariantsHandler::Keys() const {
  }
  
  }  // namespace extensions
 +
 +#undef Feature
 diff --git a/extensions/common/manifest_handlers/icons_handler.cc b/extensions/common/manifest_handlers/icons_handler.cc
-index 0f3d15bb6b..ab3f7d60a2 100644
+index 209334921b..eedd550225 100644
 --- a/extensions/common/manifest_handlers/icons_handler.cc
 +++ b/extensions/common/manifest_handlers/icons_handler.cc
-@@ -22,6 +22,8 @@
- #include "extensions/strings/grit/extensions_strings.h"
- #include "ui/gfx/geometry/size.h"
+@@ -26,6 +26,8 @@
+ 
+ static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE));
  
 +#define g_empty_icon_set g_empty_icon_set_icons_handler
 +
  namespace extensions {
  
  namespace keys = manifest_keys;
-@@ -106,3 +108,5 @@ base::span<const char* const> IconsHandler::Keys() const {
+@@ -112,3 +114,5 @@ base::span<const char* const> IconsHandler::Keys() const {
  }
  
  }  // namespace extensions
@@ -1243,7 +1265,7 @@ index 5325c1e24d..307242a56b 100644
 +
 +#undef ManifestKeys
 diff --git a/extensions/common/manifest_handlers/shared_module_info.cc b/extensions/common/manifest_handlers/shared_module_info.cc
-index a906aa872b..2a8d103015 100644
+index 91231ee29a..98362a843e 100644
 --- a/extensions/common/manifest_handlers/shared_module_info.cc
 +++ b/extensions/common/manifest_handlers/shared_module_info.cc
 @@ -37,7 +37,8 @@ namespace {
@@ -1263,7 +1285,7 @@ index a906aa872b..2a8d103015 100644
 +
 +#undef ManifestKeys
 diff --git a/extensions/renderer/BUILD.gn b/extensions/renderer/BUILD.gn
-index bb00afe483..1cb6488268 100644
+index 189a7d3f48..5187ae7142 100644
 --- a/extensions/renderer/BUILD.gn
 +++ b/extensions/renderer/BUILD.gn
 @@ -3,6 +3,7 @@
@@ -1283,7 +1305,7 @@ index bb00afe483..1cb6488268 100644
    sources = [
      "activity_log_converter_strategy.cc",
      "activity_log_converter_strategy.h",
-@@ -317,7 +318,7 @@ source_set("renderer") {
+@@ -319,7 +320,7 @@ source_set("renderer") {
    }
  }
  
@@ -1293,10 +1315,10 @@ index bb00afe483..1cb6488268 100644
    # top-level extensions renderer unit tests.
    testonly = true
 diff --git a/extensions/renderer/extension_localization_throttle.cc b/extensions/renderer/extension_localization_throttle.cc
-index 9eb2b7f5e2..db7dc693d2 100644
+index abe98687a9..72a9a50e5a 100644
 --- a/extensions/renderer/extension_localization_throttle.cc
 +++ b/extensions/renderer/extension_localization_throttle.cc
-@@ -26,6 +26,8 @@
+@@ -30,6 +30,8 @@
  #include "third_party/blink/public/web/web_local_frame.h"
  #include "url/gurl.h"
  
@@ -1305,17 +1327,17 @@ index 9eb2b7f5e2..db7dc693d2 100644
  namespace extensions {
  
  namespace {
-@@ -298,3 +300,5 @@ void ExtensionLocalizationThrottle::DeferredCancelWithError(int error_code) {
+@@ -325,3 +327,5 @@ void ExtensionLocalizationThrottle::DeferredCancelWithError(int error_code) {
  }
  
  }  // namespace extensions
 +
 +#undef kCancelReason
 diff --git a/extensions/renderer/extension_url_loader_throttle.cc b/extensions/renderer/extension_url_loader_throttle.cc
-index faa7895b72..cdb8aae6ea 100644
+index fa5a6c1c2f..5c0681f071 100644
 --- a/extensions/renderer/extension_url_loader_throttle.cc
 +++ b/extensions/renderer/extension_url_loader_throttle.cc
-@@ -8,6 +8,8 @@
+@@ -10,6 +10,8 @@
  #include "net/base/net_errors.h"
  #include "services/network/public/cpp/resource_request.h"
  
@@ -1324,7 +1346,7 @@ index faa7895b72..cdb8aae6ea 100644
  namespace extensions {
  
  namespace {
-@@ -54,3 +56,5 @@ void ExtensionURLLoaderThrottle::WillProcessResponse(
+@@ -63,3 +65,5 @@ void ExtensionURLLoaderThrottle::WillProcessResponse(
  void ExtensionURLLoaderThrottle::DetachFromCurrentSequence() {}
  
  }  // namespace extensions

x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0111-group-gpu.patch

@@ -6,17 +6,18 @@ Subject: [PATCH] reland jumbo 11
 Enable jumbo build for the following component(s)/source_set(s):
 
 - //gpu/command_buffer/client:client_sources
+- //gpu/command_buffer/client:gles2_c_lib
 - //gpu/command_buffer/client:gles2_implementation
 - //gpu/command_buffer/client:gles2_implementation_no_check
-- //gpu/command_buffer/client:gles2_c_lib
 - //gpu/command_buffer/common:common_base_sources
 - //gpu/command_buffer/common:common_sources
 - //gpu/command_buffer/service:service_sources
 - //gpu/config:config_sources
 - //gpu/ipc/service:service
+- //gpu/vulkan:vulkan
 - //media/audio:audio
-- //media/base:base
 - //media/base/ipc:ipc
+- //media/base:base
 - //media/capture:capture_base
 - //media/capture:capture_device_specific
 - //media/capture:capture_lib
@@ -27,23 +28,22 @@ Enable jumbo build for the following component(s)/source_set(s):
 - //media/mojo/clients:clients
 - //media/mojo/common:common
 - //media/mojo/services:services
-- //ppapi/cpp:cpp
-- //ppapi/cpp:objects
-- //ppapi/host:host
-- //ppapi/proxy:proxy
-- //ppapi/shared_impl:common
+- //printing:metafile
 - //services/cert_verifier/cert_net_url_loader:cert_net_url_loader
-- //services/network:network_service
-- //services/network/public/cpp:crash_keys
 - //services/network/public/cpp:cpp
-- //services/network/public/cpp:first_party_sets_mojom_support
 - //services/network/public/cpp:cpp_base
+- //services/network/public/cpp:crash_keys
+- //services/network/public/cpp:first_party_sets_mojom_support
+- //services/network/public/cpp:ip_address_mojom_support
+- //services/network/public/cpp:web_platform
+- //services/network:network_service
+- //services/webnn:webnn_service
 - //storage:browser
 
 ---
  gpu/BUILD.gn                                  |  3 ++-
  gpu/command_buffer/client/BUILD.gn            |  9 ++++----
- gpu/command_buffer/common/BUILD.gn            |  5 +++--
+ gpu/command_buffer/common/BUILD.gn            |  3 ++-
  gpu/command_buffer/service/BUILD.gn           |  7 ++++---
  gpu/command_buffer/service/graphite_utils.cc  |  5 +++++
  .../angle_vulkan_image_backing_factory.cc     |  4 ++++
@@ -58,6 +58,7 @@ Enable jumbo build for the following component(s)/source_set(s):
  gpu/config/BUILD.gn                           |  3 ++-
  gpu/config/webgpu_blocklist_impl.h            |  3 +++
  gpu/ipc/service/BUILD.gn                      |  3 ++-
+ gpu/vulkan/BUILD.gn                           |  3 ++-
  media/audio/BUILD.gn                          |  3 ++-
  media/audio/fake_audio_manager.cc             |  6 ++++++
  media/audio/pulse/audio_manager_pulse.cc      |  6 ++++++
@@ -81,24 +82,23 @@ Enable jumbo build for the following component(s)/source_set(s):
  media/mojo/clients/BUILD.gn                   |  4 +++-
  media/mojo/common/BUILD.gn                    |  4 +++-
  media/mojo/services/BUILD.gn                  |  3 ++-
- ppapi/cpp/BUILD.gn                            |  5 +++--
- ppapi/host/BUILD.gn                           |  3 ++-
- ppapi/proxy/BUILD.gn                          | 11 ++++++++--
- ppapi/shared_impl/BUILD.gn                    |  9 +++++++-
+ printing/BUILD.gn                             |  3 ++-
  .../cert_net_url_loader/BUILD.gn              |  3 ++-
  services/network/BUILD.gn                     |  5 +++--
  .../http_server_properties_pref_delegate.cc   |  4 ++++
  .../known_legacy_scope_domains_delegate.cc    |  4 ++++
- services/network/public/cpp/BUILD.gn          | 13 ++++++++----
+ services/network/public/cpp/BUILD.gn          | 17 +++++++++------
  .../cross_origin_embedder_policy_parser.cc    |  8 +++++++
  .../cpp/document_isolation_policy_parser.cc   |  8 +++++++
  services/network/url_loader.cc                |  4 ++++
  .../web_bundle_url_loader_factory.cc          |  4 ++++
+ .../frame_timing_details_mojom_traits.cc      |  4 ++++
+ services/webnn/BUILD.gn                       |  3 ++-
  storage/browser/BUILD.gn                      |  5 +++--
- 54 files changed, 263 insertions(+), 44 deletions(-)
+ 54 files changed, 252 insertions(+), 42 deletions(-)
 
 diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn
-index b2717ed988..b6698232fd 100644
+index 0d5e199c75..fd91eb30c7 100644
 --- a/gpu/BUILD.gn
 +++ b/gpu/BUILD.gn
 @@ -3,6 +3,7 @@
@@ -109,7 +109,7 @@ index b2717ed988..b6698232fd 100644
  import("//build/config/ui.gni")
  import("//gpu/vulkan/features.gni")
  import("//skia/features.gni")
-@@ -75,7 +76,7 @@ component("webgpu") {
+@@ -70,7 +71,7 @@ component("webgpu") {
    public_deps = [ "//gpu/command_buffer/client:webgpu_sources" ]
  }
  
@@ -119,7 +119,7 @@ index b2717ed988..b6698232fd 100644
    sources = [
      "command_buffer/client/client_test_helper.cc",
 diff --git a/gpu/command_buffer/client/BUILD.gn b/gpu/command_buffer/client/BUILD.gn
-index 7fd901cdce..982c8841c7 100644
+index ee29b28e53..1165606bab 100644
 --- a/gpu/command_buffer/client/BUILD.gn
 +++ b/gpu/command_buffer/client/BUILD.gn
 @@ -2,6 +2,7 @@
@@ -127,19 +127,19 @@ index 7fd901cdce..982c8841c7 100644
  # found in the LICENSE file.
  
 +import("//build/config/jumbo.gni")
- import("//components/nacl/toolchain.gni")
+ import("//build/config/ozone.gni")
+ import("//skia/features.gni")
  import("//ui/gl/features.gni")
- 
-@@ -53,7 +54,7 @@ group("webgpu") {
-   }
+@@ -51,7 +52,7 @@ source_set("export") {
+   sources = [ "gpu_command_buffer_client_export.h" ]
  }
  
 -source_set("client_sources") {
 +jumbo_source_set("client_sources") {
    # External code should depend on this via //gpu/client above rather than
    # depending on this directly or the component build will break.
-   visibility = [ "//gpu/*" ]
-@@ -258,7 +259,7 @@ source_set("webgpu_interface") {
+   visibility = [ ":client" ]
+@@ -232,7 +233,7 @@ source_set("webgpu_interface") {
  }
  
  # Library emulates GLES2 using command_buffers.
@@ -148,7 +148,7 @@ index 7fd901cdce..982c8841c7 100644
    sources = gles2_implementation_source_files
  
    defines = [ "GLES2_IMPL_IMPLEMENTATION" ]
-@@ -361,7 +362,7 @@ source_set("webgpu_sources") {
+@@ -329,7 +330,7 @@ source_set("webgpu_sources") {
  }
  
  # Library emulates GLES2 using command_buffers.
@@ -157,8 +157,8 @@ index 7fd901cdce..982c8841c7 100644
    sources = gles2_implementation_source_files
  
    defines = [ "GLES2_IMPL_IMPLEMENTATION" ]
-@@ -391,7 +392,7 @@ component("gles2_implementation_no_check") {
-   }
+@@ -353,7 +354,7 @@ component("gles2_implementation_no_check") {
+   ]
  }
  
 -component("gles2_c_lib") {
@@ -167,7 +167,7 @@ index 7fd901cdce..982c8841c7 100644
    defines = [ "GLES2_C_LIB_IMPLEMENTATION" ]
  
 diff --git a/gpu/command_buffer/common/BUILD.gn b/gpu/command_buffer/common/BUILD.gn
-index 22dc13cad2..a7ad96ca1b 100644
+index bf9b43d7f1..0514195413 100644
 --- a/gpu/command_buffer/common/BUILD.gn
 +++ b/gpu/command_buffer/common/BUILD.gn
 @@ -7,6 +7,7 @@
@@ -177,27 +177,18 @@ index 22dc13cad2..a7ad96ca1b 100644
 +import("//build/config/jumbo.gni")
  import("//ui/gl/features.gni")
  
- group("common") {
-@@ -47,7 +48,7 @@ group("webgpu") {
- 
- # Minimal set of definitions which don't have GPU dependencies outside of this
- # directory.
--source_set("common_base_sources") {
-+jumbo_source_set("common_base_sources") {
-   visibility = [ "//gpu/*" ]
-   sources = [
-     "command_buffer_id.h",
-@@ -66,7 +67,7 @@ source_set("common_base_sources") {
-   configs += [ "//gpu:gpu_implementation" ]
+ config("implementation") {
+@@ -46,7 +47,7 @@ group("webgpu") {
+   public_deps = [ ":webgpu_sources" ]
  }
  
 -source_set("common_sources") {
 +jumbo_source_set("common_sources") {
-   visibility = [ "//gpu/*" ]
+   visibility = [ ":common" ]
  
    sources = [
 diff --git a/gpu/command_buffer/service/BUILD.gn b/gpu/command_buffer/service/BUILD.gn
-index 12c0273638..b4d84a18a8 100644
+index 34830c7aa5..1691a2bb6b 100644
 --- a/gpu/command_buffer/service/BUILD.gn
 +++ b/gpu/command_buffer/service/BUILD.gn
 @@ -2,6 +2,7 @@
@@ -208,7 +199,7 @@ index 12c0273638..b4d84a18a8 100644
  import("//build/config/ui.gni")
  import("//gpu/vulkan/features.gni")
  import("//skia/features.gni")
-@@ -26,9 +27,9 @@ group("gles2") {
+@@ -27,9 +28,9 @@ group("gles2") {
  }
  
  if (is_component_build) {
@@ -218,9 +209,9 @@ index 12c0273638..b4d84a18a8 100644
 -  link_target_type = "static_library"
 +  link_target_type = "jumbo_static_library"
  }
- target(link_target_type, "service_sources") {
+ source_set("service_sources") {
    # External code should depend on this via //gpu/command_buffer/service above
-@@ -644,7 +645,7 @@ proto_library("disk_cache_proto") {
+@@ -683,7 +684,7 @@ proto_library("disk_cache_proto") {
  }
  
  if (is_android) {
@@ -230,7 +221,7 @@ index 12c0273638..b4d84a18a8 100644
      sources = [
        "mock_texture_owner.cc",
 diff --git a/gpu/command_buffer/service/graphite_utils.cc b/gpu/command_buffer/service/graphite_utils.cc
-index 6e4f231866..f60731f55b 100644
+index f7518d6b59..05d4365d98 100644
 --- a/gpu/command_buffer/service/graphite_utils.cc
 +++ b/gpu/command_buffer/service/graphite_utils.cc
 @@ -13,6 +13,8 @@
@@ -242,7 +233,7 @@ index 6e4f231866..f60731f55b 100644
  namespace gpu {
  namespace {
  
-@@ -105,3 +107,6 @@ bool GraphiteReadPixelsSync(GraphiteSharedContext* context,
+@@ -104,3 +106,6 @@ bool GraphiteReadPixelsSync(GraphiteSharedContext* context,
  }
  
  }  // namespace gpu
@@ -345,7 +336,7 @@ index 546b9c0e11..740d89d506 100644
 +
 +#undef kSupportedUsage
 diff --git a/gpu/command_buffer/service/shared_image/ozone_image_backing_factory.cc b/gpu/command_buffer/service/shared_image/ozone_image_backing_factory.cc
-index 2b37b7c0d1..4c4b7135dc 100644
+index 16ce3e2a79..ed9a7109c9 100644
 --- a/gpu/command_buffer/service/shared_image/ozone_image_backing_factory.cc
 +++ b/gpu/command_buffer/service/shared_image/ozone_image_backing_factory.cc
 @@ -35,6 +35,8 @@
@@ -357,18 +348,18 @@ index 2b37b7c0d1..4c4b7135dc 100644
  namespace gpu {
  namespace {
  
-@@ -412,3 +414,5 @@ SharedImageBackingType OzoneImageBackingFactory::GetBackingType() {
+@@ -414,3 +416,5 @@ SharedImageBackingType OzoneImageBackingFactory::GetBackingType() {
  }
  
  }  // namespace gpu
 +
 +#undef kSupportedUsage
 diff --git a/gpu/command_buffer/service/shared_image/shared_image_representation.cc b/gpu/command_buffer/service/shared_image/shared_image_representation.cc
-index a2bf9cb7c0..f4180c44eb 100644
+index dc53451bb2..1b81ab938b 100644
 --- a/gpu/command_buffer/service/shared_image/shared_image_representation.cc
 +++ b/gpu/command_buffer/service/shared_image/shared_image_representation.cc
-@@ -28,6 +28,9 @@
- #include "gpu/vulkan/vulkan_fence_helper.h"
+@@ -34,6 +34,9 @@
+ #include "ui/gfx/win/d3d_shared_fence.h"
  #endif
  
 +// Macro 'None' from X11/X.h will cause confliction
@@ -378,10 +369,10 @@ index a2bf9cb7c0..f4180c44eb 100644
  
  namespace {
 diff --git a/gpu/command_buffer/service/shared_image/wrapped_graphite_texture_backing.cc b/gpu/command_buffer/service/shared_image/wrapped_graphite_texture_backing.cc
-index 1c90e06233..8d049c4bff 100644
+index b835e11e2f..4e169678f1 100644
 --- a/gpu/command_buffer/service/shared_image/wrapped_graphite_texture_backing.cc
 +++ b/gpu/command_buffer/service/shared_image/wrapped_graphite_texture_backing.cc
-@@ -32,6 +32,9 @@
+@@ -33,6 +33,9 @@
  #include "gpu/command_buffer/service/shared_image/dawn_fallback_image_representation.h"
  #endif
  
@@ -399,7 +390,7 @@ index 1c90e06233..8d049c4bff 100644
 +#undef ReadPixelsContext
 +#undef OnReadPixelsDone
 diff --git a/gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc b/gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc
-index bab05ec057..435500c12f 100644
+index 49387f6995..d714e55f22 100644
 --- a/gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc
 +++ b/gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc
 @@ -25,6 +25,8 @@
@@ -411,14 +402,14 @@ index bab05ec057..435500c12f 100644
  namespace gpu {
  namespace {
  // NOTE: WrappedSkImage cannot be used with raster-over-GLES2 as it doesn't
-@@ -256,3 +258,5 @@ SharedImageBackingType WrappedSkImageBackingFactory::GetBackingType() {
+@@ -255,3 +257,5 @@ SharedImageBackingType WrappedSkImageBackingFactory::GetBackingType() {
  }
  
  }  // namespace gpu
 +
 +#undef kSupportedUsage
 diff --git a/gpu/config/BUILD.gn b/gpu/config/BUILD.gn
-index 4d0a06cd9c..24e3692c83 100644
+index f2a88f2e4e..ccdf665e20 100644
 --- a/gpu/config/BUILD.gn
 +++ b/gpu/config/BUILD.gn
 @@ -4,6 +4,7 @@
@@ -429,15 +420,15 @@ index 4d0a06cd9c..24e3692c83 100644
  import("//build/config/ui.gni")
  import("//gpu/vulkan/features.gni")
  import("//skia/features.gni")
-@@ -123,7 +124,7 @@ source_set("webgpu_blocklist_impl") {
+@@ -90,7 +91,7 @@ source_set("webgpu_blocklist_impl") {
    public_deps = [ "//third_party/dawn/include/dawn:cpp_headers" ]
  }
  
--source_set("config_sources") {
-+jumbo_source_set("config_sources") {
-   # External code should depend on this via //gpu/config above rather than
-   # depending on this directly or the component build will break.
-   visibility = [ "//gpu/*" ]
+-component("config") {
++jumbo_source_set("config") {
+   sources = [
+     "device_perf_info.cc",
+     "device_perf_info.h",
 diff --git a/gpu/config/webgpu_blocklist_impl.h b/gpu/config/webgpu_blocklist_impl.h
 index 870bf84ac0..a78a41f79a 100644
 --- a/gpu/config/webgpu_blocklist_impl.h
@@ -453,7 +444,7 @@ index 870bf84ac0..a78a41f79a 100644
  #include <string>
  
 diff --git a/gpu/ipc/service/BUILD.gn b/gpu/ipc/service/BUILD.gn
-index 237bff815a..e1465ee3ec 100644
+index 97e32dddd0..25a904dba7 100644
 --- a/gpu/ipc/service/BUILD.gn
 +++ b/gpu/ipc/service/BUILD.gn
 @@ -2,6 +2,7 @@
@@ -473,8 +464,29 @@ index 237bff815a..e1465ee3ec 100644
    output_name = "gpu_ipc_service"
    sources = [
      "command_buffer_stub.cc",
+diff --git a/gpu/vulkan/BUILD.gn b/gpu/vulkan/BUILD.gn
+index 9b29e95794..83e3f530b2 100644
+--- a/gpu/vulkan/BUILD.gn
++++ b/gpu/vulkan/BUILD.gn
+@@ -4,6 +4,7 @@
+ 
+ import("//build/buildflag_header.gni")
+ import("//build/config/dcheck_always_on.gni")
++import("//build/config/jumbo.gni")
+ import("//build/config/ozone.gni")
+ import("//build/config/ui.gni")
+ import("//build_overrides/wayland.gni")
+@@ -80,7 +81,7 @@ if (enable_vulkan) {
+     ]
+   }
+ 
+-  component("vulkan") {
++  jumbo_component("vulkan") {
+     output_name = "vulkan_wrapper"
+ 
+     sources = [
 diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn
-index 6192d8fdc4..f7109dad1b 100644
+index 7bc2086976..fa3247de1f 100644
 --- a/media/audio/BUILD.gn
 +++ b/media/audio/BUILD.gn
 @@ -2,6 +2,7 @@
@@ -516,10 +528,10 @@ index e6a9a6e534..726687267b 100644
 +#undef kDefaultSampleRate
 +#undef kDefaultInputBufferSize
 diff --git a/media/audio/pulse/audio_manager_pulse.cc b/media/audio/pulse/audio_manager_pulse.cc
-index 0187af2a4d..d5cbc49c28 100644
+index 8937e42da6..22c457d6d6 100644
 --- a/media/audio/pulse/audio_manager_pulse.cc
 +++ b/media/audio/pulse/audio_manager_pulse.cc
-@@ -25,6 +25,9 @@
+@@ -21,6 +21,9 @@
  #include "media/base/audio_parameters.h"
  #include "media/base/channel_layout.h"
  
@@ -529,7 +541,7 @@ index 0187af2a4d..d5cbc49c28 100644
  namespace media {
  
  using pulse::AutoPulseLock;
-@@ -374,3 +377,6 @@ void AudioManagerPulse::DefaultSourceInfoCallback(pa_context* context,
+@@ -375,3 +378,6 @@ void AudioManagerPulse::DefaultSourceInfoCallback(pa_context* context,
  }
  
  }  // namespace media
@@ -537,7 +549,7 @@ index 0187af2a4d..d5cbc49c28 100644
 +#undef kDefaultSampleRate
 +#undef kDefaultInputBufferSize
 diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn
-index 4e4188156f..2bf1ac2177 100644
+index 8a6e445c97..cda5f864e9 100644
 --- a/media/base/BUILD.gn
 +++ b/media/base/BUILD.gn
 @@ -5,6 +5,7 @@
@@ -557,7 +569,7 @@ index 4e4188156f..2bf1ac2177 100644
    # Do not expand the visibility here without double-checking with OWNERS, this
    # is a roll-up target which is part of the //media component. Most other DEPs
    # should be using //media and not directly DEP this roll-up target.
-@@ -445,6 +446,8 @@ source_set("base") {
+@@ -462,6 +463,8 @@ source_set("base") {
        "libaom_thread_wrapper.cc",
        "libaom_thread_wrapper.h",
      ]
@@ -567,7 +579,7 @@ index 4e4188156f..2bf1ac2177 100644
    }
  
 diff --git a/media/base/android/BUILD.gn b/media/base/android/BUILD.gn
-index 3eb8ca5c90..52765e5c0a 100644
+index 91bf799509..3f4c35ff4f 100644
 --- a/media/base/android/BUILD.gn
 +++ b/media/base/android/BUILD.gn
 @@ -4,6 +4,7 @@
@@ -588,7 +600,7 @@ index 3eb8ca5c90..52765e5c0a 100644
        "//media",
        "//media/filters",
 diff --git a/media/base/ipc/BUILD.gn b/media/base/ipc/BUILD.gn
-index 6217873522..98da4b4751 100644
+index e887c85d63..1a5ee54f7f 100644
 --- a/media/base/ipc/BUILD.gn
 +++ b/media/base/ipc/BUILD.gn
 @@ -2,7 +2,9 @@
@@ -620,7 +632,7 @@ index 068aefecec..4c851aabf0 100644
    # build, if other component targets also depend on it, multiple copies of
    # the ObjC classes declared in the files below will cause warnings at
 diff --git a/media/base/win/BUILD.gn b/media/base/win/BUILD.gn
-index 076e3ef667..5571e2d985 100644
+index d0637863ef..803f51d16f 100644
 --- a/media/base/win/BUILD.gn
 +++ b/media/base/win/BUILD.gn
 @@ -2,6 +2,8 @@
@@ -642,7 +654,7 @@ index 076e3ef667..5571e2d985 100644
      "dxgi_device_manager.cc",
      "dxgi_device_manager.h",
 diff --git a/media/capture/BUILD.gn b/media/capture/BUILD.gn
-index d3047c61bd..27748d10ee 100644
+index e150aa2560..1d3c228c07 100644
 --- a/media/capture/BUILD.gn
 +++ b/media/capture/BUILD.gn
 @@ -4,6 +4,7 @@
@@ -652,8 +664,8 @@ index d3047c61bd..27748d10ee 100644
 +import("//build/config/jumbo.gni")
  import("//build/config/ui.gni")
  import("//media/media_options.gni")
- import("//services/video_effects/args.gni")
-@@ -34,7 +35,7 @@ component("capture_switches") {
+ import("//testing/test.gni")
+@@ -33,7 +34,7 @@ component("capture_switches") {
  }
  
  # Things needed by //media/capture/mojom/video_capture_types.mojom.
@@ -662,7 +674,7 @@ index d3047c61bd..27748d10ee 100644
    defines = [ "CAPTURE_IMPLEMENTATION" ]
    sources = [
      "capture_export.h",
-@@ -57,7 +58,7 @@ component("capture_base") {
+@@ -55,7 +56,7 @@ component("capture_base") {
  }
  
  # Target which allows breakout of Android BUILD.gn files.
@@ -671,7 +683,7 @@ index d3047c61bd..27748d10ee 100644
    visibility = [
      ":capture_lib",
      "//media/capture/video/android",
-@@ -118,7 +119,7 @@ source_set("capture_device_specific") {
+@@ -116,7 +117,7 @@ source_set("capture_device_specific") {
    ]
  }
  
@@ -681,7 +693,7 @@ index d3047c61bd..27748d10ee 100644
    sources = [
      "video/create_video_capture_device_factory.cc",
 diff --git a/media/cast/BUILD.gn b/media/cast/BUILD.gn
-index da18ae42f1..25a1942a66 100644
+index 06cba8e764..143357fdbf 100644
 --- a/media/cast/BUILD.gn
 +++ b/media/cast/BUILD.gn
 @@ -2,6 +2,7 @@
@@ -720,10 +732,10 @@ index da18ae42f1..25a1942a66 100644
      "sender/audio_sender.cc",
      "sender/audio_sender.h",
 diff --git a/media/cast/encoding/av1_encoder.cc b/media/cast/encoding/av1_encoder.cc
-index ebdfabce7e..d2367957fb 100644
+index ff08a9c0f3..7c327e3fc2 100644
 --- a/media/cast/encoding/av1_encoder.cc
 +++ b/media/cast/encoding/av1_encoder.cc
-@@ -20,6 +20,16 @@
+@@ -16,6 +16,16 @@
  #include "third_party/libaom/source/libaom/aom/aomcx.h"
  #include "third_party/openscreen/src/cast/streaming/public/encoded_frame.h"
  
@@ -740,7 +752,7 @@ index ebdfabce7e..d2367957fb 100644
  namespace media {
  namespace cast {
  
-@@ -412,3 +422,13 @@ void Av1Encoder::GenerateKeyFrame() {
+@@ -408,3 +418,13 @@ void Av1Encoder::GenerateKeyFrame() {
  
  }  // namespace cast
  }  // namespace media
@@ -755,10 +767,10 @@ index ebdfabce7e..d2367957fb 100644
 +#undef kHighestEncodingSpeed
 +#undef kLowestEncodingSpeed
 diff --git a/media/cast/encoding/vpx_encoder.cc b/media/cast/encoding/vpx_encoder.cc
-index 53b7e1601b..d55896f5f4 100644
+index 7226784f07..a8339ecfb0 100644
 --- a/media/cast/encoding/vpx_encoder.cc
 +++ b/media/cast/encoding/vpx_encoder.cc
-@@ -22,6 +22,16 @@
+@@ -18,6 +18,16 @@
  #include "third_party/libvpx/source/libvpx/vpx/vp8cx.h"
  #include "third_party/openscreen/src/cast/streaming/public/encoded_frame.h"
  
@@ -775,7 +787,7 @@ index 53b7e1601b..d55896f5f4 100644
  namespace media {
  namespace cast {
  
-@@ -468,3 +478,14 @@ void VpxEncoder::GenerateKeyFrame() {
+@@ -466,3 +476,14 @@ void VpxEncoder::GenerateKeyFrame() {
  
  }  // namespace cast
  }  // namespace media
@@ -812,31 +824,31 @@ index d96f2f5afb..f694bf347c 100644
 +#undef kHistogramDroppedFrames
 +#undef kHistogramFrameDropped
 diff --git a/media/cast/sender/openscreen_frame_sender.cc b/media/cast/sender/openscreen_frame_sender.cc
-index e2f95f2ffe..21245bcb73 100644
+index 172c11caab..d9ab3453ee 100644
 --- a/media/cast/sender/openscreen_frame_sender.cc
 +++ b/media/cast/sender/openscreen_frame_sender.cc
-@@ -21,6 +21,8 @@
- #include "media/cast/constants.h"
+@@ -22,6 +22,8 @@
  #include "third_party/openscreen/src/cast/streaming/public/encoded_frame.h"
+ #include "third_party/perfetto/include/perfetto/tracing/track.h"
  
 +#define kMaxFrameBurst kMaxFrameBurst_OFS
 +
  namespace media::cast {
  namespace {
  
-@@ -323,3 +325,5 @@ CastStreamingFrameDropReason OpenscreenFrameSender::ShouldDropNextFrame(
+@@ -325,3 +327,5 @@ CastStreamingFrameDropReason OpenscreenFrameSender::ShouldDropNextFrame(
  }
  
  }  // namespace media::cast
 +
 +#undef kMaxFrameBurst
 diff --git a/media/cast/sender/video_sender.cc b/media/cast/sender/video_sender.cc
-index fa5282c0a0..26f4eba513 100644
+index 7acc0d64cd..de9ebe7549 100644
 --- a/media/cast/sender/video_sender.cc
 +++ b/media/cast/sender/video_sender.cc
-@@ -27,6 +27,9 @@
- #include "third_party/openscreen/src/cast/streaming/public/encoded_frame.h"
+@@ -28,6 +28,9 @@
  #include "third_party/openscreen/src/cast/streaming/public/sender.h"
+ #include "third_party/perfetto/include/perfetto/tracing/track.h"
  
 +#define kHistogramDroppedFrames kHistogramDroppedFrames_VS
 +#define kHistogramFrameDropped  kHistogramFrameDropped_VS
@@ -844,7 +856,7 @@ index fa5282c0a0..26f4eba513 100644
  namespace media::cast {
  
  namespace {
-@@ -369,3 +372,6 @@ void VideoSender::OnEncodedVideoFrame(
+@@ -370,3 +373,6 @@ void VideoSender::OnEncodedVideoFrame(
  }
  
  }  // namespace media::cast
@@ -852,10 +864,10 @@ index fa5282c0a0..26f4eba513 100644
 +#undef kHistogramDroppedFrames
 +#undef kHistogramFrameDropped
 diff --git a/media/filters/BUILD.gn b/media/filters/BUILD.gn
-index 10731337ee..aff6135a64 100644
+index 9d0c99973c..5caa98792f 100644
 --- a/media/filters/BUILD.gn
 +++ b/media/filters/BUILD.gn
-@@ -2,10 +2,11 @@
+@@ -2,6 +2,7 @@
  # Use of this source code is governed by a BSD-style license that can be
  # found in the LICENSE file.
  
@@ -863,6 +875,10 @@ index 10731337ee..aff6135a64 100644
  import("//media/gpu/args.gni")
  import("//media/media_options.gni")
  
+@@ -19,7 +20,7 @@ if (media_use_symphonia) {
+   }
+ }
+ 
 -source_set("filters") {
 +jumbo_source_set("filters") {
    # Do not expand the visibility here without double-checking with OWNERS, this
@@ -915,10 +931,10 @@ index 9f2b1befd4..d63f7a13d3 100644
 +#undef kParamSetStartCodeSize
 +#undef IsAccessUnitBoundaryNal
 diff --git a/media/filters/media_file_checker.cc b/media/filters/media_file_checker.cc
-index 57d6596f01..9b0cc36127 100644
+index 2e73f3b94e..52158ac426 100644
 --- a/media/filters/media_file_checker.cc
 +++ b/media/filters/media_file_checker.cc
-@@ -25,6 +25,8 @@
+@@ -22,6 +22,8 @@
  #include "media/filters/ffmpeg_glue.h"
  #include "media/filters/file_data_source.h"
  
@@ -927,14 +943,14 @@ index 57d6596f01..9b0cc36127 100644
  namespace media {
  
  namespace {
-@@ -115,3 +117,5 @@ bool MediaFileChecker::Start(base::TimeDelta check_time) {
+@@ -119,3 +121,5 @@ bool MediaFileChecker::Start(base::TimeDelta check_time) {
  }
  
  }  // namespace media
 +
 +#undef Decoder
 diff --git a/media/media_options.gni b/media/media_options.gni
-index ae57faa90b..1237ad197b 100644
+index 5f0318f651..c5cfcafb2c 100644
 --- a/media/media_options.gni
 +++ b/media/media_options.gni
 @@ -6,6 +6,7 @@ import("//build/config/cast.gni")
@@ -945,7 +961,7 @@ index ae57faa90b..1237ad197b 100644
  import("//build/config/ui.gni")
  import("//media/gpu/args.gni")
  import("//testing/libfuzzer/fuzzer_test.gni")
-@@ -106,7 +107,7 @@ declare_args() {
+@@ -112,7 +113,7 @@ declare_args() {
    # Enable logging override, e.g. enable DVLOGs through level 2 at build time.
    # On Cast devices, these are logged as INFO.
    # When enabled on Fuchsia, these are logged as VLOGs.
@@ -954,7 +970,7 @@ index ae57faa90b..1237ad197b 100644
  
    enable_dav1d_decoder = use_blink
  
-@@ -192,6 +193,9 @@ assert(!enable_hevc_parser_and_hw_decoder || enable_platform_hevc,
+@@ -198,6 +199,9 @@ assert(!enable_hevc_parser_and_hw_decoder || enable_platform_hevc,
  assert(!enable_platform_dolby_vision || enable_platform_hevc,
         "enable_platform_hevc required for enable_platform_dolby_vision")
  
@@ -965,7 +981,7 @@ index ae57faa90b..1237ad197b 100644
  declare_args() {
    # Enables runtime selection of PulseAudio library.
 diff --git a/media/mojo/clients/BUILD.gn b/media/mojo/clients/BUILD.gn
-index 1fce9bb072..abc833fe25 100644
+index f334bb0de6..bca4dc198c 100644
 --- a/media/mojo/clients/BUILD.gn
 +++ b/media/mojo/clients/BUILD.gn
 @@ -4,8 +4,10 @@
@@ -996,7 +1012,7 @@ index 938e729435..ef6f59d320 100644
      "audio_data_s16_converter.cc",
      "audio_data_s16_converter.h",
 diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn
-index 39c0e085c0..0cc91bca9b 100644
+index 9f54d77ef9..bb1bc62b6d 100644
 --- a/media/mojo/services/BUILD.gn
 +++ b/media/mojo/services/BUILD.gn
 @@ -3,6 +3,7 @@
@@ -1016,124 +1032,27 @@ index 39c0e085c0..0cc91bca9b 100644
    output_name = "media_mojo_services"
    sources = [
      "deferred_destroy_unique_receiver_set.h",
-diff --git a/ppapi/cpp/BUILD.gn b/ppapi/cpp/BUILD.gn
-index c916c3a5c3..0e03f92ded 100644
---- a/ppapi/cpp/BUILD.gn
-+++ b/ppapi/cpp/BUILD.gn
-@@ -2,6 +2,7 @@
- # Use of this source code is governed by a BSD-style license that can be
+diff --git a/printing/BUILD.gn b/printing/BUILD.gn
+index 4b7e4db74d..7f818601ec 100644
+--- a/printing/BUILD.gn
++++ b/printing/BUILD.gn
+@@ -3,6 +3,7 @@
  # found in the LICENSE file.
  
+ import("//build/config/features.gni")
 +import("//build/config/jumbo.gni")
- import("//ppapi/buildflags/buildflags.gni")
- 
- if (is_nacl) {
-@@ -13,7 +14,7 @@ assert(enable_ppapi)
- if (is_nacl && is_nacl_glibc) {
-   cpp_target_type = "shared_library"
- } else {
--  cpp_target_type = "static_library"
-+  cpp_target_type = "jumbo_static_library"
+ import("//build/config/linux/pkg_config.gni")
+ import("//build/config/sysroot.gni")
+ import("//build/config/ui.gni")
+@@ -141,7 +142,7 @@ source_set("native_drawing_context") {
+   deps = [ "//base" ]
  }
  
- # Link to this target to get the PPAPI C++ wrapper objects and plugin startup
-@@ -54,7 +55,7 @@ target(cpp_target_type, "cpp") {
- # Link to this target to get only the PPAPI C++ wrapper objects but not the
- # plugin startup code. Some plugins need special startup code that they supply
- # themselves.
--source_set("objects") {
-+jumbo_source_set("objects") {
+-component("metafile") {
++jumbo_component("metafile") {
    sources = [
-     "array_output.cc",
-     "array_output.h",
-diff --git a/ppapi/host/BUILD.gn b/ppapi/host/BUILD.gn
-index 46c0f01597..acf4d9f466 100644
---- a/ppapi/host/BUILD.gn
-+++ b/ppapi/host/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")
- import("//ppapi/buildflags/buildflags.gni")
- 
- assert(enable_ppapi)
- 
--component("host") {
-+jumbo_component("host") {
-   output_name = "ppapi_host"
- 
-   sources = [
-diff --git a/ppapi/proxy/BUILD.gn b/ppapi/proxy/BUILD.gn
-index fc97758faa..1a40565110 100644
---- a/ppapi/proxy/BUILD.gn
-+++ b/ppapi/proxy/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("//build/config/nacl/config.gni")
- import("//components/nacl/toolchain.gni")
- import("//ppapi/buildflags/buildflags.gni")
-@@ -12,9 +13,15 @@ config("proxy_implementation") {
-   defines = [ "PPAPI_PROXY_IMPLEMENTATION" ]
- }
- 
--component("proxy") {
-+jumbo_component("proxy") {
-   output_name = "ppapi_proxy"
- 
-+  if (is_nacl) {
-+    # The nacl toolchain has template related bugs that are triggered
-+    # in jumbo builds. https://crbug.com/912152
-+    never_build_jumbo = true
-+  }
-+
-   sources = [
-     # Take some standalone files from the C++ wrapper allowing us to more
-     # easily make async callbacks in the proxy. We can't depend on the
-@@ -326,7 +333,7 @@ source_set("ipc_sources") {
-   }
- }
- 
--static_library("test_support") {
-+jumbo_static_library("test_support") {
-   testonly = true
- 
-   sources = [
-diff --git a/ppapi/shared_impl/BUILD.gn b/ppapi/shared_impl/BUILD.gn
-index d6efdcc516..931da455d4 100644
---- a/ppapi/shared_impl/BUILD.gn
-+++ b/ppapi/shared_impl/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("//build/config/nacl/config.gni")
- import("//components/nacl/toolchain.gni")
- import("//ppapi/buildflags/buildflags.gni")
-@@ -42,12 +43,18 @@ source_set("headers") {
- }
- 
- # This contains the things that //ppapi/thunk needs.
--source_set("common") {
-+jumbo_source_set("common") {
-   visibility = [
-     ":*",
-     "//ppapi/thunk:*",
-   ]
- 
-+  if (is_nacl) {
-+    # The nacl toolchain has template related bugs that are triggered
-+    # in jumbo builds. https://crbug.com/912152
-+    never_build_jumbo = true
-+  }
-+
-   sources = [
-     "array_var.cc",
-     "array_var.h",
+     "metafile.cc",
+     "metafile.h",
 diff --git a/services/cert_verifier/cert_net_url_loader/BUILD.gn b/services/cert_verifier/cert_net_url_loader/BUILD.gn
 index ffc6bdc4ab..28ab85355d 100644
 --- a/services/cert_verifier/cert_net_url_loader/BUILD.gn
@@ -1152,7 +1071,7 @@ index ffc6bdc4ab..28ab85355d 100644
      "cert_net_fetcher_url_loader.cc",
      "cert_net_fetcher_url_loader.h",
 diff --git a/services/network/BUILD.gn b/services/network/BUILD.gn
-index 35a32bb950..16553f537e 100644
+index 7e605af85a..e3e0d7c7aa 100644
 --- a/services/network/BUILD.gn
 +++ b/services/network/BUILD.gn
 @@ -3,12 +3,13 @@
@@ -1170,8 +1089,8 @@ index 35a32bb950..16553f537e 100644
    sources = [
      "accept_ch_frame_interceptor.cc",
      "accept_ch_frame_interceptor.h",
-@@ -624,7 +625,7 @@ source_set("tests") {
-   }
+@@ -641,7 +642,7 @@ source_set("tests") {
+   configs += [ "//build/config/compiler:no_exit_time_destructors" ]
  }
  
 -source_set("test_support") {
@@ -1218,7 +1137,7 @@ index 188783cc42..7918267eee 100644
 +
 +#undef kPrefPath
 diff --git a/services/network/public/cpp/BUILD.gn b/services/network/public/cpp/BUILD.gn
-index 5b66798fda..c638a691c8 100644
+index a7ba27f22d..6a995cb58f 100644
 --- a/services/network/public/cpp/BUILD.gn
 +++ b/services/network/public/cpp/BUILD.gn
 @@ -3,6 +3,7 @@
@@ -1229,7 +1148,7 @@ index 5b66798fda..c638a691c8 100644
  import("//mojo/public/tools/bindings/mojom.gni")
  import("//net/features.gni")
  import("//services/network/public/cpp/features.gni")
-@@ -42,7 +43,7 @@ blink_python_runner("make_generated_permissions_policy_features") {
+@@ -43,7 +44,7 @@ blink_python_runner("make_generated_permissions_policy_features") {
    ]
  }
  
@@ -1238,7 +1157,7 @@ index 5b66798fda..c638a691c8 100644
    sources = [
      "crash_keys.cc",
      "crash_keys.h",
-@@ -52,7 +53,7 @@ component("crash_keys") {
+@@ -53,7 +54,7 @@ component("crash_keys") {
    defines = [ "IS_NETWORK_CPP_CRASH_KEYS_IMPL" ]
  }
  
@@ -1247,7 +1166,25 @@ index 5b66798fda..c638a691c8 100644
    output_name = "network_cpp"
  
    sources = [
-@@ -512,7 +513,7 @@ component("schemeful_site_mojom_support") {
+@@ -197,7 +198,7 @@ component("cpp") {
+ 
+ # These interfaces are put in their own target so that modules that only
+ # need to depend on mojom_ip_address does not depend on the entire cpp_base.
+-component("ip_address_mojom_support") {
++jumbo_component("ip_address_mojom_support") {
+   sources = [
+     "address_family_mojom_traits.cc",
+     "address_family_mojom_traits.h",
+@@ -384,7 +385,7 @@ component("is_potentially_trustworthy") {
+   defines = [ "IS_NETWORK_CPP_IS_POTENTIALLY_TRUSTWORTHY_IMPL" ]
+ }
+ 
+-component("web_platform") {
++jumbo_component("web_platform") {
+   sources = [
+     "client_hints.cc",
+     "client_hints.h",
+@@ -556,7 +557,7 @@ component("schemeful_site_mojom_support") {
  
  # This component is separate from cpp_base as it is a dependency of
  # //services/network/public/mojom:cookies_mojom.
@@ -1256,7 +1193,7 @@ index 5b66798fda..c638a691c8 100644
    sources = [
      "first_party_sets_mojom_traits.cc",
      "first_party_sets_mojom_traits.h",
-@@ -542,7 +543,7 @@ component("storage_access_api_mojom_support") {
+@@ -586,7 +587,7 @@ component("storage_access_api_mojom_support") {
    defines = [ "IS_STORAGE_ACCESS_API_MOJOM_TRAITS_IMPL" ]
  }
  
@@ -1265,7 +1202,7 @@ index 5b66798fda..c638a691c8 100644
    output_name = "network_cpp_base"
  
    sources = [
-@@ -600,6 +601,7 @@ component("cpp_base") {
+@@ -644,6 +645,7 @@ component("cpp_base") {
      "web_transport_error_mojom_traits.cc",
      "web_transport_error_mojom_traits.h",
    ]
@@ -1273,7 +1210,7 @@ index 5b66798fda..c638a691c8 100644
  
    configs += [ "//build/config/compiler:wexit_time_destructors" ]
  
-@@ -645,6 +647,9 @@ component("cpp_base") {
+@@ -690,6 +692,9 @@ component("cpp_base") {
        "p2p_param_traits.h",
        "p2p_socket_type.h",
      ]
@@ -1330,10 +1267,10 @@ index b32b864b80..3407788fbe 100644
 +#undef kReportOnlyHeaderName
 +#undef Parse
 diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index b4e32dd34c..264b90b56c 100644
+index 7834c23474..cc79011f44 100644
 --- a/services/network/url_loader.cc
 +++ b/services/network/url_loader.cc
-@@ -129,6 +129,8 @@
+@@ -137,6 +137,8 @@
  #include "third_party/abseil-cpp/absl/container/inlined_vector.h"
  #include "url/origin.h"
  
@@ -1342,17 +1279,17 @@ index b4e32dd34c..264b90b56c 100644
  namespace network {
  
  namespace {
-@@ -2556,3 +2558,5 @@ const mojom::ClientSecurityState* URLLoader::GetClientSecurityState() {
+@@ -2644,3 +2646,5 @@ void URLLoader::MaybeCollectDurableMessage(size_t new_data_offset,
  }
  
  }  // namespace network
 +
 +#undef kBlockedBodyAllocationSize
 diff --git a/services/network/web_bundle/web_bundle_url_loader_factory.cc b/services/network/web_bundle/web_bundle_url_loader_factory.cc
-index f8309ec80c..8c1bfc273d 100644
+index 517bfc4dde..f449c05251 100644
 --- a/services/network/web_bundle/web_bundle_url_loader_factory.cc
 +++ b/services/network/web_bundle/web_bundle_url_loader_factory.cc
-@@ -32,6 +32,8 @@
+@@ -36,6 +36,8 @@
  #include "services/network/web_bundle/web_bundle_chunked_buffer.h"
  #include "services/network/web_bundle/web_bundle_memory_quota_consumer.h"
  
@@ -1361,14 +1298,54 @@ index f8309ec80c..8c1bfc273d 100644
  namespace network {
  
  namespace {
-@@ -980,3 +982,5 @@ void WebBundleURLLoaderFactory::OnWebBundleFetchFailed() {
+@@ -984,3 +986,5 @@ void WebBundleURLLoaderFactory::OnWebBundleFetchFailed() {
  }
  
  }  // namespace network
 +
 +#undef kBlockedBodyAllocationSize
+diff --git a/services/viz/public/cpp/compositing/frame_timing_details_mojom_traits.cc b/services/viz/public/cpp/compositing/frame_timing_details_mojom_traits.cc
+index 863c20cdd2..a77aa0f7fb 100644
+--- a/services/viz/public/cpp/compositing/frame_timing_details_mojom_traits.cc
++++ b/services/viz/public/cpp/compositing/frame_timing_details_mojom_traits.cc
+@@ -8,6 +8,8 @@
+ #include "ui/gfx/mojom/presentation_feedback_mojom_traits.h"
+ #include "ui/gfx/mojom/swap_timings_mojom_traits.h"
+ 
++#define Traits Traits_FrameTimingDetailsMojomTraits
++
+ namespace mojo {
+ 
+ using Traits = StructTraits<viz::mojom::FrameTimingDetailsDataView,
+@@ -29,3 +31,5 @@ bool Traits::Read(viz::mojom::FrameTimingDetailsDataView data,
+ }
+ 
+ }  // namespace mojo
++
++#undef Traits
+diff --git a/services/webnn/BUILD.gn b/services/webnn/BUILD.gn
+index a5fae96151..bac543d4cd 100644
+--- a/services/webnn/BUILD.gn
++++ b/services/webnn/BUILD.gn
+@@ -3,6 +3,7 @@
+ # found in the LICENSE file.
+ 
+ import("//build/buildflag_header.gni")
++import("//build/config/jumbo.gni")
+ import("//mojo/public/tools/fuzzers/mojolpm.gni")
+ import("//services/on_device_model/on_device_model.gni")
+ import("//services/webnn/features.gni")
+@@ -29,7 +30,7 @@ source_set("webnn_switches") {
+   ]
+ }
+ 
+-component("webnn_service") {
++jumbo_component("webnn_service") {
+   defines = [ "IS_WEBNN_SERVICE_IMPL" ]
+ 
+   sources = [
 diff --git a/storage/browser/BUILD.gn b/storage/browser/BUILD.gn
-index bed170f3cf..fdb5d2edd9 100644
+index 880d4b22f5..489e8783ce 100644
 --- a/storage/browser/BUILD.gn
 +++ b/storage/browser/BUILD.gn
 @@ -1,10 +1,11 @@
@@ -1384,8 +1361,8 @@ index bed170f3cf..fdb5d2edd9 100644
    output_name = "storage_browser"
    sources = [
      "blob/blob_builder_from_stream.cc",
-@@ -344,7 +345,7 @@ source_set("unittests") {
-   ]
+@@ -348,7 +349,7 @@ source_set("unittests") {
+   configs += [ "//build/config/compiler:no_exit_time_destructors" ]
  }
  
 -static_library("test_support") {
@@ -1393,15 +1370,24 @@ index bed170f3cf..fdb5d2edd9 100644
    testonly = true
  
    sources = [
---- a/gpu/command_buffer/service/webgpu_decoder_impl.cc
-+++ b/gpu/command_buffer/service/webgpu_decoder_impl.cc
-@@ -7,6 +7,9 @@
- #pragma allow_unsafe_buffers
- #endif
+diff --git a/media/filters/legacy_audio_file_reader.cc b/media/filters/legacy_audio_file_reader.cc
+index 495a20ba0b..ac28bf6cb0 100644
+--- a/media/filters/legacy_audio_file_reader.cc
++++ b/media/filters/legacy_audio_file_reader.cc
+@@ -24,6 +24,9 @@
+ #include "media/ffmpeg/scoped_av_packet.h"
+ #include "media/formats/mpeg/mpeg1_audio_stream_parser.h"
  
-+// Macro 'Status' from X11/Xlib.h will cause confliction
-+#undef Status
++#define kAACPrimingFrameCount   kAACPrimingFrameCount_LegacyAudioFileReader
++#define kAACRemainderFrameCount kAACRemainderFrameCount_LegacyAudioFileReader
 +
- #include "gpu/command_buffer/service/webgpu_decoder_impl.h"
+ namespace media {
  
- #include <memory>
+ // AAC(M4A) decoding specific constants.
+@@ -352,3 +355,6 @@ const AVStream* LegacyAudioFileReader::GetAVStreamForTesting() const {
+ }
+ 
+ }  // namespace media
++
++#undef kAACPrimingFrameCount
++#undef kAACRemainderFrameCount

x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0114-absl-and-perfetto.patch

@@ -6,7 +6,6 @@ Subject: [PATCH] reland jumbo 14
 Enable jumbo build for the following component(s)/source_set(s):
 
 - //third_party/perfetto/src/shared_lib:shared_lib
-- //third_party/perfetto/src/trace_processor/db/column:column
 - //third_party/perfetto/src/trace_processor/importers/common:common
 - //third_party/perfetto/src/trace_processor/importers/memory_tracker:graph_processor
 - //third_party/perfetto/src/trace_processor/importers/proto:minimal
@@ -25,13 +24,12 @@ Enable jumbo build for the following template(s):
  third_party/abseil-cpp/absl/time/time.cc               |  4 ++++
  third_party/perfetto/gn/perfetto_component.gni         | 10 +++++++++-
  third_party/perfetto/src/shared_lib/BUILD.gn           |  3 ++-
- .../perfetto/src/trace_processor/db/column/BUILD.gn    |  3 ++-
  .../src/trace_processor/importers/common/BUILD.gn      |  3 ++-
  .../trace_processor/importers/memory_tracker/BUILD.gn  |  3 ++-
  .../src/trace_processor/importers/proto/BUILD.gn       |  3 ++-
  third_party/perfetto/src/tracing/BUILD.gn              |  3 ++-
  third_party/perfetto/src/tracing/service/BUILD.gn      |  3 ++-
- 12 files changed, 36 insertions(+), 9 deletions(-)
+ 11 files changed, 34 insertions(+), 8 deletions(-)
 
 diff --git a/third_party/abseil-cpp/absl.gni b/third_party/abseil-cpp/absl.gni
 index 48e1ce7838..1ae51fc0f5 100644
@@ -162,24 +160,8 @@ index ee0aa497d0..2be9d78a9e 100644
    deps = [
      ":intern_map",
      "../../gn:default_deps",
-diff --git a/third_party/perfetto/src/trace_processor/db/column/BUILD.gn b/third_party/perfetto/src/trace_processor/db/column/BUILD.gn
-index e92189fa54..7846495045 100644
---- a/third_party/perfetto/src/trace_processor/db/column/BUILD.gn
-+++ b/third_party/perfetto/src/trace_processor/db/column/BUILD.gn
-@@ -12,9 +12,10 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
-+import("//build/config/jumbo.gni")
- import("../../../../gn/test.gni")
- 
--source_set("column") {
-+jumbo_source_set("column") {
-   sources = [
-     "arrangement_overlay.cc",
-     "arrangement_overlay.h",
 diff --git a/third_party/perfetto/src/trace_processor/importers/common/BUILD.gn b/third_party/perfetto/src/trace_processor/importers/common/BUILD.gn
-index 3be2a5d292..be9ca2a672 100644
+index e681db573c..898b5d3420 100644
 --- a/third_party/perfetto/src/trace_processor/importers/common/BUILD.gn
 +++ b/third_party/perfetto/src/trace_processor/importers/common/BUILD.gn
 @@ -12,9 +12,10 @@
@@ -212,7 +194,7 @@ index 0fc30b806f..9e4922399d 100644
    public_deps = [
      "../../../../include/perfetto/base",
 diff --git a/third_party/perfetto/src/trace_processor/importers/proto/BUILD.gn b/third_party/perfetto/src/trace_processor/importers/proto/BUILD.gn
-index ed254e5a67..215ac02e98 100644
+index 6c193e9627..894070fe71 100644
 --- a/third_party/perfetto/src/trace_processor/importers/proto/BUILD.gn
 +++ b/third_party/perfetto/src/trace_processor/importers/proto/BUILD.gn
 @@ -12,9 +12,10 @@

x11-packages/electron-host-tools-for-code-oss/jumbo-patches/0115-webrtc.patch

@@ -747,17 +747,17 @@ diff --git a/third_party/webrtc/pc/webrtc_sdp.cc b/third_party/webrtc/pc/webrtc_
 index 6e434676f9..464aa79184 100644
 --- a/third_party/webrtc/pc/webrtc_sdp.cc
 +++ b/third_party/webrtc/pc/webrtc_sdp.cc
-@@ -69,6 +69,9 @@
+@@ -67,6 +67,9 @@
  #include "rtc_base/string_encode.h"
  #include "rtc_base/strings/string_builder.h"
  
-+#define kDummyAddress kDummyAddress_WebRTCSDP
-+#define kDummyPort    kDummyPort_WebRTCSDP
++#define kDummyAddress kDummyAddress_WebRTCRDP
++#define kDummyPort    kDummyPort_WebRTCRDP
 +
- // TODO(deadbeef): Switch to using anonymous namespace rather than declaring
- // everything "static".
  namespace webrtc {
-@@ -3761,3 +3764,6 @@
+ 
+ namespace {
+@@ -3619,3 +3622,6 @@ bool ParseFmtpParameterSet(absl::string_view line_params,
  }
  
  }  // namespace webrtc
@@ -806,95 +806,49 @@ index 103983dec4..58bbffea9c 100644
    }
    target(target_type, target_name) {
      forward_variables_from(invoker,
-diff --git a/third_party/webrtc/modules/audio_processing/aec3/fullband_erle_estimator.cc b/third_party/webrtc/modules/audio_processing/aec3/fullband_erle_estimator.cc
-index 498c21b568..b375d805ba 100644
---- a/third_party/webrtc/modules/audio_processing/aec3/fullband_erle_estimator.cc
-+++ b/third_party/webrtc/modules/audio_processing/aec3/fullband_erle_estimator.cc
-@@ -21,6 +21,10 @@
- #include "rtc_base/checks.h"
- #include "rtc_base/numerics/safe_minmax.h"
- 
-+#define kX2BandEnergyThreshold kX2BandEnergyThreshold_FullBandErleEstimator
-+#define kPointsToAccumulate    kPointsToAccumulate_FullBandErleEstimator
-+#define kBlocksToHoldErle      kBlocksToHoldErle_FullBandErleEstimator
-+
- namespace webrtc {
- 
- namespace {
-@@ -189,3 +193,7 @@ void FullBandErleEstimator::ErleInstantaneous::UpdateQualityEstimate() {
- }
- 
- }  // namespace webrtc
-+
-+#undef kX2BandEnergyThreshold
-+#undef kPointsToAccumulate
-+#undef kBlocksToHoldErle
 diff --git a/third_party/webrtc/modules/audio_processing/aec3/subband_erle_estimator.cc b/third_party/webrtc/modules/audio_processing/aec3/subband_erle_estimator.cc
-index 6208d26388..906e9a4dfc 100644
+index 8db40a2579..f2ab34a5e7 100644
 --- a/third_party/webrtc/modules/audio_processing/aec3/subband_erle_estimator.cc
 +++ b/third_party/webrtc/modules/audio_processing/aec3/subband_erle_estimator.cc
-@@ -18,6 +18,10 @@
+@@ -26,6 +26,10 @@
  #include "rtc_base/checks.h"
  #include "rtc_base/numerics/safe_minmax.h"
  
 +#define kX2BandEnergyThreshold kX2BandEnergyThreshold_SubbandErleEstimator
-+#define kPointsToAccumulate    kPointsToAccumulate_SubbandErleEstimator
 +#define kBlocksToHoldErle      kBlocksToHoldErle_SubbandErleEstimator
++#define kPointsToAccumulate    kPointsToAccumulate_SubbandErleEstimator
 +
  namespace webrtc {
  
  namespace {
-@@ -251,3 +255,7 @@ void SubbandErleEstimator::UpdateAccumulatedSpectra(
+@@ -259,3 +263,7 @@ void SubbandErleEstimator::UpdateAccumulatedSpectra(
  }
  
  }  // namespace webrtc
 +
 +#undef kX2BandEnergyThreshold
-+#undef kPointsToAccumulate
 +#undef kBlocksToHoldErle
-diff --git a/third_party/webrtc/modules/rtp_rtcp/source/rtp_packetizer_av1.cc b/third_party/webrtc/modules/rtp_rtcp/source/rtp_packetizer_av1.cc
-index e5293a90e2..3bd33d102a 100644
---- a/third_party/webrtc/modules/rtp_rtcp/source/rtp_packetizer_av1.cc
-+++ b/third_party/webrtc/modules/rtp_rtcp/source/rtp_packetizer_av1.cc
-@@ -25,6 +25,10 @@
- #include "rtc_base/checks.h"
- #include "rtc_base/logging.h"
- 
-+#define ObuHasExtension    ObuHasExtension_RTPPacketizerAV1
-+#define ObuHasSize         ObuHasSize_RTPPacketizerAV1
-+#define kObuSizePresentBit kObuSizePresentBit_RTPPacketizerAV1
-+
- namespace webrtc {
- namespace {
- constexpr int kAggregationHeaderSize = 1;
-@@ -456,3 +460,7 @@ bool RtpPacketizerAv1::NextPacket(RtpPacketToSend* packet) {
- }
- 
- }  // namespace webrtc
-+
-+#undef ObuHasExtension
-+#undef ObuHasSize
-+#undef kObuSizePresentBit
++#undef kPointsToAccumulate
 diff --git a/third_party/webrtc/modules/rtp_rtcp/source/video_rtp_depacketizer_av1.cc b/third_party/webrtc/modules/rtp_rtcp/source/video_rtp_depacketizer_av1.cc
-index fd8d647045..3695dad955 100644
+index ed7434e88d..ff050ca340 100644
 --- a/third_party/webrtc/modules/rtp_rtcp/source/video_rtp_depacketizer_av1.cc
 +++ b/third_party/webrtc/modules/rtp_rtcp/source/video_rtp_depacketizer_av1.cc
-@@ -34,6 +34,10 @@
+@@ -33,6 +33,10 @@
  #include "rtc_base/logging.h"
  #include "rtc_base/numerics/safe_conversions.h"
  
-+#define ObuHasExtension    ObuHasExtension_VideoRTPDepacketizerAV1
-+#define ObuHasSize         ObuHasSize_VideoRTPDepacketizerAV1
-+#define kObuSizePresentBit kObuSizePresentBit_VideoRTPDepacketizerAV1
++#define kObuSizePresentBit kObuSizePresentBit_AV1
++#define ObuHasExtension    ObuHasExtension_AV1
++#define ObuHasSize         ObuHasSize_AV1
 +
  namespace webrtc {
  namespace {
  // AV1 format:
-@@ -404,3 +408,7 @@ VideoRtpDepacketizerAv1::Parse(CopyOnWriteBuffer rtp_payload) {
+@@ -403,3 +407,7 @@ VideoRtpDepacketizerAv1::Parse(CopyOnWriteBuffer rtp_payload) {
  }
  
  }  // namespace webrtc
 +
++#undef kObuSizePresentBit
 +#undef ObuHasExtension
 +#undef ObuHasSize
-+#undef kObuSizePresentBit

x11-packages/electron-host-tools-for-code-oss/jumbo-patches/9001-electron.patch

@@ -70,7 +70,7 @@ Subject: [PATCH] jumbo
  63 files changed, 369 insertions(+), 187 deletions(-)
 
 diff --git a/electron/BUILD.gn b/electron/BUILD.gn
-index b00aa3c3b7..5732390cbb 100644
+index c27602f164..c16d1d5a00 100644
 --- a/electron/BUILD.gn
 +++ b/electron/BUILD.gn
 @@ -1,3 +1,4 @@
@@ -78,7 +78,7 @@ index b00aa3c3b7..5732390cbb 100644
  import("//build/config/locales.gni")
  import("//build/config/ui.gni")
  import("//build/config/win/manifest.gni")
-@@ -419,7 +420,7 @@ action("electron_generate_node_defines") {
+@@ -420,7 +421,7 @@ action("electron_generate_node_defines") {
    args = [ rebase_path(target_gen_dir) ] + rebase_path(inputs)
  }
  
@@ -87,7 +87,7 @@ index b00aa3c3b7..5732390cbb 100644
    configs += [
      "//v8:external_startup_data",
      "//third_party/electron_node:node_external_config",
-@@ -553,6 +554,25 @@ source_set("electron_lib") {
+@@ -558,6 +559,31 @@ source_set("electron_lib") {
    deps += [ "//electron/build/config:generate_mas_config" ]
  
    sources = filenames.lib_sources
@@ -109,11 +109,17 @@ index b00aa3c3b7..5732390cbb 100644
 +
 +    # Conflicts with third_party/blink/renderer/platform:blink_platform
 +    "shell/renderer/electron_smooth_round_rect.cc",
++
++    # `CreateFunctionTemplate` both exists in `electron/shell/common/gin_helper/function_template.h` and `gin/function_template.h`
++    "shell/common/gin_helper/callback.cc",
++
++    # `DeprecatedWrapperInfo::From` also exists in `gin/wrapper_info.cc`
++    "shell/common/gin_helper/wrappable.cc",
 +  ]
    if (is_win) {
      sources += filenames.lib_sources_win
    }
-@@ -567,6 +584,10 @@ source_set("electron_lib") {
+@@ -572,6 +598,10 @@ source_set("electron_lib") {
    }
    if (!is_mac) {
      sources += filenames.lib_sources_views
@@ -124,7 +130,7 @@ index b00aa3c3b7..5732390cbb 100644
    }
  
    if (is_component_build) {
-@@ -660,6 +681,10 @@ source_set("electron_lib") {
+@@ -671,6 +701,10 @@ source_set("electron_lib") {
          "//ui/base/x",
          "//ui/ozone/platform/x11",
        ]
@@ -729,36 +735,36 @@ diff --git a/electron/shell/browser/api/electron_api_session.cc b/electron/shell
 index 21740d2072..a86b6c7037 100644
 --- a/electron/shell/browser/api/electron_api_session.cc
 +++ b/electron/shell/browser/api/electron_api_session.cc
-@@ -533,8 +533,8 @@ class DictionaryObserver final : public SpellcheckCustomDictionary::Observer {
+@@ -544,8 +544,8 @@
  };
  #endif  // BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER)
  
 -struct UserDataLink : base::SupportsUserData::Data {
--  explicit UserDataLink(base::WeakPtr<Session> session_in)
+-  explicit UserDataLink(
 +struct UserDataLink3 : base::SupportsUserData::Data {
-+  explicit UserDataLink3(base::WeakPtr<Session> session_in)
-       : session{std::move(session_in)} {}
++  explicit UserDataLink3(
+       cppgc::WeakPersistent<gin::WeakCell<Session>> session_in)
+       : session{session_in} {}
  
-   base::WeakPtr<Session> session;
-@@ -562,7 +562,7 @@ Session::Session(v8::Isolate* isolate, ElectronBrowserContext* browser_context)
+@@ -577,7 +577,7 @@
  
    browser_context->SetUserData(
        kElectronApiSessionKey,
--      std::make_unique<UserDataLink>(weak_factory_.GetWeakPtr()));
-+      std::make_unique<UserDataLink3>(weak_factory_.GetWeakPtr()));
- 
- #if BUILDFLAG(ENABLE_BUILTIN_SPELLCHECKER)
-   if (auto* service =
-@@ -1741,7 +1741,7 @@ bool Session::IsSpellCheckerEnabled() const {
- // static
- Session* Session::FromBrowserContext(content::BrowserContext* context) {
+-      std::make_unique<UserDataLink>(
++      std::make_unique<UserDataLink3>(
+           cppgc::WeakPersistent<gin::WeakCell<Session>>(
+               weak_factory_.GetWeakCell(
+                   isolate->GetCppHeap()->GetAllocationHandle()))));
+@@ -1680,7 +1680,7 @@
+ gin::WeakCell<Session>* Session::FromBrowserContext(
+     content::BrowserContext* context) {
    auto* data =
 -      static_cast<UserDataLink*>(context->GetUserData(kElectronApiSessionKey));
 +      static_cast<UserDataLink3*>(context->GetUserData(kElectronApiSessionKey));
-   return data ? data->session.get() : nullptr;
- }
- 
-@@ -1919,7 +1919,7 @@ void Session::WillBeDestroyed() {
+   if (data && data->session)
+     return data->session.Get();
+   return nullptr;
+@@ -1871,7 +1871,7 @@
  
  }  // namespace electron::api
  
@@ -767,7 +773,7 @@ index 21740d2072..a86b6c7037 100644
  
  using electron::api::Session;
  
-@@ -1963,6 +1963,9 @@ void Initialize(v8::Local<v8::Object> exports,
+@@ -1930,6 +1930,9 @@
    dict.SetMethod("fromPath", &FromPath);
  }
  
@@ -1057,30 +1063,6 @@ index 1603230fbb..78f09da358 100644
      // --remote-debugging-port
      DevToolsManagerDelegate::StartHttpHandler();
    }
-diff --git a/electron/shell/browser/electron_browser_main_parts_linux.cc b/electron/shell/browser/electron_browser_main_parts_linux.cc
-index 85d1ad9ba9..7c9f01f0b8 100644
---- a/electron/shell/browser/electron_browser_main_parts_linux.cc
-+++ b/electron/shell/browser/electron_browser_main_parts_linux.cc
-@@ -114,16 +114,16 @@
- void ElectronBrowserMainParts::DetectOzonePlatform() {
-   auto const env = base::Environment::Create();
-   auto* const command_line = base::CommandLine::ForCurrentProcess();
--  if (!command_line->HasSwitch(switches::kOzonePlatform)) {
-+  if (!command_line->HasSwitch(::switches::kOzonePlatform)) {
-     auto ozone_platform_hint =
--        command_line->GetSwitchValueASCII(switches::kOzonePlatformHint);
-+        command_line->GetSwitchValueASCII(::switches::kOzonePlatformHint);
-     if (ozone_platform_hint.empty()) {
-       ozone_platform_hint =
-           env->GetVar(kElectronOzonePlatformHint).value_or("");
-     }
-     if (!ozone_platform_hint.empty()) {
-       command_line->AppendSwitchASCII(
--          switches::kOzonePlatform, MaybeFixPlatformName(ozone_platform_hint));
-+          ::switches::kOzonePlatform, MaybeFixPlatformName(ozone_platform_hint));
-     }
-   }
- 
 diff --git a/electron/shell/browser/extensions/api/extension_action/extension_action_api.cc b/electron/shell/browser/extensions/api/extension_action/extension_action_api.cc
 index 0b05be8db3..09e5d81ed4 100644
 --- a/electron/shell/browser/extensions/api/extension_action/extension_action_api.cc
@@ -1267,28 +1249,6 @@ index 5f27233e56..1ab263ae5e 100644
  }
  
  void ThemeDataSource::SendColorsCss(
-diff --git a/electron/shell/browser/ui/views/client_frame_view_linux.cc b/electron/shell/browser/ui/views/client_frame_view_linux.cc
-index 98f6f0b785..4c43d25f12 100644
---- a/electron/shell/browser/ui/views/client_frame_view_linux.cc
-+++ b/electron/shell/browser/ui/views/client_frame_view_linux.cc
-@@ -40,7 +40,7 @@ namespace {
- 
- // These values should be the same as Chromium uses.
- constexpr int kResizeBorder = 10;
--constexpr int kResizeInsideBoundsSize = 5;
-+constexpr int kResizeInsideBoundsSize2 = 5;
- 
- ui::NavButtonProvider::ButtonState ButtonStateToNavButtonProviderState(
-     views::Button::ButtonState state) {
-@@ -199,7 +199,7 @@ void ClientFrameViewLinux::OnWindowButtonOrderingChange() {
- int ClientFrameViewLinux::ResizingBorderHitTest(const gfx::Point& point) {
-   return ResizingBorderHitTestImpl(point,
-                                    RestoredMirroredFrameBorderInsets() +
--                                       gfx::Insets(kResizeInsideBoundsSize));
-+                                       gfx::Insets(kResizeInsideBoundsSize2));
- }
- 
- gfx::Rect ClientFrameViewLinux::GetBoundsForClientView() const {
 diff --git a/electron/shell/common/api/crashpad_support.cc b/electron/shell/common/api/crashpad_support.cc
 index 6106304395..966e518c80 100644
 --- a/electron/shell/common/api/crashpad_support.cc
@@ -1739,3 +1699,15 @@ index c1c399f89b..51b5b35f38 100644
    ]
  
    if (is_mac) {
+diff --git a/gin/BUILD.gn b/gin/BUILD.gn
+index ef288ce49b..9acefb179a 100644
+--- a/gin/BUILD.gn
++++ b/gin/BUILD.gn
+@@ -84,6 +84,7 @@ jumbo_component("gin") {
+   ]
+   jumbo_excluded_sources = [
+     "converter.cc", # Fail to compile
++    "wrapper_info.cc", # Conflicts with //electron:electron_lib
+   ]
+ 
+   if (use_partition_alloc) {