diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2024-04-21 10:18:41 +0000 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2024-04-21 10:21:08 +0000 |
| commit | 6644efa6cc5db048ec9e188ad369ce6e20717d48 (patch) | |
| tree | 35c2992e3467bf50178980096c1b82742c258c69 | |
| parent | 16bf45b77d9c03a41906737434f79833b673bad7 (diff) | |
| download | ports-6644efa6cc5db048ec9e188ad369ce6e20717d48.tar.gz ports-6644efa6cc5db048ec9e188ad369ce6e20717d48.zip | |
www/*chromium: update to 124.0.6367.60
374 files changed, 2314 insertions, 1917 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index dbbcf89863e2..f4243fab81f2 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,5 +1,5 @@ PORTNAME= chromium -PORTVERSION= 123.0.6312.122 +PORTVERSION= 124.0.6367.60 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:external diff --git a/www/chromium/distinfo b/www/chromium/distinfo index a8767f5d73f0..e61cc1be1d16 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1712941203 -SHA256 (chromium-123.0.6312.122.tar.xz) = c883f192af7cb76cf46de4044349645b0fb0b5c42a1c0f7950a24c825c17f885 -SIZE (chromium-123.0.6312.122.tar.xz) = 3488275388 -SHA256 (chrome-linux-123.0.6312.122-llvm17.profdata.tar.xz) = b039c11fc2d1df8c36dd511552f2f8f6e08e471b5b0792328c72cdfc291a49f6 -SIZE (chrome-linux-123.0.6312.122-llvm17.profdata.tar.xz) = 29800600 -SHA256 (chromium-123.0.6312.122-testdata.tar.xz) = f9075629ea813e184977811fd95c9edf3ca499d83af4e934706a0b344c874cbf -SIZE (chromium-123.0.6312.122-testdata.tar.xz) = 279875756 +TIMESTAMP = 1713531852 +SHA256 (chromium-124.0.6367.60.tar.xz) = ebd553527149cb8477a522df90acd6cea2388a6f431e2db589a0301df1d0cae2 +SIZE (chromium-124.0.6367.60.tar.xz) = 3432734968 +SHA256 (chrome-linux-124.0.6367.60-llvm17.profdata.tar.xz) = 6c4447dcd395f898bce3dbb7c5d361ee25f571f1c9c9c30767b169dec5ce1290 +SIZE (chrome-linux-124.0.6367.60-llvm17.profdata.tar.xz) = 30129116 +SHA256 (chromium-124.0.6367.60-testdata.tar.xz) = 42fcb4454bb703343843b7b7b4c7c28cbc9e0f885f5e38748268aeeb00ce9d29 +SIZE (chromium-124.0.6367.60-testdata.tar.xz) = 279785420 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734 diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index b7b12485ca76..e599afc55ff6 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2024-03-22 08:19:40 UTC +--- BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ BUILD.gn @@ -64,7 +64,7 @@ declare_args() { root_extra_deps = [] @@ -17,7 +17,7 @@ "//net:net_unittests", "//sandbox:sandbox_unittests", "//services:services_unittests", -@@ -428,7 +427,7 @@ group("gn_all") { +@@ -427,7 +426,7 @@ group("gn_all") { } } @@ -26,7 +26,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -628,6 +627,15 @@ group("gn_all") { +@@ -627,6 +626,15 @@ group("gn_all") { } } @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:dump_syms", -@@ -674,7 +682,7 @@ group("gn_all") { +@@ -673,7 +681,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -51,7 +51,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -1095,7 +1103,7 @@ if (use_blink && !is_cronet_build) { +@@ -1094,7 +1102,7 @@ if (use_blink && !is_cronet_build) { ] } @@ -60,7 +60,7 @@ script_test("chrome_wpt_tests") { script = "//third_party/blink/tools/run_wpt_tests.py" args = [ -@@ -1186,7 +1194,7 @@ if (use_blink && !is_cronet_build) { +@@ -1185,7 +1193,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -69,7 +69,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1195,7 +1203,7 @@ if (use_blink && !is_cronet_build) { +@@ -1194,7 +1202,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -78,7 +78,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1645,7 +1653,7 @@ group("chromium_builder_perf") { +@@ -1654,7 +1662,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 5ab4d3df8551..111ebfe4e412 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2024-03-22 08:19:40 UTC +--- base/BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ base/BUILD.gn -@@ -192,7 +192,7 @@ buildflag_header("ios_cronet_buildflags") { +@@ -200,7 +200,7 @@ buildflag_header("ios_cronet_buildflags") { flags = [ "CRONET_BUILD=$is_cronet_build" ] } @@ -9,7 +9,7 @@ buildflag_header("message_pump_buildflags") { header = "message_pump_buildflags.h" header_dir = "base/message_loop" -@@ -1126,11 +1126,23 @@ component("base") { +@@ -1131,11 +1131,23 @@ component("base") { # Needed for <atomic> if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -34,7 +34,7 @@ if (use_allocator_shim) { if (is_apple) { sources += [ "allocator/early_zone_registration_apple.h" ] -@@ -1150,7 +1162,7 @@ component("base") { +@@ -1155,7 +1167,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -43,7 +43,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2106,6 +2118,22 @@ component("base") { +@@ -2113,6 +2125,22 @@ component("base") { ] } @@ -66,7 +66,7 @@ # iOS if (is_ios) { sources += [ -@@ -2241,6 +2269,31 @@ component("base") { +@@ -2249,6 +2277,33 @@ component("base") { } } @@ -74,6 +74,8 @@ + sources -= [ + "files/file_path_watcher_inotify.cc", + "files/scoped_file_linux.cc", ++ "process/set_process_title_linux.cc", ++ "process/set_process_title_linux.h", + "system/sys_info_linux.cc", + "process/process_iterator_linux.cc", + "process/process_linux.cc", @@ -98,7 +100,7 @@ if (use_blink) { sources += [ "files/file_path_watcher.cc", -@@ -2251,7 +2304,7 @@ component("base") { +@@ -2259,7 +2314,7 @@ component("base") { } if (dep_libevent) { @@ -107,7 +109,7 @@ } if (use_libevent) { -@@ -3027,7 +3080,7 @@ if (is_apple) { +@@ -3072,7 +3127,7 @@ if (is_apple) { } } @@ -116,24 +118,16 @@ # This test must compile with -fstack-protector-all source_set("stack_canary_linux_unittests") { testonly = true -@@ -3675,14 +3728,14 @@ test("base_unittests") { +@@ -3716,7 +3771,7 @@ test("base_unittests") { ] } - if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { ++ if (!is_bsd && (is_linux || is_chromeos)) { sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", - "nix/mime_util_xdg_unittest.cc", - ] - -- if (!is_nacl) { -+ if (!is_nacl && !is_bsd) { - deps += [ ":stack_canary_linux_unittests" ] - } - } -@@ -3701,7 +3754,7 @@ test("base_unittests") { +@@ -3743,7 +3798,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -142,7 +136,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3712,7 +3765,7 @@ test("base_unittests") { +@@ -3754,7 +3809,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -151,7 +145,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3980,7 +4033,7 @@ test("base_unittests") { +@@ -4022,7 +4077,7 @@ test("base_unittests") { } } diff --git a/www/chromium/files/patch-base_allocator_dispatcher_tls.h b/www/chromium/files/patch-base_allocator_dispatcher_tls.h index b3403f22a21f..4846c23803fd 100644 --- a/www/chromium/files/patch-base_allocator_dispatcher_tls.h +++ b/www/chromium/files/patch-base_allocator_dispatcher_tls.h @@ -1,8 +1,8 @@ ---- base/allocator/dispatcher/tls.h.orig 2023-11-03 10:09:45 UTC +--- base/allocator/dispatcher/tls.h.orig 2024-04-19 13:02:56 UTC +++ base/allocator/dispatcher/tls.h -@@ -74,7 +74,7 @@ struct BASE_EXPORT MMapAllocator { - partition_alloc::PartitionPageSize(); - #elif BUILDFLAG(IS_APPLE) +@@ -76,7 +76,7 @@ struct BASE_EXPORT MMapAllocator { + constexpr static size_t AllocationChunkSize = 16384; + #elif BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS) constexpr static size_t AllocationChunkSize = 16384; -#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) +#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni index 90ec31009c98..d9e57c421e1a 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni @@ -1,7 +1,7 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-03-22 08:19:40 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-04-19 13:02:56 UTC +++ base/allocator/partition_allocator/partition_alloc.gni -@@ -30,7 +30,7 @@ if (is_nacl) { - } +@@ -33,7 +33,7 @@ if (is_nacl) { + use_large_empty_slot_span_ring = is_mac has_memory_tagging = - current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android) @@ -9,7 +9,7 @@ declare_args() { # Causes all the allocations to be routed via allocator_shim.cc. Usually, -@@ -357,7 +357,7 @@ declare_args() { +@@ -351,7 +351,7 @@ declare_args() { # dependencies that use partition_allocator are compiled in AOSP against a # version of glibc that does not include pkeys syscall numbers. enable_pkeys = diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn index d721d056c575..6c1f761e5029 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn +++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-03-22 08:19:40 UTC +--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn -@@ -858,7 +858,7 @@ if (is_clang_or_gcc) { +@@ -851,7 +851,7 @@ if (is_clang_or_gcc) { configs -= [ "//build/config/compiler:enable_arc" ] } } diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h index a2a366e6c264..76b0580b3f89 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig 2024-02-23 21:04:38 UTC +--- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig 2024-04-19 13:02:56 UTC +++ base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h @@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) { @@ -9,7 +9,7 @@ // We shouldn't allocate system pages at all for sanitizer builds. However, // we do, and if random hint addresses interfere with address ranges -@@ -126,7 +126,7 @@ AslrMask(uintptr_t bits) { +@@ -128,7 +128,7 @@ AslrMask(uintptr_t bits) { return AslrAddress(0x20000000ULL); } diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h index 5ead2f4b8adb..2b8e04c5b547 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig 2024-02-23 21:04:38 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig 2024-04-19 13:02:56 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator.h -@@ -256,7 +256,7 @@ bool DecommitAndZeroSystemPages(void* address, +@@ -259,7 +259,7 @@ bool DecommitAndZeroSystemPages(void* address, // recommitted. Do not assume that this will not change over time. constexpr PA_COMPONENT_EXPORT( PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() { diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h index 2296c9fc1e02..e3693583741a 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h @@ -1,38 +1,11 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2024-02-23 21:04:38 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2024-04-19 13:02:56 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h -@@ -25,7 +25,7 @@ - // elimination. +@@ -26,7 +26,7 @@ #define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const)) --#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && defined(ARCH_CPU_ARM64) -+#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) + #elif (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS)) || \ +- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) ++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)) // This should work for all POSIX (if needed), but currently all other // supported OS/architecture combinations use either hard-coded values // (such as x86) or have means to determine these values without needing -@@ -92,7 +92,7 @@ PageAllocationGranularityShift() { - return 14; // 16kB - #elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS) - return static_cast<size_t>(vm_page_shift); --#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && defined(ARCH_CPU_ARM64) -+#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) - // arm64 supports 4kb (shift = 12), 16kb (shift = 14), and 64kb (shift = 16) - // page sizes. Retrieve from or initialize cache. - size_t shift = page_characteristics.shift.load(std::memory_order_relaxed); -@@ -113,7 +113,7 @@ PageAllocationGranularity() { - // This is literally equivalent to |1 << PageAllocationGranularityShift()| - // below, but was separated out for IS_APPLE to avoid << on a non-constexpr. - return vm_page_size; --#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && defined(ARCH_CPU_ARM64) -+#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) - // arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or - // initialize cache. - size_t size = page_characteristics.size.load(std::memory_order_relaxed); -@@ -153,7 +153,7 @@ PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONS - SystemPageSize() { - #if (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ - (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_ARM64)) || \ -- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) -+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)) - // This is literally equivalent to |1 << SystemPageShift()| below, but was - // separated out for 64-bit IS_APPLE and arm64 on Android/Linux to avoid << - // on a non-constexpr. diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__address__space.cc b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__address__space.cc deleted file mode 100644 index a5846514a528..000000000000 --- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__address__space.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_address_space.cc.orig 2024-02-23 21:04:38 UTC -+++ base/allocator/partition_allocator/src/partition_alloc/partition_address_space.cc -@@ -421,7 +421,7 @@ void PartitionAddressSpace::UninitThreadIsolatedPoolFo - } - #endif - --#if (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && defined(ARCH_CPU_ARM64) -+#if (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) - - PageCharacteristics page_characteristics; - diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h index 979df47dcdc0..0bdfb80dfa47 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-02-23 21:04:38 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-04-19 13:02:56 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h @@ -251,7 +251,7 @@ constexpr bool kUseLazyCommit = false; // On these platforms, lock all the partitions before fork(), and unlock after. @@ -11,10 +11,10 @@ // PartitionRoots at BeforeFork and to release at AfterFork. @@ -299,7 +299,7 @@ constexpr bool kUseLazyCommit = false; // - // Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to - // larger slot spans. --#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) -+#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD) + // Also enabled on ARM64 macOS and iOS, as the 16kiB pages on this platform lead + // to larger slot spans. +-#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)) ++#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD) #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() 1 #else #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() 0 diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h index e280ac740ef0..5214c122b0c5 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h @@ -1,21 +1,11 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-02-23 21:04:38 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-04-19 13:02:56 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h -@@ -112,7 +112,7 @@ PartitionPageShift() { - } - #elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ - (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_ARM64)) || \ -- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) -+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)) - PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t - PartitionPageShift() { - return PageAllocationGranularityShift() + 2; -@@ -314,7 +314,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1; +@@ -313,7 +313,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1; // 8GB for each of the glued pools). #if BUILDFLAG(HAS_64_BIT_POINTERS) #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \ - BUILDFLAG(ENABLE_POINTER_COMPRESSION) -+ BUILDFLAG(ENABLE_POINTER_COMPRESSION) || \ -+ BUILDFLAG(IS_BSD) ++ BUILDFLAG(ENABLE_POINTER_COMPRESSION) || BUILDFLAG(IS_BSD) constexpr size_t kPoolMaxSize = 8 * kGiB; #else constexpr size_t kPoolMaxSize = 16 * kGiB; diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h deleted file mode 100644 index ab01aa758242..000000000000 --- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h.orig 2024-02-23 21:04:38 UTC -+++ base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h -@@ -16,7 +16,7 @@ namespace partition_alloc::internal { - // (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And - // PartitionPageSize() is 4 times the OS page size. - static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 14) / kSmallestBucket; --#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && defined(ARCH_CPU_ARM64) -+#elif (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) - // System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is - // currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code, - // so we use the 16 kiB maximum (64 kiB will crash). diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc index 96ad9699c0a1..d5d4496bfa86 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-02-23 21:04:38 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-04-19 13:02:56 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc @@ -47,7 +47,7 @@ #include "wow64apiset.h" @@ -9,7 +9,7 @@ #include <pthread.h> #endif -@@ -278,7 +278,7 @@ void PartitionAllocMallocInitOnce() { +@@ -279,7 +279,7 @@ void PartitionAllocMallocInitOnce() { return; } @@ -18,16 +18,7 @@ // When fork() is called, only the current thread continues to execute in the // child process. If the lock is held, but *not* by this thread when fork() is // called, we have a deadlock. -@@ -377,7 +377,7 @@ static size_t PartitionPurgeSlotSpan(PartitionRoot* ro - (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) / - MinPurgeableSlotSize(); - #elif BUILDFLAG(IS_APPLE) || \ -- ((BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)) && \ -+ ((BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && \ - defined(ARCH_CPU_ARM64)) - // It's better for slot_usage to be stack-allocated and fixed-size, which - // demands that its size be constexpr. On IS_APPLE and Linux on arm64, -@@ -942,7 +942,7 @@ void PartitionRoot::Init(PartitionOptions opts) { +@@ -950,7 +950,7 @@ void PartitionRoot::Init(PartitionOptions opts) { // apple OSes. PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || (internal::SystemPageSize() == (size_t{1} << 14))); diff --git a/www/chromium/files/patch-base_base__paths__posix.cc b/www/chromium/files/patch-base_base__paths__posix.cc index 1814d597ecf0..c343f2e93b3c 100644 --- a/www/chromium/files/patch-base_base__paths__posix.cc +++ b/www/chromium/files/patch-base_base__paths__posix.cc @@ -1,4 +1,4 @@ ---- base/base_paths_posix.cc.orig 2023-11-03 16:09:21 UTC +--- base/base_paths_posix.cc.orig 2024-04-19 13:02:56 UTC +++ base/base_paths_posix.cc @@ -15,6 +15,7 @@ #include <ostream> @@ -28,8 +28,8 @@ return true; #elif BUILDFLAG(IS_FREEBSD) - int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; -- absl::optional<std::string> bin_dir = StringSysctl(name, std::size(name)); -+ absl::optional<std::string> bin_dir = StringSysctl({ CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }); +- std::optional<std::string> bin_dir = StringSysctl(name, std::size(name)); ++ std::optional<std::string> bin_dir = StringSysctl({ CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }); if (!bin_dir.has_value() || bin_dir.value().length() <= 1) { NOTREACHED() << "Unable to resolve path."; return false; @@ -73,7 +73,7 @@ + goto out; + } + -+ if ((kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf)) == NULL) ++ if ((kd = kvm_openfiles(NULL, NULL, NULL, (int)KVM_NO_FILES, errbuf)) == NULL) + goto out; + + if ((files = kvm_getfiles(kd, KERN_FILE_BYPID, cpid, diff --git a/www/chromium/files/patch-base_debug_debugger__posix.cc b/www/chromium/files/patch-base_debug_debugger__posix.cc index 447811370c92..58341a527cf1 100644 --- a/www/chromium/files/patch-base_debug_debugger__posix.cc +++ b/www/chromium/files/patch-base_debug_debugger__posix.cc @@ -1,6 +1,6 @@ ---- base/debug/debugger_posix.cc.orig 2022-04-21 18:48:31 UTC +--- base/debug/debugger_posix.cc.orig 2024-04-19 13:02:56 UTC +++ base/debug/debugger_posix.cc -@@ -35,6 +35,10 @@ +@@ -36,6 +36,10 @@ #include <sys/sysctl.h> #endif @@ -27,7 +27,8 @@ if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0) return -1; - mib[5] = (info_size / sizeof(struct kinfo_proc)); +- mib[5] = (info_size / sizeof(struct kinfo_proc)); ++ mib[5] = static_cast<int>((info_size / sizeof(struct kinfo_proc))); + if ((info = reinterpret_cast<kinfo_proc*>(malloc(info_size))) == NULL) { + is_set = true; + being_debugged = false; diff --git a/www/chromium/files/patch-base_debug_elf__reader.cc b/www/chromium/files/patch-base_debug_elf__reader.cc index 32660158bfd6..b585334b9528 100644 --- a/www/chromium/files/patch-base_debug_elf__reader.cc +++ b/www/chromium/files/patch-base_debug_elf__reader.cc @@ -1,18 +1,13 @@ ---- base/debug/elf_reader.cc.orig 2023-09-13 12:11:42 UTC +--- base/debug/elf_reader.cc.orig 2024-04-19 13:02:56 UTC +++ base/debug/elf_reader.cc -@@ -78,6 +78,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, - bool found = false; - while (current_section < section_end) { - current_note = reinterpret_cast<const Nhdr*>(current_section); -+#if !BUILDFLAG(IS_BSD) - if (current_note->n_type == NT_GNU_BUILD_ID) { - StringPiece note_name(current_section + sizeof(Nhdr), - current_note->n_namesz); -@@ -87,6 +88,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, - break; - } - } -+#endif +@@ -45,6 +45,10 @@ using Xword = Elf64_Xword; + + constexpr char kGnuNoteName[] = "GNU"; - size_t section_size = bits::AlignUp(current_note->n_namesz, 4u) + - bits::AlignUp(current_note->n_descsz, 4u) + ++#ifndef NT_GNU_BUILD_ID ++#define NT_GNU_BUILD_ID 3 ++#endif ++ + // Returns a pointer to the header of the ELF binary mapped into memory, or a + // null pointer if the header is invalid. Here and below |elf_mapped_base| is a + // pointer to the start of the ELF image. diff --git a/www/chromium/files/patch-base_debug_stack__trace.cc b/www/chromium/files/patch-base_debug_stack__trace.cc index 7d4f7d7b5772..729c3ad3e29a 100644 --- a/www/chromium/files/patch-base_debug_stack__trace.cc +++ b/www/chromium/files/patch-base_debug_stack__trace.cc @@ -1,21 +1,29 @@ ---- base/debug/stack_trace.cc.orig 2023-12-10 06:10:27 UTC +--- base/debug/stack_trace.cc.orig 2024-04-19 13:02:56 UTC +++ base/debug/stack_trace.cc -@@ -266,7 +266,9 @@ void StackTrace::Print() const { - } - - void StackTrace::OutputToStream(std::ostream* os) const { -+#if !BUILDFLAG(IS_BSD) - OutputToStreamWithPrefix(os, nullptr); -+#endif - } - - std::string StackTrace::ToString() const { -@@ -274,7 +276,7 @@ std::string StackTrace::ToString() const { +@@ -247,7 +247,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() { + // Symbols are not expected to be reliable when gn args specifies + // symbol_level=0. + return false; +-#elif defined(__UCLIBC__) || defined(_AIX) ++#elif defined(__UCLIBC__) || defined(_AIX) || BUILDFLAG(IS_BSD) + // StackTrace::OutputToStream() is not implemented under uclibc, nor AIX. + // See https://crbug.com/706728 + return false; +@@ -291,7 +291,7 @@ std::string StackTrace::ToString() const { } std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { std::stringstream stream; -#if !defined(__UCLIBC__) && !defined(_AIX) +#if !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD) - OutputToStreamWithPrefix(&stream, prefix_string); - #endif - return stream.str(); + if (ShouldSuppressOutput()) { + return "Backtrace suppressed."; + } +@@ -301,7 +301,7 @@ std::string StackTrace::ToStringWithPrefix(const char* + } + + std::ostream& operator<<(std::ostream& os, const StackTrace& s) { +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD) + s.OutputToStream(&os); + #else + os << "StackTrace::OutputToStream not implemented."; diff --git a/www/chromium/files/patch-base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_debug_stack__trace__posix.cc index 976166eac365..7707da34bdff 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_posix.cc.orig 2023-11-03 10:09:45 UTC +--- base/debug/stack_trace_posix.cc.orig 2024-04-19 13:02:56 UTC +++ base/debug/stack_trace_posix.cc @@ -41,7 +41,7 @@ // execinfo.h and backtrace(3) are really only present in glibc and in macOS @@ -21,7 +21,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -302,7 +304,7 @@ void PrintToStderr(const char* output) { +@@ -301,7 +303,7 @@ void PrintToStderr(const char* output) { std::ignore = HANDLE_EINTR(write(STDERR_FILENO, output, strlen(output))); } @@ -30,7 +30,7 @@ void AlarmSignalHandler(int signal, siginfo_t* info, void* void_context) { // We have seen rare cases on AMD linux where the default signal handler // either does not run or a thread (Probably an AMD driver thread) prevents -@@ -319,7 +321,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v +@@ -318,7 +320,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v "Warning: Default signal handler failed to terminate process.\n"); PrintToStderr("Calling exit_group() directly to prevent timeout.\n"); // See: https://man7.org/linux/man-pages/man2/exit_group.2.html @@ -42,7 +42,7 @@ } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || // BUILDFLAG(IS_CHROMEOS) -@@ -536,7 +542,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -535,7 +541,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf _exit(EXIT_FAILURE); } @@ -51,7 +51,7 @@ // Set an alarm to trigger in case the default handler does not terminate // the process. See 'AlarmSignalHandler' for more details. struct sigaction action; -@@ -561,6 +567,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -560,6 +566,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf // signals that do not re-raise autonomously), such as signals delivered via // kill() and asynchronous hardware faults such as SEGV_MTEAERR, which would // otherwise be lost when re-raising the signal via raise(). @@ -59,7 +59,7 @@ long retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid), info->si_signo, info); if (retval == 0) { -@@ -575,6 +582,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -574,6 +581,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf if (errno != EPERM) { _exit(EXIT_FAILURE); } @@ -67,7 +67,7 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || // BUILDFLAG(IS_CHROMEOS) -@@ -764,6 +772,7 @@ class SandboxSymbolizeHelper { +@@ -763,6 +771,7 @@ class SandboxSymbolizeHelper { return -1; } @@ -75,7 +75,7 @@ // This class is copied from // third_party/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.h. // It aims at ensuring the process is dumpable before opening /proc/self/mem. -@@ -856,11 +865,15 @@ class SandboxSymbolizeHelper { +@@ -855,11 +864,15 @@ class SandboxSymbolizeHelper { r.base = cur_base; } } @@ -91,7 +91,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -878,6 +891,7 @@ class SandboxSymbolizeHelper { +@@ -877,6 +890,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; diff --git a/www/chromium/files/patch-base_files_file__util__posix.cc b/www/chromium/files/patch-base_files_file__util__posix.cc index 5533dcade6de..e0a0c9cadd49 100644 --- a/www/chromium/files/patch-base_files_file__util__posix.cc +++ b/www/chromium/files/patch-base_files_file__util__posix.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_posix.cc.orig 2024-02-23 21:04:38 UTC +--- base/files/file_util_posix.cc.orig 2024-04-19 13:02:56 UTC +++ base/files/file_util_posix.cc -@@ -779,33 +779,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p +@@ -816,33 +816,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p File::Error* error) { ScopedBlockingCall scoped_blocking_call( FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir(). diff --git a/www/chromium/files/patch-base_files_file__util__unittest.cc b/www/chromium/files/patch-base_files_file__util__unittest.cc index 27e3b7cdceeb..8fbc0fce70ab 100644 --- a/www/chromium/files/patch-base_files_file__util__unittest.cc +++ b/www/chromium/files/patch-base_files_file__util__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_unittest.cc.orig 2024-02-23 21:04:38 UTC +--- base/files/file_util_unittest.cc.orig 2024-04-19 13:02:56 UTC +++ base/files/file_util_unittest.cc -@@ -3869,7 +3869,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3870,7 +3870,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { } #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { FilePath file_path("/proc/cpuinfo"); std::string data = "temp"; -@@ -4592,7 +4592,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles +@@ -4651,7 +4651,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles NULL); #else size_t bytes_written = diff --git a/www/chromium/files/patch-base_memory_platform__shared__memory__region.h b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h index d70b1c797713..98090190472b 100644 --- a/www/chromium/files/patch-base_memory_platform__shared__memory__region.h +++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h @@ -1,15 +1,15 @@ ---- base/memory/platform_shared_memory_region.h.orig 2023-07-16 15:47:57 UTC +--- base/memory/platform_shared_memory_region.h.orig 2024-04-19 13:02:56 UTC +++ base/memory/platform_shared_memory_region.h -@@ -16,7 +16,7 @@ - - #include <stdint.h> +@@ -17,7 +17,7 @@ + #include "base/unguessable_token.h" + #include "build/build_config.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) namespace content { class SandboxIPCHandler; } -@@ -83,7 +83,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -84,7 +84,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE }; @@ -18,7 +18,7 @@ // Structure to limit access to executable region creation. struct ExecutableRegion { private: -@@ -215,7 +215,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -216,7 +216,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { CheckPlatformHandlePermissionsCorrespondToMode); static PlatformSharedMemoryRegion Create(Mode mode, size_t size diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket.cc b/www/chromium/files/patch-base_posix_unix__domain__socket.cc index 1ae00278ecd3..3f38e80838c5 100644 --- a/www/chromium/files/patch-base_posix_unix__domain__socket.cc +++ b/www/chromium/files/patch-base_posix_unix__domain__socket.cc @@ -1,4 +1,4 @@ ---- base/posix/unix_domain_socket.cc.orig 2022-08-31 12:19:35 UTC +--- base/posix/unix_domain_socket.cc.orig 2024-04-19 13:02:56 UTC +++ base/posix/unix_domain_socket.cc @@ -51,7 +51,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { @@ -9,6 +9,24 @@ const int enable = 1; return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0; #else +@@ -77,7 +77,7 @@ bool UnixDomainSocket::SendMsg(int fd, + + struct cmsghdr* cmsg; + msg.msg_control = control_buffer; +-#if BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) + msg.msg_controllen = checked_cast<socklen_t>(control_len); + #else + msg.msg_controllen = control_len; +@@ -85,7 +85,7 @@ bool UnixDomainSocket::SendMsg(int fd, + cmsg = CMSG_FIRSTHDR(&msg); + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = SCM_RIGHTS; +-#if BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) + cmsg->cmsg_len = checked_cast<u_int>(CMSG_LEN(sizeof(int) * fds.size())); + #else + cmsg->cmsg_len = CMSG_LEN(sizeof(int) * fds.size()); @@ -149,7 +149,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, const size_t kControlBufferSize = diff --git a/www/chromium/files/patch-base_process_internal__linux.h b/www/chromium/files/patch-base_process_internal__linux.h new file mode 100644 index 000000000000..e324410eccaa --- /dev/null +++ b/www/chromium/files/patch-base_process_internal__linux.h @@ -0,0 +1,20 @@ +--- base/process/internal_linux.h.orig 2024-04-19 13:02:56 UTC ++++ base/process/internal_linux.h +@@ -138,6 +138,9 @@ TimeDelta ClockTicksToTimeDelta(int64_t clock_ticks); + // arguments to the lambda. + template <typename Lambda> + void ForEachProcessTask(base::ProcessHandle process, Lambda&& lambda) { ++#if BUILDFLAG(IS_BSD) ++ return; ++#else + // Iterate through the different threads tracked in /proc/<pid>/task. + FilePath fd_path = GetProcPidDir(process).Append("task"); + +@@ -157,6 +160,7 @@ void ForEachProcessTask(base::ProcessHandle process, L + FilePath task_path = fd_path.Append(tid_str); + lambda(tid, task_path); + } ++#endif + } + + } // namespace internal diff --git a/www/chromium/files/patch-base_process_process__handle__freebsd.cc b/www/chromium/files/patch-base_process_process__handle__freebsd.cc index cca86a8ad3b0..57803265ff52 100644 --- a/www/chromium/files/patch-base_process_process__handle__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__handle__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_handle_freebsd.cc.orig 2023-11-03 10:09:45 UTC +--- base/process/process_handle_freebsd.cc.orig 2024-04-19 13:02:56 UTC +++ base/process/process_handle_freebsd.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. @@ -8,7 +8,7 @@ #include <limits.h> #include <stddef.h> -@@ -19,10 +20,13 @@ namespace base { +@@ -20,10 +21,13 @@ namespace base { ProcessId GetParentProcessId(ProcessHandle process) { struct kinfo_proc info; diff --git a/www/chromium/files/patch-base_process_process__handle__openbsd.cc b/www/chromium/files/patch-base_process_process__handle__openbsd.cc index 861e92bb331c..56d1d3d4223b 100644 --- a/www/chromium/files/patch-base_process_process__handle__openbsd.cc +++ b/www/chromium/files/patch-base_process_process__handle__openbsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_handle_openbsd.cc.orig 2024-03-22 08:19:40 UTC +--- base/process/process_handle_openbsd.cc.orig 2024-04-19 13:02:56 UTC +++ base/process/process_handle_openbsd.cc @@ -3,48 +3,112 @@ // found in the LICENSE file. @@ -62,7 +62,7 @@ - sizeof(struct kinfo_proc), 0 }; + char *tokens[2]; + struct stat sb; -+ FilePath *result = nullptr; ++ FilePath result; - if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) == -1) - return FilePath(); @@ -77,44 +77,44 @@ - return FilePath(); + if ((cpath = getenv("CHROME_EXE_PATH")) != NULL) -+ *result = FilePath(cpath); ++ result = FilePath(cpath); + else -+ *result = FilePath("/usr/local/chrome/chrome"); ++ result = FilePath("/usr/local/chrome/chrome"); + + if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) != -1) { + retvalargs = static_cast<char**>(malloc(len)); + if (!retvalargs) -+ return *result; ++ return result; + + if (sysctl(mib, std::size(mib), retvalargs, &len, NULL, 0) < 0) { + free(retvalargs); -+ return *result; ++ return result; + } + + if ((*tokens = strtok(retvalargs[0], ":")) == NULL) { + free(retvalargs); -+ return *result; ++ return result; + } + + free(retvalargs); + + if (tokens[0] == NULL) -+ return *result; ++ return result; + + if (realpath(tokens[0], retval) == NULL) -+ return *result; ++ return result; + + if (stat(retval, &sb) < 0) -+ return *result; ++ return result; + -+ if ((kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, ++ if ((kd = kvm_openfiles(NULL, NULL, NULL, (int)KVM_NO_FILES, + errbuf)) == NULL) -+ return *result; ++ return result; + + if ((files = kvm_getfiles(kd, KERN_FILE_BYPID, process, + sizeof(struct kinfo_file), &cnt)) == NULL) { + kvm_close(kd); -+ return *result; ++ return result; + } + + for (int i = 0; i < cnt; i++) { @@ -122,12 +122,12 @@ + files[i].va_fsid == static_cast<uint32_t>(sb.st_dev) && + files[i].va_fileid == sb.st_ino) { + kvm_close(kd); -+ *result = FilePath(retval); ++ result = FilePath(retval); + } + } + } + -+ return *result; ++ return result; } } // namespace base diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc index e5b95631f50d..97fd27ed293a 100644 --- a/www/chromium/files/patch-base_process_process__metrics.cc +++ b/www/chromium/files/patch-base_process_process__metrics.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics.cc.orig 2023-05-31 08:12:17 UTC +--- base/process/process_metrics.cc.orig 2024-04-19 13:02:56 UTC +++ base/process/process_metrics.cc @@ -17,7 +17,7 @@ namespace base { namespace { @@ -35,17 +35,12 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( TimeDelta cumulative_cpu) { TimeTicks time = TimeTicks::Now(); -@@ -126,7 +125,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( - double ProcessMetrics::GetPlatformIndependentCPUUsage() { - return GetPlatformIndependentCPUUsage(GetCumulativeCPUUsage()); +@@ -130,10 +129,9 @@ std::optional<double> ProcessMetrics::GetPlatformIndep + } + return GetPlatformIndependentCPUUsage(cpu_usage.value()); } -#endif - #if BUILDFLAG(IS_WIN) - double ProcessMetrics::GetPreciseCPUUsage(TimeDelta cumulative_cpu) { -@@ -157,7 +155,7 @@ double ProcessMetrics::GetPreciseCPUUsage() { - #endif // BUILDFLAG(IS_WIN) - #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_AIX) + BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index 360c25b6d3f3..3bc7936f205c 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,6 +1,6 @@ ---- base/process/process_metrics.h.orig 2024-03-22 08:19:40 UTC +--- base/process/process_metrics.h.orig 2024-04-19 13:02:56 UTC +++ base/process/process_metrics.h -@@ -37,7 +37,7 @@ +@@ -38,7 +38,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -9,16 +9,16 @@ #include <string> #include <utility> #include <vector> -@@ -50,7 +50,7 @@ namespace base { - // Full declaration is in process_metrics_iocounters.h. - struct IoCounters; +@@ -48,7 +48,7 @@ + + namespace base { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // -@@ -105,7 +105,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -103,7 +103,7 @@ class BASE_EXPORT ProcessMetrics { // convenience wrapper for CreateProcessMetrics(). static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics(); @@ -27,8 +27,8 @@ // Resident Set Size is a Linux/Android specific memory concept. Do not // attempt to extend this to other platforms. BASE_EXPORT size_t GetResidentSetSize() const; -@@ -163,7 +163,7 @@ class BASE_EXPORT ProcessMetrics { - #endif // BUILDFLAG(IS_WIN) +@@ -137,7 +137,7 @@ class BASE_EXPORT ProcessMetrics { + [[nodiscard]] std::optional<TimeDelta> GetCumulativeCPUUsage(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_AIX) @@ -36,7 +36,7 @@ // Emits the cumulative CPU usage for all currently active threads since they // were started into the output parameter (replacing its current contents). // Threads that have already terminated will not be reported. Thus, the sum of -@@ -219,7 +219,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -182,7 +182,7 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // BUILDFLAG(IS_POSIX) @@ -45,7 +45,7 @@ // Bytes of swap as reported by /proc/[pid]/status. uint64_t GetVmSwapBytes() const; -@@ -240,7 +240,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -203,7 +203,7 @@ class BASE_EXPORT ProcessMetrics { #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -54,7 +54,7 @@ int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if BUILDFLAG(IS_APPLE) -@@ -262,9 +262,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -225,12 +225,10 @@ class BASE_EXPORT ProcessMetrics { // Used to store the previous times and CPU usage counts so we can // compute the CPU usage between calls. TimeTicks last_cpu_time_; @@ -62,18 +62,13 @@ TimeDelta last_cumulative_cpu_; -#endif - #if BUILDFLAG(IS_WIN) - TimeTicks last_cpu_time_for_precise_cpu_usage_; -@@ -272,7 +270,7 @@ class BASE_EXPORT ProcessMetrics { - #endif - #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_AIX) + BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -313,7 +311,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -271,7 +269,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \ @@ -82,7 +77,7 @@ // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -348,7 +346,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -306,7 +304,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -91,7 +86,7 @@ // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -363,7 +361,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -321,7 +319,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -100,7 +95,7 @@ int buffers = 0; int cached = 0; int active_anon = 0; -@@ -400,7 +398,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK +@@ -358,7 +356,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -109,7 +104,7 @@ // Parse the data found in /proc/<pid>/stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. -@@ -594,7 +592,7 @@ class BASE_EXPORT SystemMetrics { +@@ -552,7 +550,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; diff --git a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc index 4b67feb8885a..b1034b768cb5 100644 --- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics_freebsd.cc.orig 2023-03-09 06:31:50 UTC +--- base/process/process_metrics_freebsd.cc.orig 2024-04-20 08:27:55 UTC +++ base/process/process_metrics_freebsd.cc -@@ -3,20 +3,39 @@ +@@ -3,42 +3,57 @@ // found in the LICENSE file. #include "base/process/process_metrics.h" @@ -17,7 +17,6 @@ +#include <libutil.h> + #include "base/memory/ptr_util.h" - #include "base/process/process_metrics_iocounters.h" +#include "base/values.h" namespace base { @@ -26,28 +25,28 @@ + int pagesize = getpagesize(); + int pageshift = 0; +-ProcessMetrics::ProcessMetrics(ProcessHandle process) +- : process_(process), +- last_cpu_(0) {} + while (pagesize > 1) { + pageshift++; + pagesize >>= 1; + } -+ + + return pageshift; +} +} + - ProcessMetrics::ProcessMetrics(ProcessHandle process) -- : process_(process), -- last_cpu_(0) {} -+ : process_(process) {} - ++ProcessMetrics::ProcessMetrics(ProcessHandle process) : process_(process) {} ++ // static std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( -@@ -24,22 +43,19 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create + ProcessHandle process) { return WrapUnique(new ProcessMetrics(process)); } --double ProcessMetrics::GetPlatformIndependentCPUUsage() { -+TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { +-std::optional<double> ProcessMetrics::GetPlatformIndependentCPUUsage() { ++std::optional<TimeDelta> ProcessMetrics::GetCumulativeCPUUsage() { struct kinfo_proc info; - int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_}; - size_t length = sizeof(info); @@ -57,22 +56,22 @@ + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ }; + if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) -- return 0; -+ return TimeDelta(); +- return std::nullopt; ++ return std::optional(TimeDelta()); -- return (info.ki_pctcpu / FSCALE) * 100.0; -+ return Microseconds(info.ki_runtime); +- return std::optional(double{info.ki_pctcpu} / FSCALE * 100.0); ++ return std::optional(Microseconds(info.ki_runtime)); } --TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { +-std::optional<TimeDelta> ProcessMetrics::GetCumulativeCPUUsage() { - NOTREACHED(); -- return TimeDelta(); +- return std::nullopt; -} - - bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const { - return false; - } -@@ -65,6 +81,230 @@ size_t GetSystemCommitCharge() { + size_t GetSystemCommitCharge() { + int mib[2], pagesize; + unsigned long mem_total, mem_free, mem_inactive; +@@ -60,6 +75,230 @@ size_t GetSystemCommitCharge() { pagesize = getpagesize(); return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); @@ -171,7 +170,7 @@ + kvm_close(kd); + return 0; + } -+ ++ + size_t rss; + + if (nproc > 0) { @@ -197,7 +196,7 @@ + kvm_close(kd); + return 0; + } -+ ++ + size_t swrss; + + if (nproc > 0) { @@ -247,7 +246,7 @@ + +Value::Dict SystemDiskInfo::ToDict() const { + Value::Dict res; -+ ++ + // Write out uint64_t variables as doubles. + // Note: this may discard some precision, but for JS there's no other option. + res.Set("reads", static_cast<double>(reads)); @@ -263,7 +262,7 @@ + res.Set("weighted_io_time", static_cast<double>(weighted_io_time)); + + NOTIMPLEMENTED(); -+ ++ + return res; +} + diff --git a/www/chromium/files/patch-base_process_process__metrics__openbsd.cc b/www/chromium/files/patch-base_process_process__metrics__openbsd.cc index 65f3911684b0..00db4dd3406c 100644 --- a/www/chromium/files/patch-base_process_process__metrics__openbsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__openbsd.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics_openbsd.cc.orig 2024-02-23 21:04:38 UTC +--- base/process/process_metrics_openbsd.cc.orig 2024-04-19 13:02:56 UTC +++ base/process/process_metrics_openbsd.cc -@@ -6,14 +6,23 @@ +@@ -6,73 +6,49 @@ #include <stddef.h> #include <stdint.h> @@ -8,28 +8,21 @@ #include <sys/param.h> #include <sys/sysctl.h> +#include <sys/vmmeter.h> + #include <optional> +#include <kvm.h> + #include "base/memory/ptr_util.h" - #include "base/process/process_metrics_iocounters.h" +#include "base/values.h" +#include "base/notreached.h" namespace base { -+ProcessMetrics::ProcessMetrics(ProcessHandle process) -+ : process_(process) {} -+ - // static - std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( - ProcessHandle process) { -@@ -24,52 +33,26 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun - return false; - } +-namespace { ++ProcessMetrics::ProcessMetrics(ProcessHandle process) : process_(process) {} --static int GetProcessCPU(pid_t pid) { -+TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { +-static std::optional<int> GetProcessCPU(pid_t pid) { ++std::optional<TimeDelta> ProcessMetrics::GetCumulativeCPUUsage() { struct kinfo_proc info; - size_t length; - int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid, @@ -37,43 +30,55 @@ + size_t length = sizeof(struct kinfo_proc); + struct timeval tv; -- if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) -- return -1; +- if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) { +- return std::nullopt; +- } + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_, + sizeof(struct kinfo_proc), 1 }; - mib[5] = (length / sizeof(struct kinfo_proc)); - - if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) -- return 0; -+ return TimeDelta(); + if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) { +- return std::nullopt; ++ return std::optional(TimeDelta()); + } -- return info.p_pctcpu; --} +- return std::optional(info.p_pctcpu); + tv.tv_sec = info.p_rtime_sec; + tv.tv_usec = info.p_rtime_usec; ++ ++ return std::optional(Microseconds(TimeValToMicroseconds(tv))); + } --double ProcessMetrics::GetPlatformIndependentCPUUsage() { +-} // namespace +- + // static + std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( + ProcessHandle process) { + return WrapUnique(new ProcessMetrics(process)); + } + +-std::optional<double> ProcessMetrics::GetPlatformIndependentCPUUsage() { - TimeTicks time = TimeTicks::Now(); - - if (last_cpu_time_.is_zero()) { - // First call, just set the last values. - last_cpu_time_ = time; -- return 0; +- return std::optional(0.0); - } - -- int cpu = GetProcessCPU(process_); +- const std::optional<int> cpu = GetProcessCPU(process_); +- if (!cpu.has_value()) { +- return std::nullopt; +- } - - last_cpu_time_ = time; -- double percentage = static_cast<double>((cpu * 100.0) / FSCALE); +- return std::optional(double{cpu.value()} / FSCALE * 100.0); +-} - -- return percentage; -+ return Microseconds(TimeValToMicroseconds(tv)); - } - --TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { +-std::optional<TimeDelta> ProcessMetrics::GetCumulativeCPUUsage() { - NOTREACHED(); -- return TimeDelta(); +- return std::nullopt; -} - -ProcessMetrics::ProcessMetrics(ProcessHandle process) @@ -87,7 +92,7 @@ struct vmtotal vmtotal; unsigned long mem_total, mem_free, mem_inactive; size_t len = sizeof(vmtotal); -@@ -81,9 +64,136 @@ size_t GetSystemCommitCharge() { +@@ -84,9 +60,136 @@ size_t GetSystemCommitCharge() { mem_free = vmtotal.t_free; mem_inactive = vmtotal.t_vm - vmtotal.t_avm; diff --git a/www/chromium/files/patch-base_process_process__metrics__unittest.cc b/www/chromium/files/patch-base_process_process__metrics__unittest.cc index 5bf9d592d77a..ec3a90134860 100644 --- a/www/chromium/files/patch-base_process_process__metrics__unittest.cc +++ b/www/chromium/files/patch-base_process_process__metrics__unittest.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics_unittest.cc.orig 2024-02-23 21:04:38 UTC +--- base/process/process_metrics_unittest.cc.orig 2024-04-19 13:02:56 UTC +++ base/process/process_metrics_unittest.cc -@@ -54,7 +54,8 @@ +@@ -56,7 +56,8 @@ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \ diff --git a/www/chromium/files/patch-base_profiler_module__cache.cc b/www/chromium/files/patch-base_profiler_module__cache.cc index 303168351150..7ed567da0ced 100644 --- a/www/chromium/files/patch-base_profiler_module__cache.cc +++ b/www/chromium/files/patch-base_profiler_module__cache.cc @@ -1,6 +1,6 @@ ---- base/profiler/module_cache.cc.orig 2023-12-10 06:10:27 UTC +--- base/profiler/module_cache.cc.orig 2024-04-19 13:02:56 UTC +++ base/profiler/module_cache.cc -@@ -37,7 +37,7 @@ std::string TransformModuleIDToSymbolServerFormat(Stri +@@ -38,7 +38,7 @@ std::string TransformModuleIDToSymbolServerFormat(std: // Android and Linux Chrome builds use the "breakpad" format to index their // build id, so we transform the build id for these platforms. All other // platforms keep their symbols indexed by the original build ID. diff --git a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc index 0a27923bb7ab..c7f79e3181fd 100644 --- a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc +++ b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc @@ -1,4 +1,4 @@ ---- base/profiler/sampling_profiler_thread_token.cc.orig 2023-02-08 09:03:45 UTC +--- base/profiler/sampling_profiler_thread_token.cc.orig 2024-04-19 13:02:56 UTC +++ base/profiler/sampling_profiler_thread_token.cc @@ -6,7 +6,7 @@ @@ -15,6 +15,6 @@ return {id, pthread_self()}; -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - absl::optional<uintptr_t> maybe_stack_base = + std::optional<uintptr_t> maybe_stack_base = GetThreadStackBaseAddress(id, pthread_self()); return {id, maybe_stack_base}; diff --git a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h index d86e2ea6d955..9b96bc31d25b 100644 --- a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h +++ b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h @@ -1,6 +1,6 @@ ---- base/profiler/sampling_profiler_thread_token.h.orig 2023-02-08 09:03:45 UTC +--- base/profiler/sampling_profiler_thread_token.h.orig 2024-04-19 13:02:56 UTC +++ base/profiler/sampling_profiler_thread_token.h -@@ -12,7 +12,7 @@ +@@ -13,7 +13,7 @@ #if BUILDFLAG(IS_ANDROID) #include <pthread.h> @@ -9,7 +9,7 @@ #include <stdint.h> #endif -@@ -26,7 +26,7 @@ struct SamplingProfilerThreadToken { +@@ -27,7 +27,7 @@ struct SamplingProfilerThreadToken { PlatformThreadId id; #if BUILDFLAG(IS_ANDROID) pthread_t pthread_id; diff --git a/www/chromium/files/patch-base_profiler_stack__base__address__posix.cc b/www/chromium/files/patch-base_profiler_stack__base__address__posix.cc index 68f89d572ae9..0804cf56fe6f 100644 --- a/www/chromium/files/patch-base_profiler_stack__base__address__posix.cc +++ b/www/chromium/files/patch-base_profiler_stack__base__address__posix.cc @@ -1,4 +1,4 @@ ---- base/profiler/stack_base_address_posix.cc.orig 2023-02-08 16:09:26 UTC +--- base/profiler/stack_base_address_posix.cc.orig 2024-04-19 13:02:56 UTC +++ base/profiler/stack_base_address_posix.cc @@ -17,6 +17,10 @@ #include "base/files/scoped_file.h" @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_CHROMEOS) extern "C" void* __libc_stack_end; #endif -@@ -45,7 +49,21 @@ absl::optional<uintptr_t> GetAndroidMainThreadStackBas +@@ -45,7 +49,21 @@ std::optional<uintptr_t> GetAndroidMainThreadStackBase #if !BUILDFLAG(IS_LINUX) uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthread_id) { @@ -48,3 +48,12 @@ const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size; return base_address; } +@@ -80,7 +100,7 @@ std::optional<uintptr_t> GetThreadStackBaseAddress(Pla + // trying to work around the problem. + return std::nullopt; + #else +- const bool is_main_thread = id == GetCurrentProcId(); ++ const bool is_main_thread = id == checked_cast<PlatformThreadId>(GetCurrentProcId()); + if (is_main_thread) { + #if BUILDFLAG(IS_ANDROID) + // The implementation of pthread_getattr_np() in Bionic reads proc/self/maps diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc index 8cf79cd5197c..9779c7b34427 100644 --- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc +++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_test_util.cc.orig 2023-04-28 17:01:32 UTC +--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2024-04-19 13:02:56 UTC +++ base/profiler/stack_sampling_profiler_test_util.cc -@@ -36,7 +36,7 @@ +@@ -37,7 +37,7 @@ // Fortunately, it provides _alloca, which functions identically. #include <malloc.h> #define alloca _alloca diff --git a/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc b/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc index 568e6236f393..3bbeceda7a02 100644 --- a/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc +++ b/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc @@ -1,18 +1,18 @@ ---- base/profiler/thread_delegate_posix.cc.orig 2022-10-24 13:33:33 UTC +--- base/profiler/thread_delegate_posix.cc.orig 2024-04-19 13:02:56 UTC +++ base/profiler/thread_delegate_posix.cc -@@ -13,7 +13,7 @@ +@@ -14,7 +14,7 @@ + #include "base/process/process_handle.h" #include "build/build_config.h" - #include "third_party/abseil-cpp/absl/types/optional.h" -#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) +#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) #include "base/profiler/stack_base_address_posix.h" #endif -@@ -22,7 +22,7 @@ namespace base { +@@ -23,7 +23,7 @@ namespace base { std::unique_ptr<ThreadDelegatePosix> ThreadDelegatePosix::Create( SamplingProfilerThreadToken thread_token) { - absl::optional<uintptr_t> base_address; + std::optional<uintptr_t> base_address; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base_address = thread_token.stack_base_address; diff --git a/www/chromium/files/patch-base_synchronization_lock__impl.h b/www/chromium/files/patch-base_synchronization_lock__impl.h index 8de885d72f5a..6559c634202b 100644 --- a/www/chromium/files/patch-base_synchronization_lock__impl.h +++ b/www/chromium/files/patch-base_synchronization_lock__impl.h @@ -1,6 +1,6 @@ ---- base/synchronization/lock_impl.h.orig 2024-03-22 08:19:40 UTC +--- base/synchronization/lock_impl.h.orig 2024-04-19 13:02:56 UTC +++ base/synchronization/lock_impl.h -@@ -105,6 +105,10 @@ void LockImpl::Unlock() { +@@ -107,6 +107,10 @@ void LockImpl::Unlock() { } #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) @@ -11,7 +11,7 @@ #if DCHECK_IS_ON() BASE_EXPORT void dcheck_trylock_result(int rv); -@@ -125,6 +129,9 @@ void LockImpl::Unlock() { +@@ -127,6 +131,9 @@ void LockImpl::Unlock() { dcheck_unlock_result(rv); #endif } diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h index 92db8f41f998..b7ab4e2fdd19 100644 --- a/www/chromium/files/patch-base_system_sys__info.h +++ b/www/chromium/files/patch-base_system_sys__info.h @@ -1,6 +1,6 @@ ---- base/system/sys_info.h.orig 2024-01-30 07:53:34 UTC +--- base/system/sys_info.h.orig 2024-04-19 13:02:56 UTC +++ base/system/sys_info.h -@@ -318,6 +318,8 @@ class BASE_EXPORT SysInfo { +@@ -322,6 +322,8 @@ class BASE_EXPORT SysInfo { static void ResetCpuSecurityMitigationsEnabledForTesting(); #endif @@ -9,7 +9,7 @@ private: friend class test::ScopedAmountOfPhysicalMemoryOverride; FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); -@@ -330,7 +332,7 @@ class BASE_EXPORT SysInfo { +@@ -334,7 +336,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/chromium/files/patch-base_system_sys__info__unittest.cc b/www/chromium/files/patch-base_system_sys__info__unittest.cc index df6c32372718..694323db9a18 100644 --- a/www/chromium/files/patch-base_system_sys__info__unittest.cc +++ b/www/chromium/files/patch-base_system_sys__info__unittest.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_unittest.cc.orig 2023-08-17 07:33:31 UTC +--- base/system/sys_info_unittest.cc.orig 2024-04-19 13:02:56 UTC +++ base/system/sys_info_unittest.cc -@@ -263,12 +263,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) { +@@ -264,12 +264,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) { EXPECT_TRUE(IsStringUTF8(hardware_info->model)); bool empty_result_expected = #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || \ diff --git a/www/chromium/files/patch-base_threading_platform__thread.h b/www/chromium/files/patch-base_threading_platform__thread.h new file mode 100644 index 000000000000..27a45b8c27e2 --- /dev/null +++ b/www/chromium/files/patch-base_threading_platform__thread.h @@ -0,0 +1,11 @@ +--- base/threading/platform_thread.h.orig 2024-04-19 13:02:56 UTC ++++ base/threading/platform_thread.h +@@ -46,6 +46,8 @@ typedef DWORD PlatformThreadId; + typedef zx_koid_t PlatformThreadId; + #elif BUILDFLAG(IS_APPLE) + typedef mach_port_t PlatformThreadId; ++#elif BUILDFLAG(IS_BSD) ++typedef uint64_t PlatformThreadId; + #elif BUILDFLAG(IS_POSIX) + typedef pid_t PlatformThreadId; + #endif diff --git a/www/chromium/files/patch-base_threading_platform__thread__bsd.cc b/www/chromium/files/patch-base_threading_platform__thread__bsd.cc index d91b9fc65192..6fc76981ad02 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__bsd.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__bsd.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_bsd.cc.orig 2023-09-13 12:11:42 UTC +--- base/threading/platform_thread_bsd.cc.orig 2024-04-19 13:02:56 UTC +++ base/threading/platform_thread_bsd.cc @@ -0,0 +1,31 @@ +// Copyright 2023 The Chromium Authors @@ -20,9 +20,9 @@ + return false; +} + -+absl::optional<ThreadPriorityForTest> ++std::optional<ThreadPriorityForTest> +GetCurrentThreadPriorityForPlatformForTest() { -+ return absl::nullopt; ++ return std::nullopt; +} +} // namespace internal + diff --git a/www/chromium/files/patch-base_threading_platform__thread__posix.cc b/www/chromium/files/patch-base_threading_platform__thread__posix.cc index ce6c86ef8ed8..eaa3272483dc 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__posix.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__posix.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_posix.cc.orig 2024-02-23 21:04:38 UTC +--- base/threading/platform_thread_posix.cc.orig 2024-04-19 13:02:56 UTC +++ base/threading/platform_thread_posix.cc @@ -78,12 +78,12 @@ void* ThreadFunc(void* params) { if (!thread_params->joinable) @@ -15,7 +15,16 @@ #if BUILDFLAG(IS_APPLE) PlatformThread::SetCurrentThreadRealtimePeriodValue( delegate->GetRealtimePeriod()); -@@ -357,7 +357,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t +@@ -267,6 +267,8 @@ PlatformThreadId PlatformThreadBase::CurrentId() { + return reinterpret_cast<int32_t>(pthread_self()); + #elif BUILDFLAG(IS_POSIX) && BUILDFLAG(IS_AIX) + return pthread_self(); ++#elif BUILDFLAG(IS_BSD) ++ return reinterpret_cast<uint64_t>(pthread_self()); + #elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_AIX) + return reinterpret_cast<int64_t>(pthread_self()); + #endif +@@ -357,7 +359,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t // static bool PlatformThreadBase::CanChangeThreadType(ThreadType from, ThreadType to) { @@ -24,7 +33,7 @@ return false; #else if (from >= to) { -@@ -378,6 +378,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, +@@ -378,6 +380,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, MessagePumpType pump_type_hint) { #if BUILDFLAG(IS_NACL) NOTIMPLEMENTED(); @@ -34,7 +43,7 @@ #else if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint)) return; -@@ -400,7 +403,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, +@@ -400,7 +405,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, // static ThreadPriorityForTest PlatformThreadBase::GetCurrentThreadPriorityForTest() { diff --git a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc index c39bc5d4ee93..f5a71b0579e1 100644 --- a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc +++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,6 +1,6 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2024-02-23 21:04:38 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2024-04-19 13:02:56 UTC +++ base/trace_event/malloc_dump_provider.cc -@@ -25,6 +25,8 @@ +@@ -24,6 +24,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -182,7 +184,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, +@@ -181,7 +183,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, #if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \ (!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \ @@ -18,7 +18,7 @@ void ReportMallinfoStats(ProcessMemoryDump* pmd, size_t* total_virtual_size, size_t* resident_size, -@@ -353,6 +355,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -366,6 +368,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump &allocated_objects_count); #elif BUILDFLAG(IS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. diff --git a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc index d216c91dd0cc..c27d7848a4e2 100644 --- a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc +++ b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc @@ -1,6 +1,6 @@ ---- base/trace_event/process_memory_dump.cc.orig 2024-03-22 08:19:40 UTC +--- base/trace_event/process_memory_dump.cc.orig 2024-04-19 13:02:56 UTC +++ base/trace_event/process_memory_dump.cc -@@ -113,7 +113,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden +@@ -113,7 +113,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident #if BUILDFLAG(IS_WIN) std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec( new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); @@ -9,7 +9,7 @@ std::unique_ptr<char[]> vec(new char[max_vec_size]); #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) std::unique_ptr<unsigned char[]> vec(new unsigned char[max_vec_size]); -@@ -135,7 +135,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden +@@ -135,7 +135,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident for (size_t i = 0; i < page_count; i++) resident_page_count += vec[i].VirtualAttributes.Valid; diff --git a/www/chromium/files/patch-build_config_clang_BUILD.gn b/www/chromium/files/patch-build_config_clang_BUILD.gn index 731f89b15035..eb48e938557e 100644 --- a/www/chromium/files/patch-build_config_clang_BUILD.gn +++ b/www/chromium/files/patch-build_config_clang_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/clang/BUILD.gn.orig 2024-03-22 08:19:40 UTC +--- build/config/clang/BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ build/config/clang/BUILD.gn -@@ -194,7 +194,7 @@ template("clang_lib") { +@@ -203,7 +203,7 @@ template("clang_lib") { # Adds a dependency on the Clang runtime library clang_rt.builtins. clang_lib("compiler_builtins") { diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index cd71b2674d2e..8b70ade32cb0 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/compiler/BUILD.gn.orig 2024-03-22 08:19:40 UTC +--- build/config/compiler/BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ build/config/compiler/BUILD.gn @@ -204,7 +204,7 @@ declare_args() { # This greatly reduces the size of debug builds, at the cost of @@ -47,7 +47,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -1174,7 +1181,7 @@ config("compiler_cpu_abi") { +@@ -1180,7 +1187,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -56,7 +56,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -1189,7 +1196,7 @@ config("compiler_cpu_abi") { +@@ -1195,7 +1202,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -65,7 +65,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1524,7 +1531,7 @@ config("compiler_deterministic") { +@@ -1530,7 +1537,7 @@ config("compiler_deterministic") { # different build directory like "out/feature_a" and "out/feature_b" if # we build same files with same compile flag. # Other paths are already given in relative, no need to normalize them. @@ -74,7 +74,7 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1576,7 +1583,7 @@ config("compiler_deterministic") { +@@ -1582,7 +1589,7 @@ config("compiler_deterministic") { } config("clang_revision") { @@ -83,7 +83,7 @@ update_args = [ "--print-revision", "--verify-version=$clang_version", -@@ -1877,12 +1884,9 @@ config("default_warnings") { +@@ -1890,9 +1897,6 @@ config("default_warnings") { # TODO(crbug.com/1494809): Evaluate and possibly enable. "-Wno-vla-extension", @@ -92,12 +92,17 @@ - "-Wno-thread-safety-reference-return", ] + cflags_cc += [ +@@ -1900,7 +1904,7 @@ config("default_warnings") { + "-Wenum-compare-conditional", + ] + - if (!is_nacl) { + if (!is_nacl && !is_bsd) { cflags_cc += [ # TODO(https://crbug.com/1513724): Fix and re-enable. "-Wno-c++11-narrowing-const-reference", -@@ -2100,7 +2104,7 @@ config("no_chromium_code") { +@@ -2089,7 +2093,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] @@ -106,7 +111,7 @@ cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -2619,7 +2623,7 @@ config("afdo_optimize_size") { +@@ -2597,7 +2601,7 @@ config("afdo_optimize_size") { # There are some targeted places that AFDO regresses, so we provide a separate # config to allow AFDO to be disabled per-target. config("afdo") { @@ -115,7 +120,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2646,7 +2650,7 @@ config("afdo") { +@@ -2624,7 +2628,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } @@ -124,7 +129,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2810,7 +2814,8 @@ config("symbols") { +@@ -2788,7 +2792,8 @@ config("symbols") { configs += [ "//build/config:compress_debug_sections" ] } diff --git a/www/chromium/files/patch-build_config_rust.gni b/www/chromium/files/patch-build_config_rust.gni index e768d0f5ec92..324901afb617 100644 --- a/www/chromium/files/patch-build_config_rust.gni +++ b/www/chromium/files/patch-build_config_rust.gni @@ -1,6 +1,6 @@ ---- build/config/rust.gni.orig 2024-03-22 08:19:40 UTC +--- build/config/rust.gni.orig 2024-04-19 13:02:56 UTC +++ build/config/rust.gni -@@ -280,6 +280,10 @@ if (is_linux || is_chromeos) { +@@ -277,6 +277,10 @@ if (is_linux || is_chromeos) { } } diff --git a/www/chromium/files/patch-build_linux_unbundle_libwebp.gn b/www/chromium/files/patch-build_linux_unbundle_libwebp.gn new file mode 100644 index 000000000000..e1ff6cffbd63 --- /dev/null +++ b/www/chromium/files/patch-build_linux_unbundle_libwebp.gn @@ -0,0 +1,27 @@ +--- build/linux/unbundle/libwebp.gn.orig 2024-04-20 08:27:55 UTC ++++ build/linux/unbundle/libwebp.gn +@@ -22,6 +22,8 @@ shim_headers("libwebp_shim") { + "webp/mux.h", + "webp/mux_types.h", + "webp/types.h", ++ "webp/sharpyuv/sharpyuv.h", ++ "webp/sharpyuv/sharpyuv_csp.h", + ] + } + +@@ -30,6 +32,14 @@ source_set("libwebp_webp") { + public_configs = [ ":system_libwebp" ] + } + ++source_set("libwebp_sharpyuv") { ++ deps = [ ":libwebp_shim" ] ++ public_configs = [ ":system_libwebp" ] ++} ++ + group("libwebp") { +- deps = [ ":libwebp_webp" ] ++ deps = [ ++ ":libwebp_webp", ++ ":libwebp_sharpyuv", ++ ] + } diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index da4ebe4e15cf..2fede71e2bcf 100644 --- a/www/chromium/files/patch-cc_BUILD.gn +++ b/www/chromium/files/patch-cc_BUILD.gn @@ -1,6 +1,6 @@ ---- cc/BUILD.gn.orig 2024-03-22 08:19:40 UTC +--- cc/BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ cc/BUILD.gn -@@ -678,7 +678,7 @@ cc_test_static_library("test_support") { +@@ -681,7 +681,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } if (skia_use_dawn) { -@@ -937,7 +937,6 @@ cc_test("cc_unittests") { +@@ -940,7 +940,6 @@ cc_test("cc_unittests") { data = [ "//components/test/data/viz/" ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc index 727361306922..22672e805dd8 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/app/chrome_main_delegate.cc @@ -146,7 +146,7 @@ #include "components/about_ui/credit_utils.h" @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -188,16 +188,16 @@ +@@ -189,20 +189,20 @@ #include "v8/include/v8.h" #endif @@ -18,6 +18,11 @@ #include "base/environment.h" #endif +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/nix/scoped_xdg_activation_token_injector.h" + #endif + -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include "base/message_loop/message_pump_libevent.h" @@ -29,7 +34,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -337,7 +337,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -346,7 +346,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -38,7 +43,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -422,7 +422,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -431,7 +431,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -47,7 +52,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -481,7 +481,7 @@ void AddFeatureFlagsToCommandLine( +@@ -477,7 +477,7 @@ void SetCrashpadUploadConsentPostLogin() { } #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -56,7 +61,16 @@ void SIGTERMProfilingShutdown(int signal) { content::Profiling::Stop(); struct sigaction sigact; -@@ -636,7 +636,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -559,7 +559,7 @@ std::optional<int> AcquireProcessSingleton( + // process can be exited. + ChromeProcessSingleton::CreateInstance(user_data_dir); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Read the xdg-activation token and set it in the command line for the + // duration of the notification in order to ensure this is propagated to an + // already running browser process if it exists. +@@ -643,7 +643,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -65,7 +79,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -763,7 +763,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -770,7 +770,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -74,25 +88,25 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::GetCommon().RecordStartupProcessCreationTime( -@@ -1116,7 +1116,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv - +@@ -1155,7 +1155,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv + chrome::GetChannel() == version_info::Channel::DEV; const bool emit_crashes = #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - chrome::GetChannel() == version_info::Channel::CANARY || - chrome::GetChannel() == version_info::Channel::DEV; + is_canary_dev; #else -@@ -1130,7 +1130,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv - base::InitializeCpuReductionExperiment(); - base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures(); - base::sequence_manager::internal::ThreadController::InitializeFeatures(); + false; +@@ -1174,7 +1174,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv + // for more context. + base::sequence_manager::internal::ThreadController::InitializeFeatures( + /*record_sample_metadata=*/is_canary_dev); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) base::MessagePumpLibevent::InitializeFeatures(); #elif BUILDFLAG(IS_MAC) base::PlatformThread::InitFeaturesPostFieldTrial(); -@@ -1276,7 +1276,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1323,7 +1323,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom // TODO(crbug.com/1052397): Revisit the macro expression once build flag // switch of lacros-chrome is complete. @@ -101,7 +115,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1306,7 +1306,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1353,7 +1353,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -110,7 +124,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1703,7 +1703,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1750,7 +1750,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -119,7 +133,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) { -@@ -1804,7 +1804,7 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1851,7 +1851,7 @@ absl::variant<int, content::MainFunctionParams> Chrome // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn index f4492fc34a87..bd4ce5d9f973 100644 --- a/www/chromium/files/patch-chrome_browser_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/BUILD.gn.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/BUILD.gn -@@ -6513,6 +6513,13 @@ static_library("browser") { +@@ -6552,6 +6552,13 @@ static_library("browser") { } } diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index 4f64db6ba0f7..1933395a868c 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,4 +1,4 @@ ---- chrome/browser/about_flags.cc.orig 2024-03-27 13:31:02 UTC +--- chrome/browser/about_flags.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/about_flags.cc @@ -234,7 +234,7 @@ #include "ui/ui_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -326,7 +326,7 @@ +@@ -322,7 +322,7 @@ #include "device/vr/public/cpp/features.h" #endif @@ -18,16 +18,16 @@ #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -335,7 +335,7 @@ +@@ -331,7 +331,7 @@ #include "chrome/browser/win/titlebar_config.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/profile_management/profile_management_features.h" + #include "components/supervised_user/core/common/features.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) - -@@ -492,7 +492,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -489,7 +489,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -36,7 +36,7 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -1374,7 +1374,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 +@@ -1384,7 +1384,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 nullptr}}; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -45,7 +45,7 @@ const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = { {"ShortcutBoostSearchScore", "0"}, {"ShortcutBoostNonTopHitThreshold", "0"}, -@@ -3687,7 +3687,7 @@ const flags_ui::FeatureEntry::FeatureVariation +@@ -3704,7 +3704,7 @@ const flags_ui::FeatureEntry::FeatureVariation std::size(kParcelTrackingTestDataOutForDelivery), nullptr}, }; @@ -54,7 +54,7 @@ const flags_ui::FeatureEntry::FeatureParam kDesktopPWAsLinkCapturingDefaultOn[] = {{"on_by_default", "true"}}; const flags_ui::FeatureEntry::FeatureParam -@@ -4425,7 +4425,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4495,7 +4495,7 @@ const FeatureEntry kFeatureEntries[] = { }, #endif // BUILDFLAG(IS_ANDROID) @@ -63,7 +63,7 @@ { "fluent-overlay-scrollbars", flag_descriptions::kFluentOverlayScrollbarsName, -@@ -4864,7 +4864,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4936,7 +4936,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebAppUniversalInstall)}, #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -72,7 +72,7 @@ {"shortcuts-not-apps", flag_descriptions::kShortcutsNotAppsName, flag_descriptions::kShortcutsNotAppsDescription, kOsMac | kOsWin | kOsLinux | kOsFuchsia, -@@ -4993,7 +4993,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5061,7 +5061,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -81,7 +81,7 @@ {"pulseaudio-loopback-for-cast", flag_descriptions::kPulseaudioLoopbackForCastName, flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux, -@@ -5009,7 +5009,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5077,7 +5077,7 @@ const FeatureEntry kFeatureEntries[] = { MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)}, #endif // BUILDFLAG(IS_LINUX) @@ -90,25 +90,16 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -5292,7 +5292,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(feed::kRefreshFeedOnRestart)}, - #endif // BUILDFLAG(IS_ANDROID) - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - {"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName, - flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop, - FEATURE_VALUE_TYPE(feed::kWebUiFeed)}, -@@ -5943,7 +5943,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5981,7 +5981,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - {"omnibox-actions-ui-simplification", - flag_descriptions::kOmniboxActionsUISimplificationName, - flag_descriptions::kOmniboxActionsUISimplificationDescription, kOsDesktop, -@@ -6800,7 +6800,7 @@ const FeatureEntry kFeatureEntries[] = { + {"omnibox-domain-suggestions", + flag_descriptions::kOmniboxDomainSuggestionsName, + flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, +@@ -6852,7 +6852,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kParallelDownloadingDescription, kOsAll, FEATURE_VALUE_TYPE(download::features::kParallelDownloading)}, @@ -117,7 +108,7 @@ {"enable-async-dns", flag_descriptions::kAsyncDnsName, flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, FEATURE_VALUE_TYPE(net::features::kAsyncDns)}, -@@ -7785,7 +7785,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7857,7 +7857,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kPrivacyIndicators)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -126,16 +117,16 @@ {"enable-network-service-sandbox", flag_descriptions::kEnableNetworkServiceSandboxName, flag_descriptions::kEnableNetworkServiceSandboxDescription, -@@ -7818,7 +7818,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE( - supervised_user::kFilterWebsitesForSupervisedUsersOnDesktopAndIOS)}, +@@ -7881,7 +7881,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(media::kV4L2FlatStatefulVideoDecoder)}, + #endif -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) {"enable-family-link-extensions-permissions", flag_descriptions:: kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName, -@@ -8716,7 +8716,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8733,7 +8733,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -144,7 +135,7 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -8758,7 +8758,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8775,7 +8775,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -153,7 +144,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9047,7 +9047,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9044,7 +9044,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -162,7 +153,7 @@ {"policy-indication-for-managed-default-search", flag_descriptions::kPolicyIndicationForManagedDefaultSearchName, flag_descriptions::kPolicyIndicationForManagedDefaultSearchDescription, -@@ -9351,7 +9351,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9340,7 +9340,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -171,7 +162,7 @@ {"media-session-enter-picture-in-picture", flag_descriptions::kMediaSessionEnterPictureInPictureName, flag_descriptions::kMediaSessionEnterPictureInPictureDescription, -@@ -10341,7 +10341,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10280,7 +10280,7 @@ const FeatureEntry kFeatureEntries[] = { kOsDesktop | kOsAndroid, FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, @@ -180,7 +171,7 @@ {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName, flag_descriptions::kCameraMicEffectsDescription, static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux), -@@ -10372,7 +10372,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10318,7 +10318,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -189,7 +180,7 @@ {"site-search-settings-policy", flag_descriptions::kSiteSearchSettingsPolicyName, flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll, -@@ -10502,7 +10502,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10452,7 +10452,7 @@ const FeatureEntry kFeatureEntries[] = { password_manager::features::kFillingAcrossAffiliatedWebsitesAndroid)}, #endif @@ -198,7 +189,7 @@ {"third-party-profile-management", flag_descriptions::kThirdPartyProfileManagementName, flag_descriptions::kThirdPartyProfileManagementDescription, -@@ -10845,7 +10845,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10804,7 +10804,7 @@ const FeatureEntry kFeatureEntries[] = { trusted_vault::kTrustedVaultFrequentDegradedRecoverabilityPolling)}, #endif @@ -207,7 +198,7 @@ {"restart-to-gain-access-to-keychain", flag_descriptions::kRestartToGainAccessToKeychainName, flag_descriptions::kRestartToGainAccessToKeychainDescription, -@@ -11099,7 +11099,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11078,7 +11078,7 @@ const FeatureEntry kFeatureEntries[] = { // Controls the view mode for (history) sync screen. #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ diff --git a/www/chromium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc b/www/chromium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc index e5ce2a2fcb9b..9ba74d63609f 100644 --- a/www/chromium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc +++ b/www/chromium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc @@ -1,11 +1,11 @@ ---- chrome/browser/apps/app_service/publishers/extension_apps.cc.orig 2024-01-30 07:53:34 UTC +--- chrome/browser/apps/app_service/publishers/extension_apps.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/apps/app_service/publishers/extension_apps.cc -@@ -24,7 +24,7 @@ ExtensionApps::~ExtensionApps() = default; +@@ -23,7 +23,7 @@ ExtensionApps::ExtensionApps(AppServiceProxy* proxy) + ExtensionApps::~ExtensionApps() = default; bool ExtensionApps::Accepts(const extensions::Extension* extension) { - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (extensions::IsExtensionUnsupportedDeprecatedApp(profile(), extension->id())) { return false; diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc index 5b2bbff3d527..b0967133cdb3 100644 --- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc +++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc @@ -1,20 +1,65 @@ ---- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/apps/platform_apps/platform_app_launch.cc -@@ -20,7 +20,7 @@ +@@ -19,7 +19,7 @@ + #include "extensions/common/constants.h" #include "extensions/common/extension.h" - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_window.h" -@@ -138,7 +138,7 @@ bool OpenExtensionApplicationTab(Profile* profile, con +@@ -86,7 +86,7 @@ bool OpenExtensionApplicationWindow(Profile* profile, + if (launch_container == LaunchContainer::kLaunchContainerTab) + return false; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (OpenDeprecatedApplicationPrompt(profile, app_id)) { + return false; + } +@@ -118,7 +118,7 @@ content::WebContents* OpenExtensionApplicationTab(Prof + if (launch_container != apps::LaunchContainer::kLaunchContainerTab) + return nullptr; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (OpenDeprecatedApplicationPrompt(profile, app_id)) { + return nullptr; + } +@@ -134,7 +134,7 @@ content::WebContents* OpenExtensionApplicationTab(Prof + return app_tab; } - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool OpenDeprecatedApplicationPrompt(Profile* profile, const std::string& app_id) { if (!extensions::IsExtensionUnsupportedDeprecatedApp(profile, app_id)) +@@ -170,7 +170,7 @@ bool OpenExtensionApplicationWithReenablePrompt( + if (!GetPlatformApp(profile, app_id)) + return false; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (OpenDeprecatedApplicationPrompt(profile, app_id)) { + return false; + } +@@ -192,7 +192,7 @@ content::WebContents* OpenExtensionAppShortcutWindow(P + ->enabled_extensions() + .GetAppByURL(url); + if (app) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (OpenDeprecatedApplicationPrompt(profile, app->id())) { + return nullptr; + } +@@ -215,7 +215,7 @@ void RecordExtensionAppLaunchOnTabRestored(Profile* pr + if (!extension) + return; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (OpenDeprecatedApplicationPrompt(profile, extension->id())) { + return; + } diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h index 421d2be586c0..54e492d2ecef 100644 --- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h +++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h @@ -1,7 +1,7 @@ ---- chrome/browser/apps/platform_apps/platform_app_launch.h.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/apps/platform_apps/platform_app_launch.h.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/apps/platform_apps/platform_app_launch.h -@@ -37,7 +37,7 @@ bool OpenExtensionApplicationWindow(Profile* profile, - bool OpenExtensionApplicationTab(Profile* profile, const std::string& app_id); +@@ -39,7 +39,7 @@ content::WebContents* OpenExtensionApplicationTab(Prof + const std::string& app_id); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) diff --git a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc index 69e31dfd8fd9..b16930dc8c0c 100644 --- a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc +++ b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/background/background_mode_manager.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/background/background_mode_manager.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/background/background_mode_manager.cc -@@ -870,7 +870,7 @@ gfx::ImageSkia GetStatusTrayIcon() { +@@ -872,7 +872,7 @@ gfx::ImageSkia GetStatusTrayIcon() { return gfx::ImageSkia(); return family->CreateExact(size).AsImageSkia(); diff --git a/www/chromium/files/patch-chrome_browser_browser__features.cc b/www/chromium/files/patch-chrome_browser_browser__features.cc index 72a1717a15fe..763656bbbc11 100644 --- a/www/chromium/files/patch-chrome_browser_browser__features.cc +++ b/www/chromium/files/patch-chrome_browser_browser__features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_features.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/browser_features.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/browser_features.cc -@@ -44,7 +44,7 @@ const base::FeatureParam<bool> kSpareRendererWarmupDel +@@ -76,7 +76,7 @@ const base::FeatureParam<bool> kSpareRendererWarmupDel BASE_FEATURE(kDestroyProfileOnBrowserClose, "DestroyProfileOnBrowserClose", #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT); #else base::FEATURE_DISABLED_BY_DEFAULT); -@@ -328,7 +328,7 @@ BASE_FEATURE(kNewTabPageTriggerForPrerender2, +@@ -337,7 +337,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, BASE_FEATURE(kSupportSearchSuggestionForPrerender2, "SupportSearchSuggestionForPrerender2", #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc index 365d00375830..4de90df96d71 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -128,13 +128,13 @@ +@@ -129,13 +129,13 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -16,7 +16,7 @@ #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h" #endif -@@ -222,7 +222,7 @@ +@@ -224,7 +224,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -25,7 +25,7 @@ #include "chrome/browser/companion/visual_query/visual_query_suggestions_service_factory.h" #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h" #include "chrome/browser/ui/webui/discards/discards.mojom.h" -@@ -831,7 +831,7 @@ void BindScreen2xMainContentExtractor( +@@ -834,7 +834,7 @@ void BindScreen2xMainContentExtractor( #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -34,7 +34,7 @@ void BindVisualSuggestionsModelProvider( content::RenderFrameHost* frame_host, mojo::PendingReceiver< -@@ -1027,7 +1027,7 @@ void PopulateChromeFrameBinders( +@@ -1030,7 +1030,7 @@ void PopulateChromeFrameBinders( #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -43,7 +43,7 @@ if (!render_frame_host->GetParent()) { map->Add<chrome::mojom::DraggableRegions>( base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed)); -@@ -1035,7 +1035,7 @@ void PopulateChromeFrameBinders( +@@ -1038,7 +1038,7 @@ void PopulateChromeFrameBinders( #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -52,7 +52,7 @@ if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && !render_frame_host->GetParentOrOuterDocument()) { // The service binder will reject non-primary main frames, but we still need -@@ -1122,7 +1122,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1125,7 +1125,7 @@ void PopulateChromeWebUIFrameBinders( commerce::CommerceInternalsUI>(map); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -61,7 +61,7 @@ RegisterWebUIControllerInterfaceBinder< connectors_internals::mojom::PageHandler, enterprise_connectors::ConnectorsInternalsUI>(map); -@@ -1134,7 +1134,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1137,7 +1137,7 @@ void PopulateChromeWebUIFrameBinders( #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -70,7 +70,7 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); #endif -@@ -1687,7 +1687,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1704,7 +1704,7 @@ void PopulateChromeWebUIFrameBinders( #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc index 7c5fdd12c30f..d12840851581 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -246,11 +246,11 @@ +@@ -246,15 +246,15 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -14,7 +14,12 @@ #include "components/crash/core/app/crashpad.h" #endif -@@ -283,14 +283,14 @@ +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/nix/xdg_util.h" + #endif + +@@ -287,14 +287,14 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -31,7 +36,7 @@ #include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck #include "chrome/browser/headless/headless_mode_util.h" // nogncheck #include "components/headless/select_file_dialog/headless_select_file_dialog.h" -@@ -352,14 +352,14 @@ +@@ -361,14 +361,14 @@ #endif // BUILDFLAG(IS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER) #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -48,7 +53,16 @@ constexpr base::FilePath::CharType kMediaHistoryDatabaseName[] = FILE_PATH_LITERAL("Media History"); -@@ -1073,7 +1073,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -523,7 +523,7 @@ void ProcessSingletonNotificationCallbackImpl( + } + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Set the global activation token sent as a command line switch by another + // browser process. This also removes the switch after use to prevent any side + // effects of leaving it in the command line after this point. +@@ -1089,7 +1089,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -57,7 +71,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -1121,7 +1121,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1137,7 +1137,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -66,7 +80,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( -@@ -1320,7 +1320,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1328,7 +1328,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -75,7 +89,7 @@ // Delete the media history database if it still exists. // TODO(crbug.com/1198344): Remove this. base::ThreadPool::PostTask( -@@ -1369,7 +1369,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1377,7 +1377,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* *UrlLanguageHistogramFactory::GetForBrowserContext(profile)); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -84,7 +98,7 @@ if (headless::IsHeadlessMode()) { headless::ReportHeadlessActionMetrics(); } -@@ -1477,7 +1477,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( +@@ -1485,7 +1485,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( // In headless mode provide alternate SelectFileDialog factory overriding // any platform specific SelectFileDialog implementation that may have been // set. @@ -93,7 +107,7 @@ if (headless::IsHeadlessMode()) { headless::HeadlessSelectFileDialogFactory::SetUp(); } -@@ -2016,7 +2016,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat +@@ -2030,7 +2030,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat // Drop the request if headless mode is in effect or the request is from // a headless Chrome process. diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc index 607a84e3902a..e30002b2521b 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2024-02-23 21:04:38 UTC +--- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/chrome_browser_main_extra_parts_linux.cc -@@ -117,7 +117,7 @@ ChromeBrowserMainExtraPartsLinux::ChromeBrowserMainExt +@@ -169,7 +169,7 @@ ChromeBrowserMainExtraPartsLinux::ChromeBrowserMainExt ChromeBrowserMainExtraPartsLinux::~ChromeBrowserMainExtraPartsLinux() = default; void ChromeBrowserMainExtraPartsLinux::PreEarlyInitialization() { diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc index abf384ae9558..d230e1311166 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_extra_parts_ozone.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/chrome_browser_main_extra_parts_ozone.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/chrome_browser_main_extra_parts_ozone.cc -@@ -31,7 +31,7 @@ void ChromeBrowserMainExtraPartsOzone::PostCreateMainM +@@ -27,7 +27,7 @@ void ChromeBrowserMainExtraPartsOzone::PostCreateMainM } void ChromeBrowserMainExtraPartsOzone::PostMainMessageLoopRun() { diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index bef1c8951e4d..7f9cb252ad26 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -457,7 +457,7 @@ +@@ -460,7 +460,7 @@ #include "storage/browser/file_system/external_mount_points.h" // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ #include "chrome/browser/chrome_browser_main_linux.h" #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #elif BUILDFLAG(IS_ANDROID) -@@ -565,12 +565,12 @@ +@@ -569,12 +569,12 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -24,15 +24,16 @@ #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -581,14 +581,14 @@ +@@ -585,7 +585,7 @@ #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/chrome_browser_main_extra_parts_enterprise.h" + #include "chrome/browser/enterprise/profile_management/oidc_auth_response_capture_navigation_throttle.h" #include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h" - #include "chrome/browser/ui/webui/app_settings/web_app_settings_navigation_throttle.h" +@@ -593,7 +593,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -41,7 +42,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -604,7 +604,7 @@ +@@ -609,7 +609,7 @@ #include "components/lens/lens_features.h" #endif @@ -50,7 +51,7 @@ #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif BUILDFLAG(IS_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -1467,7 +1467,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre +@@ -1474,7 +1474,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre #if BUILDFLAG(IS_CHROMEOS) registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false); #endif // BUILDFLAG(IS_CHROMEOS) @@ -59,7 +60,7 @@ registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled, true); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) -@@ -1588,7 +1588,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1598,7 +1598,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( is_integration_test, &startup_data_); @@ -68,7 +69,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1625,7 +1625,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1635,7 +1635,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -77,7 +78,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1646,7 +1646,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1656,7 +1656,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); #endif @@ -86,7 +87,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1665,7 +1665,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1675,7 +1675,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -95,7 +96,7 @@ main_parts->AddParts( std::make_unique< chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2502,7 +2502,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2515,7 +2515,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin client_info->client_id); } #elif BUILDFLAG(IS_POSIX) @@ -104,7 +105,7 @@ pid_t pid; if (crash_reporter::GetHandlerSocket(nullptr, &pid)) { command_line->AppendSwitchASCII( -@@ -2823,7 +2823,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2847,7 +2847,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); @@ -113,7 +114,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4506,7 +4506,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4551,7 +4551,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -122,7 +123,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5065,7 +5065,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5109,7 +5109,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -131,7 +132,7 @@ MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -5075,7 +5075,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5123,7 +5123,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -140,7 +141,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -5114,7 +5114,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5162,7 +5162,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati handle)); } @@ -149,7 +150,7 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -7083,7 +7083,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -7137,7 +7137,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() { // This enterprise policy is supported on Android, but the feature will not be // launched there. diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h index c02e6bef0b11..09f934d3be83 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -497,7 +497,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -500,7 +500,7 @@ class ChromeContentBrowserClient : public content::Con bool IsPluginAllowedToUseDevChannelAPIs( content::BrowserContext* browser_context, const GURL& url) override; diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index a86a512ef4ee..6f39ad9b49ca 100644 --- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1674,7 +1674,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1700,7 +1700,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferredForFile( const base::FilePath& path) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); } -@@ -1793,7 +1793,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1819,7 +1819,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow content::CheckDownloadAllowedCallback check_download_allowed_cb) { DCHECK_CURRENTLY_ON(BrowserThread::UI); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +18,7 @@ // Don't download pdf if it is a file URL, as that might cause an infinite // download loop if Chrome is not the system pdf viewer. if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) { -@@ -1839,7 +1839,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl +@@ -1865,7 +1865,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl DCHECK(download_item->IsSavePackageDownload()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc index faf652ff1e66..7797d68c90b6 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_item_model.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/download/download_item_model.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/download/download_item_model.cc -@@ -747,7 +747,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -752,7 +752,7 @@ bool DownloadItemModel::IsCommandChecked( download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); -@@ -793,7 +793,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -798,7 +798,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +18,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); -@@ -1107,7 +1107,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1189,7 +1189,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe return; } diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc index d15ed1cc8af5..e2e9c3914f64 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_prefs.cc.orig 2024-02-23 21:04:38 UTC +--- chrome/browser/download/download_prefs.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/download/download_prefs.cc @@ -11,6 +11,7 @@ #include <vector> @@ -8,7 +8,7 @@ #include "base/feature_list.h" #include "base/files/file_util.h" #include "base/functional/bind.h" -@@ -63,6 +64,10 @@ +@@ -64,6 +65,10 @@ #include "chrome/browser/flags/android/chrome_feature_list.h" #endif @@ -19,7 +19,7 @@ using content::BrowserContext; using content::BrowserThread; using content::DownloadManager; -@@ -73,7 +78,7 @@ namespace { +@@ -74,7 +79,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and // to the desktop on any platform. bool DownloadPathIsDangerous(const base::FilePath& download_path) { @@ -28,7 +28,7 @@ base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; -@@ -179,7 +184,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi +@@ -180,7 +185,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -37,7 +37,7 @@ should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); #endif -@@ -305,7 +310,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -306,7 +311,7 @@ void DownloadPrefs::RegisterProfilePrefs( registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_download_path); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -46,7 +46,7 @@ registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif #if BUILDFLAG(IS_ANDROID) -@@ -472,7 +477,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens +@@ -473,7 +478,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -55,7 +55,7 @@ void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) return; -@@ -504,7 +509,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -505,7 +510,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons void DownloadPrefs::ResetAutoOpenByUser() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -64,7 +64,7 @@ SetShouldOpenPdfInSystemReader(false); #endif auto_open_by_user_.clear(); -@@ -544,7 +549,7 @@ void DownloadPrefs::SaveAutoOpenState() { +@@ -545,7 +550,7 @@ void DownloadPrefs::SaveAutoOpenState() { bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const { #if BUILDFLAG(IS_CHROMEOS) return false; // There is no UI for auto-open on ChromeOS. @@ -73,7 +73,7 @@ return ShouldOpenPdfInSystemReader(); #else return false; -@@ -668,7 +673,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa +@@ -697,7 +702,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa #else // If the stored download directory is an absolute path, we presume it's // correct; there's not really much more validation we can do here. diff --git a/www/chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.cc b/www/chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.cc new file mode 100644 index 000000000000..bef6889d4a8e --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.cc @@ -0,0 +1,29 @@ +--- chrome/browser/enterprise/browser_management/browser_management_service.cc.orig 2024-04-19 13:02:56 UTC ++++ chrome/browser/enterprise/browser_management/browser_management_service.cc +@@ -21,7 +21,7 @@ namespace policy { + + namespace { + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void UpdateEnterpriseLogo( + Profile* profile, + base::OnceCallback<void(const gfx::Image&, +@@ -98,7 +98,7 @@ GetManagementStatusProviders(Profile* profile) { + } // namespace + + BrowserManagementMetadata::BrowserManagementMetadata(Profile* profile) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + UpdateManagementLogo(profile); + pref_change_registrar_.Init(profile->GetPrefs()); + pref_change_registrar_.Add( +@@ -114,7 +114,7 @@ const gfx::Image& BrowserManagementMetadata::GetManage + return management_logo_; + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void BrowserManagementMetadata::UpdateManagementLogo(Profile* profile) { + UpdateEnterpriseLogo( + profile, base::BindOnce(&BrowserManagementMetadata::SetManagementLogo, diff --git a/www/chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.h b/www/chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.h new file mode 100644 index 000000000000..65bb8b408533 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.h @@ -0,0 +1,11 @@ +--- chrome/browser/enterprise/browser_management/browser_management_service.h.orig 2024-04-19 13:02:56 UTC ++++ chrome/browser/enterprise/browser_management/browser_management_service.h +@@ -28,7 +28,7 @@ class BrowserManagementMetadata { + + const gfx::Image& GetManagementLogo() const; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + private: + void UpdateManagementLogo(Profile* profile); + void SetManagementLogo( diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc index c392293a3793..7d1c563ad09f 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-02-23 21:04:38 UTC +--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/enterprise/connectors/connectors_service.cc -@@ -542,7 +542,7 @@ bool ConnectorsService::ConnectorsEnabled() const { +@@ -564,7 +564,7 @@ bool ConnectorsService::ConnectorsEnabled() const { Profile* profile = Profile::FromBrowserContext(context_); diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc index 07702bf6ee26..b274583f3a8f 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2023-12-10 06:10:27 UTC +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc @@ -58,7 +58,7 @@ #include "base/strings/utf_string_conversions.h" @@ -18,7 +18,7 @@ void PopulateSignals(base::Value::Dict event, policy::CloudPolicyClient* client, std::string name, -@@ -427,7 +427,7 @@ void RealtimeReportingClient::ReportPastEvent(const st +@@ -420,7 +420,7 @@ void RealtimeReportingClient::ReportPastEvent(const st /*include_profile_user_name=*/false); } @@ -27,7 +27,7 @@ void AddCrowdstrikeSignalsToEvent( base::Value::Dict& event, -@@ -486,7 +486,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp +@@ -479,7 +479,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp if (include_profile_user_name) { event.Set(kKeyProfileUserName, GetProfileUserName()); } diff --git a/www/chromium/files/patch-chrome_browser_enterprise_watermark_watermark__view.cc b/www/chromium/files/patch-chrome_browser_enterprise_watermark_watermark__view.cc new file mode 100644 index 000000000000..3ae6cb960840 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_watermark_watermark__view.cc @@ -0,0 +1,20 @@ +--- chrome/browser/enterprise/watermark/watermark_view.cc.orig 2024-04-19 13:02:56 UTC ++++ chrome/browser/enterprise/watermark/watermark_view.cc +@@ -33,7 +33,7 @@ const gfx::Font& WatermarkFont() { + "Segoe UI", + #elif BUILDFLAG(IS_MAC) + "SF Pro Text", +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + "Ubuntu", + #elif BUILDFLAG(IS_CHROMEOS) + "Google Sans", +@@ -45,7 +45,7 @@ const gfx::Font& WatermarkFont() { + } + + gfx::Font::Weight WatermarkFontWeight() { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return gfx::Font::Weight::SEMIBOLD; + #else + return gfx::Font::Weight::MEDIUM; diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index cfaa8014eaf6..a79290ef12de 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1376,6 +1376,10 @@ static_library("extensions") { +@@ -1384,6 +1384,10 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc index d51ee975a583..ce01047a2f5e 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc @@ -1,15 +1,15 @@ ---- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-01-30 07:53:34 UTC +--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc -@@ -44,7 +44,7 @@ - #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" +@@ -45,7 +45,7 @@ #include "printing/buildflags/buildflags.h" + #include "services/screen_ai/buildflags/buildflags.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h" #endif -@@ -127,7 +127,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt +@@ -128,7 +128,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt extensions::SettingsPrivateEventRouterFactory::GetInstance(); extensions::SettingsOverridesAPI::GetFactoryInstance(); extensions::SidePanelService::GetFactoryInstance(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc b/www/chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc new file mode 100644 index 000000000000..308f32b4efcd --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc @@ -0,0 +1,11 @@ +--- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2024-04-19 13:02:56 UTC ++++ chrome/browser/extensions/api/management/chrome_management_api_delegate.cc +@@ -408,7 +408,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel + apps::LaunchContainer launch_container = + GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension); + Profile* profile = Profile::FromBrowserContext(context); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (extensions::IsExtensionUnsupportedDeprecatedApp(profile, + extension->id())) { + return false; diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc index 0d1b0b53acb6..54023892bd1c 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -603,7 +603,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem +@@ -605,7 +605,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem } void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() { diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc index 0493b49f6eba..24f295a38112 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc -@@ -281,7 +281,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor +@@ -284,7 +284,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor } else if (strcmp(os, "linux") == 0) { info->os = extensions::api::runtime::PlatformOs::kLinux; } else if (strcmp(os, "openbsd") == 0) { diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index bb556f103d5e..069e140c367e 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -205,7 +205,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -204,7 +204,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] = settings_api::PrefType::kBoolean; @@ -9,7 +9,7 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::kBoolean; #endif -@@ -214,7 +214,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -213,7 +213,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist // Appearance settings. (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString; (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber; diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc index 6851eace45b4..8458dbdf455c 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/extensions/api/tabs/tabs_api.cc -@@ -889,7 +889,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio +@@ -890,7 +890,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio // minimized. // TODO(crbug.com/1410400): Remove this workaround when linux is fixed. // TODO(crbug.com/1410400): Find a fix for wayland as well. diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc index d3660805e1b8..c4cf225a7414 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc @@ -1,9 +1,9 @@ ---- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-01-30 07:53:34 UTC +--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -904,7 +904,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: - RequestExtensionApproval(contents); - return; - } +@@ -934,7 +934,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: + #if BUILDFLAG(IS_CHROMEOS) + RequestExtensionApproval(contents); + return; -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Shows a parental permission dialog directly bypassing the extension diff --git a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc index 937b156220fd..c81fa23e5192 100644 --- a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc +++ b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-02-23 21:04:38 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -316,7 +316,7 @@ const struct { +@@ -317,7 +317,7 @@ const struct { FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"), kDontBlockChildren}, #endif diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index e50203c7aa06..6b4a13f8a04c 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2024-03-27 13:31:02 UTC +--- chrome/browser/flag_descriptions.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/flag_descriptions.cc -@@ -2936,7 +2936,7 @@ const char kCbdTimeframeRequiredDescription[] = +@@ -2946,7 +2946,7 @@ const char kCbdTimeframeRequiredDescription[] = "value to the list."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const char kPolicyIndicationForManagedDefaultSearchName[] = "Enable policy indication for managed Default Search provider"; const char kPolicyIndicationForManagedDefaultSearchDescription[] = -@@ -3261,7 +3261,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] +@@ -3259,7 +3259,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] "but in the same SiteInstanceGroup, and thus the same process."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy"; const char kSiteSearchSettingsPolicyDescription[] = "Allow site search engines to be defined by the SiteSearchSettings policy."; -@@ -7490,7 +7490,7 @@ const char kLacrosMergeIcuDataFileDescription[] = +@@ -7496,7 +7496,7 @@ const char kLacrosMergeIcuDataFileDescription[] = "Enables sharing common areas of icudtl.dat between Ash and Lacros."; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -27,7 +27,7 @@ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -7736,7 +7736,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] +@@ -7756,7 +7756,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] // Linux ----------------------------------------------------------------------- @@ -36,7 +36,7 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -7784,7 +7784,7 @@ const char kZeroCopyVideoCaptureDescription[] = +@@ -7804,7 +7804,7 @@ const char kZeroCopyVideoCaptureDescription[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -45,7 +45,7 @@ const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -7799,7 +7799,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] +@@ -7819,7 +7819,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] "instead of JSON."; #endif @@ -54,7 +54,7 @@ const char kEnableNetworkServiceSandboxName[] = "Enable the network service sandbox."; const char kEnableNetworkServiceSandboxDescription[] = -@@ -7831,7 +7831,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -7851,7 +7851,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -63,7 +63,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -7851,7 +7851,7 @@ const char kRestartToGainAccessToKeychainDescription[] +@@ -7871,7 +7871,7 @@ const char kRestartToGainAccessToKeychainDescription[] "to restart Chrome to gain access to computer's password manager."; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -72,7 +72,7 @@ const char kAsyncDnsName[] = "Async DNS resolver"; const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -@@ -7952,7 +7952,7 @@ const char kElementCaptureDescription[] = +@@ -7972,7 +7972,7 @@ const char kElementCaptureDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -81,7 +81,7 @@ const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -8001,7 +8001,7 @@ const char kComposeTextSelectionDescription[] = +@@ -8021,7 +8021,7 @@ const char kComposeTextSelectionDescription[] = "Enables feature for different heuristics for selecting text for Compose"; #endif // BUILDFLAG(ENABLE_COMPOSE) diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 7618f517b045..5b361c39b876 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.h.orig 2024-03-27 13:31:02 UTC +--- chrome/browser/flag_descriptions.h.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/flag_descriptions.h -@@ -1694,7 +1694,7 @@ extern const char kCbdTimeframeRequiredName[]; +@@ -1709,7 +1709,7 @@ extern const char kCbdTimeframeRequiredName[]; extern const char kCbdTimeframeRequiredDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ extern const char kPolicyIndicationForManagedDefaultSearchName[]; extern const char kPolicyIndicationForManagedDefaultSearchDescription[]; #endif -@@ -1879,7 +1879,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] +@@ -1890,7 +1890,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] extern const char kSiteInstanceGroupsForDataUrlsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ extern const char kSiteSearchSettingsPolicyName[]; extern const char kSiteSearchSettingsPolicyDescription[]; #endif -@@ -4305,7 +4305,7 @@ extern const char kLacrosMergeIcuDataFileName[]; +@@ -4323,7 +4323,7 @@ extern const char kLacrosMergeIcuDataFileName[]; extern const char kLacrosMergeIcuDataFileDescription[]; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -27,7 +27,7 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4445,7 +4445,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip +@@ -4471,7 +4471,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip // Linux --------------------------------------------------------------------- @@ -36,7 +36,7 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4487,7 +4487,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4513,7 +4513,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -45,7 +45,7 @@ extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -4498,13 +4498,13 @@ extern const char kRestartToGainAccessToKeychainName[] +@@ -4524,13 +4524,13 @@ extern const char kRestartToGainAccessToKeychainName[] extern const char kRestartToGainAccessToKeychainDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -61,7 +61,7 @@ extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -4515,7 +4515,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; +@@ -4541,7 +4541,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; extern const char kEnableProtoApiForClassifyUrlDescription[]; #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) @@ -70,7 +70,7 @@ extern const char kEnableNetworkServiceSandboxName[]; extern const char kEnableNetworkServiceSandboxDescription[]; -@@ -4592,7 +4592,7 @@ extern const char kElementCaptureDescription[]; +@@ -4618,7 +4618,7 @@ extern const char kElementCaptureDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -79,7 +79,7 @@ extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; -@@ -4626,7 +4626,7 @@ extern const char kComposeTextSelectionName[]; +@@ -4652,7 +4652,7 @@ extern const char kComposeTextSelectionName[]; extern const char kComposeTextSelectionDescription[]; #endif // BUILDFLAG(ENABLE_COMPOSE) diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc deleted file mode 100644 index dcb207ae1d52..000000000000 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2023-12-10 06:10:27 UTC -+++ chrome/browser/media/webrtc/capture_policy_utils.cc -@@ -140,7 +140,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry - } - - bool IsGetAllScreensMediaAllowedForAnySite(content::BrowserContext* context) { --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - Profile* profile = Profile::FromBrowserContext(context); - if (!profile) { - return false; -@@ -175,7 +175,7 @@ bool IsGetAllScreensMediaAllowedForAnySite(content::Br - - bool IsGetAllScreensMediaAllowed(content::BrowserContext* context, - const GURL& url) { --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - Profile* profile = Profile::FromBrowserContext(context); - if (!profile) { - return false; diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index 9e7afddfe6fc..7a10eb391d30 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-02-23 21:04:38 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -79,8 +79,10 @@ +@@ -80,8 +80,10 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -12,7 +12,7 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" -@@ -105,7 +107,7 @@ +@@ -106,7 +108,7 @@ #include "chromeos/crosapi/cpp/crosapi_constants.h" #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -21,7 +21,7 @@ #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h" #endif // BUILDFLAG(IS_LINUX) -@@ -114,7 +116,7 @@ +@@ -115,7 +117,7 @@ #include "components/user_manager/user_manager.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -30,7 +30,7 @@ #include "components/power_metrics/system_power_monitor.h" #endif -@@ -838,7 +840,7 @@ void RecordStartupMetrics() { +@@ -858,7 +860,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. @@ -39,7 +39,7 @@ shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -1142,11 +1144,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt +@@ -1162,11 +1164,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt } #endif // !BUILDFLAG(IS_ANDROID) diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc index 9c471316f9b7..58076d199092 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -193,7 +193,7 @@ +@@ -194,7 +194,7 @@ #include "chrome/notification_helper/notification_helper_constants.h" #endif @@ -9,7 +9,7 @@ #include "components/metrics/motherboard_metrics_provider.h" #endif -@@ -210,7 +210,7 @@ +@@ -211,7 +211,7 @@ #include "chrome/browser/metrics/power/power_metrics_provider_mac.h" #endif @@ -18,7 +18,7 @@ #include "chrome/browser/metrics/bluetooth_metrics_provider.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -586,7 +586,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg +@@ -577,7 +577,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +27,7 @@ metrics::structured::StructuredMetricsService::RegisterPrefs(registry); #if !BUILDFLAG(IS_CHROMEOS_ASH) -@@ -773,7 +773,7 @@ void ChromeMetricsServiceClient::Initialize() { +@@ -749,7 +749,7 @@ void ChromeMetricsServiceClient::Initialize() { RegisterUKMProviders(); } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -36,7 +36,7 @@ metrics::structured::Recorder::GetInstance()->SetUiTaskRunner( base::SequencedTaskRunner::GetCurrentDefault()); #endif -@@ -820,7 +820,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -796,7 +796,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::CPUMetricsProvider>()); @@ -45,7 +45,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::MotherboardMetricsProvider>()); #endif -@@ -905,7 +905,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -881,7 +881,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ @@ -54,7 +54,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || -@@ -1015,7 +1015,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -991,7 +991,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -63,16 +63,7 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1180,7 +1180,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve - } - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - // Begin initializing the structured metrics system. Initialization must wait - // until a profile is added, because it reads keys stored within the user's - // cryptohome. We only initialize for profiles that are valid candidates -@@ -1211,7 +1211,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1170,7 +1170,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ @@ -81,7 +72,7 @@ // This creates the DesktopProfileSessionDurationsServices if it didn't exist // already. metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext( -@@ -1554,7 +1554,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri +@@ -1513,7 +1513,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri recorder = std::make_unique<metrics::structured::AshStructuredMetricsRecorder>( cros_system_profile_provider_.get()); diff --git a/www/chromium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc b/www/chromium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc index 167de82c10fa..138b7d685e56 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/power/process_metrics_recorder_util.cc.orig 2022-07-22 17:30:31 UTC +--- chrome/browser/metrics/power/process_metrics_recorder_util.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/metrics/power/process_metrics_recorder_util.cc -@@ -59,7 +59,7 @@ void RecordProcessHistograms(const char* histogram_suf +@@ -65,7 +65,7 @@ void RecordProcessHistograms(const char* histogram_suf const ProcessMonitor::Metrics& metrics) { RecordAverageCPUUsage(histogram_suffix, metrics.cpu_usage); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc b/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc index 947bf233eb33..c5e5d9ac4baa 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc @@ -1,7 +1,7 @@ ---- chrome/browser/metrics/power/process_monitor.cc.orig 2023-12-10 06:10:27 UTC +--- chrome/browser/metrics/power/process_monitor.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/metrics/power/process_monitor.cc -@@ -65,7 +65,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet - #endif +@@ -61,7 +61,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet + metrics.cpu_usage = process_metrics.GetPlatformIndependentCPUUsage(); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_AIX) @@ -9,8 +9,8 @@ metrics.idle_wakeups = process_metrics.GetIdleWakeupsPerSecond(); #endif #if BUILDFLAG(IS_MAC) -@@ -81,7 +81,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do - metrics->cpu_usage *= factor; +@@ -79,7 +79,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do + } #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_AIX) @@ -18,8 +18,8 @@ metrics->idle_wakeups *= factor; #endif -@@ -172,7 +172,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me - lhs.cpu_usage += rhs.cpu_usage; +@@ -167,7 +167,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me + } #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_AIX) diff --git a/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.h b/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.h index 16db05f3bd3c..65615ebb3c9b 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.h +++ b/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.h @@ -1,7 +1,7 @@ ---- chrome/browser/metrics/power/process_monitor.h.orig 2022-11-30 08:12:58 UTC +--- chrome/browser/metrics/power/process_monitor.h.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/metrics/power/process_monitor.h -@@ -75,7 +75,7 @@ class ProcessMonitor : public content::BrowserChildPro - double cpu_usage = 0.0; +@@ -76,7 +76,7 @@ class ProcessMonitor : public content::BrowserChildPro + std::optional<double> cpu_usage; #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_AIX) diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc index 1d3768c3e5a7..411f8eb4831d 100644 --- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,4 +1,4 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -94,7 +94,7 @@ @@ -163,7 +163,7 @@ if (!enabled) { g_network_service_will_allow_gssapi_library_load = true; } -@@ -1062,7 +1062,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo +@@ -1055,7 +1055,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h index fd94d57e4055..07f2ef79f77a 100644 --- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h +++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h @@ -1,6 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.h.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/net/system_network_context_manager.h.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/net/system_network_context_manager.h -@@ -204,7 +204,7 @@ class SystemNetworkContextManager { +@@ -200,7 +200,7 @@ class SystemNetworkContextManager { class URLLoaderFactoryForSystem; class NetworkProcessLaunchWatcher; @@ -9,7 +9,7 @@ class GssapiLibraryLoadObserver : public network::mojom::GssapiLibraryLoadObserver { public: -@@ -240,7 +240,7 @@ class SystemNetworkContextManager { +@@ -236,7 +236,7 @@ class SystemNetworkContextManager { void UpdateExplicitlyAllowedNetworkPorts(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ // Applies the current value of the kEnforceLocalAnchorConstraintsEnabled // pref to the enforcement state. void UpdateEnforceLocalAnchorConstraintsEnabled(); -@@ -290,7 +290,7 @@ class SystemNetworkContextManager { +@@ -286,7 +286,7 @@ class SystemNetworkContextManager { std::unique_ptr<NetworkAnnotationMonitor> network_annotation_monitor_; diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc index aa5834ad1c77..62e505acb141 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc @@ -1,6 +1,15 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -671,7 +671,7 @@ void ChromePasswordManagerClient::NotifyUserCredential +@@ -468,7 +468,7 @@ bool ChromePasswordManagerClient::ShowKeyboardReplacin + + bool ChromePasswordManagerClient::CanUseBiometricAuthForFilling( + device_reauth::DeviceAuthenticator* authenticator) { +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) { + return false; + } +@@ -691,7 +691,7 @@ void ChromePasswordManagerClient::NotifyUserCredential } void ChromePasswordManagerClient::NotifyKeychainError() { diff --git a/www/chromium/files/patch-chrome_browser_platform__util__linux.cc b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc index f370402d0a81..cd478994c7af 100644 --- a/www/chromium/files/patch-chrome_browser_platform__util__linux.cc +++ b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc @@ -1,8 +1,8 @@ ---- chrome/browser/platform_util_linux.cc.orig 2024-02-23 21:04:38 UTC +--- chrome/browser/platform_util_linux.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/platform_util_linux.cc -@@ -300,7 +300,9 @@ void RunCommand(const std::string& command, - - base::LaunchOptions options; +@@ -300,7 +300,9 @@ void OnLaunchOptionsCreated(const std::string& command + argv.push_back(command); + argv.push_back(arg); options.current_directory = working_directory; +#if !BUILDFLAG(IS_BSD) options.allow_new_privs = true; diff --git a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index a7725481f099..399f0811eb39 100644 --- a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -228,19 +228,20 @@ +@@ -233,19 +233,20 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -24,7 +24,7 @@ #include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || -@@ -255,13 +256,13 @@ +@@ -260,13 +261,13 @@ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -40,7 +40,7 @@ #include "components/search_engines/site_search_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) -@@ -854,7 +855,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -868,7 +869,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -49,7 +49,7 @@ { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, -@@ -864,7 +865,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -878,7 +879,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -58,7 +58,7 @@ { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1637,7 +1638,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1657,7 +1658,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -67,7 +67,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1682,7 +1683,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1705,7 +1706,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -76,7 +76,7 @@ { key::kNetworkServiceSandboxEnabled, prefs::kNetworkServiceSandboxEnabled, base::Value::Type::BOOLEAN }, -@@ -1708,12 +1709,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1731,12 +1732,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -91,8 +91,8 @@ { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, -@@ -1722,7 +1723,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::LIST }, +@@ -1748,7 +1749,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::STRING }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ - || BUILDFLAG(IS_FUCHSIA) @@ -100,7 +100,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1735,7 +1736,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1761,7 +1762,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ @@ -109,7 +109,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1836,7 +1837,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1862,7 +1863,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -118,25 +118,16 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -1934,7 +1935,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::BOOLEAN }, - #endif // BUILDFLAG(IS_CHROMEOS) - --#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/1454054): replace the - // kGetDisplayMediaSetSelectAllScreensAllowedForUrls policy by a policy that - // matches the name of the new `getAllScreensMedia` API. -@@ -1943,7 +1944,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1969,7 +1970,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::LIST }, - #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) + #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -1968,7 +1969,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1994,7 +1995,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -145,7 +136,7 @@ { key::kEnforceLocalAnchorConstraintsEnabled, prefs::kEnforceLocalAnchorConstraintsEnabled, base::Value::Type::BOOLEAN }, -@@ -2029,7 +2030,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2052,7 +2053,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -154,7 +145,7 @@ { key::kTabDiscardingExceptions, performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions, base::Value::Type::LIST }, -@@ -2057,7 +2058,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2080,7 +2081,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kCloudApAuthEnabled, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) @@ -163,7 +154,7 @@ { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -2083,7 +2084,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2109,7 +2110,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedPrivateNetworkAccessRestrictionsEnabled, base::Value::Type::BOOLEAN }, #if BUILDFLAG(ENABLE_EXTENSIONS) @@ -172,7 +163,7 @@ { key::kExtensionInstallTypeBlocklist, extensions::pref_names::kExtensionInstallTypeBlocklist, base::Value::Type::LIST}, -@@ -2104,7 +2105,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2130,7 +2131,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = optimization_guide::model_execution::prefs::kWallpaperSearchEnterprisePolicyAllowed, base::Value::Type::INTEGER}, #endif @@ -181,7 +172,7 @@ { key::kChromeForTestingAllowed, prefs::kChromeForTestingAllowed, base::Value::Type::BOOLEAN }, -@@ -2221,7 +2222,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2251,7 +2252,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // Policies for all platforms - End #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -190,7 +181,7 @@ handlers->AddHandler( std::make_unique<performance_manager::MemorySaverPolicyHandler>()); // Note: This needs to be created after `DefaultSearchPolicyHandler`. -@@ -2229,7 +2230,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2259,7 +2260,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -198,8 +189,8 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) handlers->AddHandler( std::make_unique<SiteSearchPolicyHandler>(chrome_schema)); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -2425,7 +2426,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + +@@ -2468,7 +2469,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -208,7 +199,7 @@ handlers->AddHandler( std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); handlers->AddHandler( -@@ -2483,7 +2484,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2526,7 +2527,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -217,7 +208,16 @@ handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); handlers->AddHandler( -@@ -2557,7 +2558,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2575,7 +2576,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED, + SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED))); + +-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + handlers->AddHandler( + std::make_unique<ManagedAccountRestrictionsPolicyHandler>(chrome_schema)); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +@@ -2613,7 +2614,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH std::vector<std::unique_ptr<ConfigurationPolicyHandler>> signin_legacy_policies; #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -226,7 +226,7 @@ signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>( key::kForceBrowserSignin, prefs::kForceBrowserSignin, base::Value::Type::BOOLEAN)); -@@ -2916,7 +2917,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2970,7 +2971,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -235,7 +235,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -2924,7 +2925,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2978,7 +2979,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -244,16 +244,16 @@ handlers->AddHandler(std::make_unique<SimplePolicyHandler>( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -2941,7 +2942,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2995,7 +2996,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH /*new_policy_handler=*/std::make_unique< first_party_sets::FirstPartySetsOverridesPolicyHandler>( - policy::key::kRelatedWebsiteSetsOverrides, chrome_schema))); + key::kRelatedWebsiteSetsOverrides, chrome_schema))); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -2966,7 +2967,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3022,7 +3023,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH base::Value::Type::BOOLEAN))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc b/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc index 08f07bb81b92..3ae32d3c0cc6 100644 --- a/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc +++ b/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/device_management_service_configuration.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/policy/device_management_service_configuration.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/policy/device_management_service_configuration.cc -@@ -22,7 +22,7 @@ +@@ -24,7 +24,7 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/connectors/common.h" #include "chrome/browser/enterprise/connectors/connectors_service.h" #endif -@@ -100,7 +100,7 @@ DeviceManagementServiceConfiguration::GetReportingConn +@@ -102,7 +102,7 @@ DeviceManagementServiceConfiguration::GetReportingConn content::BrowserContext* context) const { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index e1289f31d0d2..5631409a268a 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -489,18 +489,18 @@ +@@ -488,18 +488,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -22,7 +22,7 @@ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -535,7 +535,7 @@ +@@ -534,7 +534,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -31,7 +31,7 @@ #include "ui/color/system_theme.h" #endif -@@ -1685,7 +1685,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1715,7 +1715,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) registry->RegisterBooleanPref(prefs::kOopPrintDriversAllowedByPolicy, true); #endif @@ -40,7 +40,7 @@ registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true); #endif -@@ -2031,12 +2031,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -2060,12 +2060,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc index 133c8bbda70a..2d0b781e49c8 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -175,7 +175,7 @@ const char* const kPersistentPrefNames[] = { +@@ -184,7 +184,7 @@ const char* const kPersistentPrefNames[] = { prefs::kShowFullscreenToolbar, #endif diff --git a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc index b013578814ee..5f8466eaf8aa 100644 --- a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc +++ b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc @@ -1,4 +1,4 @@ ---- chrome/browser/printing/print_backend_service_manager.cc.orig 2024-02-23 21:04:38 UTC +--- chrome/browser/printing/print_backend_service_manager.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/printing/print_backend_service_manager.cc @@ -34,7 +34,7 @@ #include "printing/printing_context.h" @@ -9,7 +9,7 @@ #include "content/public/common/content_switches.h" #endif -@@ -853,7 +853,7 @@ PrintBackendServiceManager::GetServiceFromBundle( +@@ -861,7 +861,7 @@ PrintBackendServiceManager::GetServiceFromBundle( host.BindNewPipeAndPassReceiver(), content::ServiceProcessHost::Options() .WithDisplayName(IDS_UTILITY_PROCESS_PRINT_BACKEND_SERVICE_NAME) @@ -18,7 +18,7 @@ .WithExtraCommandLineSwitches({switches::kMessageLoopTypeUi}) #endif .Pass()); -@@ -1026,7 +1026,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate +@@ -1038,7 +1038,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate return kNoClientsRegisteredResetOnIdleTimeout; case ClientType::kQueryWithUi: diff --git a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index b461a3519d37..3a73d18b0cbf 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -317,7 +317,7 @@ +@@ -321,7 +321,7 @@ #include "chromeos/constants/chromeos_features.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h" #endif -@@ -408,18 +408,18 @@ +@@ -412,18 +412,18 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -29,9 +29,9 @@ -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h" - #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" - #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" -@@ -648,7 +648,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" + #include "chrome/browser/enterprise/client_certificates/certificate_store_factory.h" +@@ -658,7 +658,7 @@ void ChromeBrowserMainExtraPartsProfiles:: DiceBoundSessionCookieServiceFactory::GetInstance(); #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) #endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS) @@ -40,7 +40,7 @@ browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); #endif browser_sync::UserEventServiceFactory::GetInstance(); -@@ -767,29 +767,29 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -781,29 +781,29 @@ void ChromeBrowserMainExtraPartsProfiles:: enterprise_commands::UserRemoteCommandsServiceFactory::GetInstance(); #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -76,7 +76,7 @@ enterprise_signin::EnterpriseSigninServiceFactory::GetInstance(); #endif #if BUILDFLAG(ENABLE_SESSION_SERVICE) -@@ -913,7 +913,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -927,7 +927,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -85,25 +85,25 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif -@@ -1019,7 +1019,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1034,7 +1034,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_CHROMEOS) policy::PolicyCertServiceFactory::GetInstance(); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); + policy::UserPolicyOidcSigninServiceFactory::GetInstance(); #endif - policy::UserCloudPolicyInvalidatorFactory::GetInstance(); -@@ -1060,7 +1060,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1076,7 +1076,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID) ProfileStatisticsFactory::GetInstance(); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) ProfileTokenWebSigninInterceptorFactory::GetInstance(); + OidcAuthenticationSigninInterceptorFactory::GetInstance(); #endif - #if !BUILDFLAG(IS_ANDROID) -@@ -1078,7 +1078,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1095,7 +1095,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif ReduceAcceptLanguageFactory::GetInstance(); RendererUpdaterFactory::GetInstance(); diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc index ae9bdad0ad41..3ab54b78c268 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/profiles/profile_impl.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/profiles/profile_impl.cc @@ -267,6 +267,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" @@ -11,7 +11,7 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -598,7 +602,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async +@@ -600,7 +604,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async #else { #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -20,7 +20,7 @@ ProfileManager* profile_manager = g_browser_process->profile_manager(); ProfileAttributesEntry* entry = profile_manager->GetProfileAttributesStorage() -@@ -886,7 +890,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -893,7 +897,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc index 7f4cd4b65561..b16c241f4844 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2024-01-30 07:53:34 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/renderer_preferences_util.cc -@@ -38,7 +38,7 @@ +@@ -39,7 +39,7 @@ #include "ui/views/controls/textfield/textfield.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/linux/linux_ui.h" -@@ -150,7 +150,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -154,7 +154,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval(); #endif @@ -18,7 +18,7 @@ auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); if (linux_ui_theme) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -173,7 +173,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -177,7 +177,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc b/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc index 9410218e5cca..2d0449a4bade 100644 --- a/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc +++ b/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc @@ -1,7 +1,7 @@ ---- chrome/browser/screen_ai/screen_ai_install_state.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/screen_ai/screen_ai_install_state.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/screen_ai/screen_ai_install_state.cc -@@ -24,7 +24,7 @@ - #include "content/public/browser/browser_thread.h" +@@ -23,7 +23,7 @@ + #include "services/screen_ai/public/cpp/utilities.h" #include "ui/accessibility/accessibility_features.h" -#if BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ #include "base/cpu.h" #include "base/files/file_util.h" #endif -@@ -36,7 +36,7 @@ const char kMinExpectedVersion[] = "123.1"; +@@ -35,7 +35,7 @@ const char kMinExpectedVersion[] = "123.1"; bool IsDeviceCompatible() { // Check if the CPU has the required instruction set to run the Screen AI // library. diff --git a/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc b/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc new file mode 100644 index 000000000000..e9a16d721dbc --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc @@ -0,0 +1,20 @@ +--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2024-04-19 13:02:56 UTC ++++ chrome/browser/screen_ai/screen_ai_service_router.cc +@@ -281,7 +281,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { + base::FilePath binary_path = state_instance->get_component_binary_path(); + #if BUILDFLAG(IS_WIN) + std::vector<base::FilePath> preload_libraries = {binary_path}; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + std::vector<std::string> extra_switches = { + base::StringPrintf("--%s=%s", screen_ai::GetBinaryPathSwitch(), + binary_path.MaybeAsASCII().c_str())}; +@@ -295,7 +295,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { + .WithPreloadedLibraries( + preload_libraries, + content::ServiceProcessHostPreloadLibraries::GetPassKey()) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + .WithExtraCommandLineSwitches(extra_switches) + #endif // BUILDFLAG(IS_WIN) + .Pass()); diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc new file mode 100644 index 000000000000..54cd329bac0b --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc @@ -0,0 +1,11 @@ +--- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig 2024-04-19 13:02:56 UTC ++++ chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc +@@ -180,7 +180,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte + return; + } + } +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + CHECK(contents.value()); + content::WebContents* web_contents = contents.value().get(); + if (CanInstallExtensions()) { diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc new file mode 100644 index 000000000000..8a53ba975513 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc @@ -0,0 +1,20 @@ +--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2024-04-19 13:02:56 UTC ++++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc +@@ -305,7 +305,7 @@ void SupervisedUserExtensionsManager:: + ActivateManagementPolicyAndUpdateRegistration() { + SetActiveForSupervisedUsers(); + UpdateManagementPolicyRegistration(); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + MaybeMarkExtensionsLocallyParentApproved(); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + } +@@ -417,7 +417,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten + return false; + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void SupervisedUserExtensionsManager:: + MaybeMarkExtensionsLocallyParentApproved() { + if (!is_active_policy_for_supervised_users_) { diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h new file mode 100644 index 000000000000..cdc61fa4d409 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h @@ -0,0 +1,11 @@ +--- chrome/browser/supervised_user/supervised_user_extensions_manager.h.orig 2024-04-19 13:02:56 UTC ++++ chrome/browser/supervised_user/supervised_user_extensions_manager.h +@@ -143,7 +143,7 @@ class SupervisedUserExtensionsManager : public Extensi + // launched. + bool ShouldBlockExtension(const std::string& extension_id) const; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Triggers an one-time migration of the present extensions as parent-approved + // when the feature + // `kEnableSupervisedUserSkipParentApprovalToInstallExtensions` becomes diff --git a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc index 3db41c8e72e8..38cdbf57b259 100644 --- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -110,7 +110,7 @@ +@@ -112,7 +112,7 @@ #endif // BUILDFLAG(ENABLE_SPELLCHECK) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h" #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || -@@ -456,7 +456,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -460,7 +460,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -18,7 +18,7 @@ if (base::FeatureList::IsEnabled(features::kTabGroupsSave)) { controllers.push_back(std::make_unique<syncer::ModelTypeController>( syncer::SAVED_TAB_GROUP, -@@ -469,7 +469,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -473,7 +473,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy // Chrome prefers OS provided spell checkers where they exist. So only sync the // custom dictionary on platforms that typically don't provide one. @@ -27,7 +27,7 @@ // Dictionary sync is enabled by default. if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { controllers.push_back( -@@ -625,7 +625,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate> +@@ -629,7 +629,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate> ChromeSyncClient::GetControllerDelegateForModelType(syncer::ModelType type) { switch (type) { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -35,4 +35,4 @@ + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) case syncer::SAVED_TAB_GROUP: { DCHECK(base::FeatureList::IsEnabled(features::kTabGroupsSave)); - return SavedTabGroupServiceFactory::GetForProfile(profile_) + return tab_groups::SavedTabGroupServiceFactory::GetForProfile(profile_) diff --git a/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc b/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc index 33fa9a55fe11..78a5549e0814 100644 --- a/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/sync/sync_service_factory.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/sync/sync_service_factory.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/sync/sync_service_factory.cc @@ -84,7 +84,7 @@ #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -24,6 +24,6 @@ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - DependsOn(SavedTabGroupServiceFactory::GetInstance()); + DependsOn(tab_groups::SavedTabGroupServiceFactory::GetInstance()); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || // BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc index 1fa36f0ba37e..dd041af1ae02 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2023-03-09 06:31:50 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.cc -@@ -45,7 +45,7 @@ TaskGroupSampler::TaskGroupSampler( +@@ -46,7 +46,7 @@ TaskGroupSampler::TaskGroupSampler( const OnCpuRefreshCallback& on_cpu_refresh, const OnSwappedMemRefreshCallback& on_swapped_mem_refresh, const OnIdleWakeupsCallback& on_idle_wakeups, @@ -9,7 +9,7 @@ const OnOpenFdCountCallback& on_open_fd_count, #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) const OnProcessPriorityCallback& on_process_priority) -@@ -55,7 +55,7 @@ TaskGroupSampler::TaskGroupSampler( +@@ -56,7 +56,7 @@ TaskGroupSampler::TaskGroupSampler( on_cpu_refresh_callback_(on_cpu_refresh), on_swapped_mem_refresh_callback_(on_swapped_mem_refresh), on_idle_wakeups_callback_(on_idle_wakeups), @@ -18,7 +18,7 @@ on_open_fd_count_callback_(on_open_fd_count), #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) on_process_priority_callback_(on_process_priority) { -@@ -85,7 +85,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) +@@ -86,7 +86,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) base::BindOnce(on_swapped_mem_refresh_callback_)); } @@ -27,7 +27,7 @@ if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS, refresh_flags)) { blocking_pool_runner_->PostTaskAndReplyWithResult( -@@ -95,7 +95,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) +@@ -96,7 +96,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) } #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -36,7 +36,7 @@ if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT, refresh_flags)) { blocking_pool_runner_->PostTaskAndReplyWithResult( -@@ -144,7 +144,7 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { +@@ -150,7 +150,7 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { return process_metrics_->GetIdleWakeupsPerSecond(); } diff --git a/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h b/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h index d0ce4deb6ca6..adbbc76dea07 100644 --- a/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h +++ b/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/actions/chrome_action_id.h.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/ui/actions/chrome_action_id.h.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/actions/chrome_action_id.h -@@ -526,7 +526,7 @@ +@@ -510,7 +510,7 @@ IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_ANSWER) \ E(kActionContentContextQuickAnswersInlineQuery, \ IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_QUERY) diff --git a/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc b/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc new file mode 100644 index 000000000000..7a0eecf699ce --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2024-04-19 13:02:56 UTC ++++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc +@@ -25,7 +25,7 @@ namespace autofill::payments { + DesktopPaymentsWindowManager::DesktopPaymentsWindowManager( + ContentAutofillClient* client) + : client_(CHECK_DEREF(client)) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + scoped_observation_.Observe(BrowserList::GetInstance()); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) + } +@@ -48,7 +48,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye + } + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + void DesktopPaymentsWindowManager::OnBrowserSetLastActive(Browser* browser) { + // If there is an ongoing payments window manager pop-up flow, and the + // original tab's WebContents become active, activate the pop-up's diff --git a/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h b/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h new file mode 100644 index 000000000000..2561cb2fb1de --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h @@ -0,0 +1,38 @@ +--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig 2024-04-19 13:02:56 UTC ++++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h +@@ -11,7 +11,7 @@ + #include "components/autofill/core/browser/payments/payments_window_manager.h" + #include "content/public/browser/web_contents_observer.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + #include "base/scoped_observation.h" + #include "chrome/browser/ui/browser_list.h" + #include "chrome/browser/ui/browser_list_observer.h" +@@ -30,7 +30,7 @@ namespace payments { + // WebContents of the original tab that the pop-up is created in. If there is a + // pop-up currently present, `this` will observe the WebContents of that pop-up. + class DesktopPaymentsWindowManager : public PaymentsWindowManager, +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + public BrowserListObserver, + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) + public content::WebContentsObserver { +@@ -47,7 +47,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi + // content::WebContentsObserver: + void WebContentsDestroyed() override; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // BrowserListObserver: + void OnBrowserSetLastActive(Browser* browser) override; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -99,7 +99,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi + // ContentAutofillClient that owns `this`. + const raw_ref<ContentAutofillClient> client_; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + base::ScopedObservation<BrowserList, BrowserListObserver> scoped_observation_{ + this}; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc b/www/chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc new file mode 100644 index 000000000000..3586e16b8daf --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/browser_ui_prefs.cc.orig 2024-04-19 13:02:56 UTC ++++ chrome/browser/ui/browser_ui_prefs.cc +@@ -168,7 +168,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry + registry->RegisterDictionaryPref(prefs::kHttpsUpgradeFallbacks); + registry->RegisterDictionaryPref(prefs::kHttpsUpgradeNavigations); + registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + registry->RegisterStringPref(prefs::kEnterpriseLogoUrl, std::string()); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) + } diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc index 9e17006ad478..087e88eacb45 100644 --- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc +++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/chrome_pages.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/chrome_pages.cc -@@ -81,7 +81,7 @@ +@@ -82,7 +82,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -702,7 +702,7 @@ void ShowShortcutCustomizationApp(Profile* profile, +@@ -716,7 +716,7 @@ void ShowShortcutCustomizationApp(Profile* profile, } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h index 1d365da4b8b6..b0a0b1cc29f9 100644 --- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h +++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/chrome_pages.h.orig 2024-01-30 07:53:34 UTC +--- chrome/browser/ui/chrome_pages.h.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/chrome_pages.h @@ -38,7 +38,7 @@ enum class ConsentLevel; } // namespace signin @@ -9,7 +9,7 @@ namespace web_app { enum class AppSettingsPageEntryPoint; } // namespace web_app -@@ -258,7 +258,7 @@ void ShowShortcutCustomizationApp(Profile* profile, +@@ -262,7 +262,7 @@ void ShowShortcutCustomizationApp(Profile* profile, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc b/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc index 2b1415ad1f02..4c2ab86e90f7 100644 --- a/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc +++ b/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2024-02-23 21:04:38 UTC +--- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc -@@ -2005,7 +2005,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() { +@@ -1989,7 +1989,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() { OmniboxFieldTrial::IsChromeRefreshActionChipIconsEnabled() ? omnibox::kShareWinChromeRefreshIcon : omnibox::kShareWinIcon; diff --git a/www/chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc b/www/chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc index dfb65e409dd0..e3cbf96a4300 100644 --- a/www/chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc @@ -88,7 +88,7 @@ int ManagePasswordsUIController::save_fallback_timeout @@ -9,7 +9,7 @@ // Should be kept in sync with constant declared in // bubble_controllers/relaunch_chrome_bubble_controller.cc. constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3; -@@ -478,7 +478,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor +@@ -477,7 +477,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor } void ManagePasswordsUIController::OnKeychainError() { diff --git a/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc index f157b2b9c2b2..61734cc5ff21 100644 --- a/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/signin/signin_view_controller.cc.orig 2024-02-23 21:04:38 UTC +--- chrome/browser/ui/signin/signin_view_controller.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/signin/signin_view_controller.cc -@@ -254,7 +254,7 @@ void SigninViewController::ShowModalManagedUserNoticeD +@@ -255,7 +255,7 @@ void SigninViewController::ShowModalManagedUserNoticeD bool show_link_data_option, signin::SigninChoiceCallback callback) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc index 520bd00943af..fb5f9199f7ca 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2023-11-03 10:09:45 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -104,7 +104,7 @@ const char* const kBadFlags[] = { +@@ -105,7 +105,7 @@ const char* const kBadFlags[] = { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index 8b52dda74f67..2895f4aec714 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc @@ -135,7 +135,7 @@ #include "chrome/credential_provider/common/gcp_strings.h" @@ -9,7 +9,7 @@ #include "chrome/browser/headless/headless_mode_util.h" #include "chrome/browser/ui/startup/web_app_info_recorder_utils.h" #include "components/headless/policy/headless_mode_policy.h" -@@ -941,7 +941,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -962,7 +962,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl"); ComputeAndRecordLaunchMode(command_line); @@ -18,7 +18,7 @@ if (headless::IsHeadlessMode() && headless::HeadlessModePolicy::IsHeadlessModeDisabled( g_browser_process->local_state())) { -@@ -1046,7 +1046,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1060,7 +1060,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( silent_launch = true; } @@ -27,7 +27,7 @@ // Writes open and installed web apps to the specified file without // launching a new browser window or tab. if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) && -@@ -1257,7 +1257,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1270,7 +1270,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow) << "Failed launch with app: couldn't pick a profile"; std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId); diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc index a605097689b2..7003f7c1edb3 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -234,7 +234,7 @@ +@@ -233,7 +233,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/hats/hats_helper.h" -@@ -676,12 +676,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -673,12 +673,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc index 5fa7c3de73cf..98df7877f2ef 100644 --- a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc +++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/ui_features.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/ui/ui_features.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/ui_features.cc -@@ -357,7 +357,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, +@@ -410,7 +410,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, "TopChromeWebUIUsesSpareRenderer", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.h b/www/chromium/files/patch-chrome_browser_ui_ui__features.h index 9dc3a8f79b5f..85f143c1dd55 100644 --- a/www/chromium/files/patch-chrome_browser_ui_ui__features.h +++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/ui_features.h.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/ui/ui_features.h.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/ui_features.h -@@ -223,7 +223,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw); +@@ -264,7 +264,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw); BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc index 7d4390872151..2a1ffc8d4ca0 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_frame_view_linux.cc.orig 2024-02-23 21:04:38 UTC +--- chrome/browser/ui/views/frame/browser_frame_view_linux.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/views/frame/browser_frame_view_linux.cc -@@ -77,7 +77,7 @@ void BrowserFrameViewLinux::OnWindowButtonOrderingChan +@@ -60,7 +60,7 @@ gfx::ShadowValues BrowserFrameViewLinux::GetShadowValu void BrowserFrameViewLinux::PaintRestoredFrameBorder( gfx::Canvas* canvas) const { @@ -9,7 +9,7 @@ const bool tiled = frame()->tiled(); #else const bool tiled = false; -@@ -103,7 +103,7 @@ bool BrowserFrameViewLinux::ShouldDrawRestoredFrameSha +@@ -104,7 +104,7 @@ void BrowserFrameViewLinux::OnWindowButtonOrderingChan } float BrowserFrameViewLinux::GetRestoredCornerRadiusDip() const { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc index c91a51098da6..9c8254b6d4ea 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2024-02-23 21:04:38 UTC +--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc @@ -16,7 +16,7 @@ #include "chrome/browser/ui/views/frame/browser_frame_view_win.h" @@ -18,12 +18,3 @@ auto* profile = browser_view->browser()->profile(); auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); -@@ -85,7 +85,7 @@ std::unique_ptr<BrowserNonClientFrameView> CreateBrows - if (browser_view->browser()->is_type_picture_in_picture()) { - auto view = - std::make_unique<PictureInPictureBrowserFrameView>(frame, browser_view); --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - auto* profile = browser_view->browser()->profile(); - auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); - auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index 142cca9329c8..f665dddc2b33 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2204,7 +2204,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2234,7 +2234,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra // CrOS cleanup is done. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc index eee1f4a4cbba..344738d48c82 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc @@ -59,7 +59,7 @@ #include "ui/aura/window.h" @@ -6,10 +6,10 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/themes/theme_service.h" + #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h" - #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h" - #endif -@@ -86,7 +86,7 @@ constexpr int kContentSettingIconSize = 16; +@@ -89,7 +89,7 @@ constexpr int kContentSettingIconSize = 16; // The height of the controls bar at the top of the window. constexpr int kTopControlsHeight = 34; @@ -18,7 +18,7 @@ // Frame border when window shadow is not drawn. constexpr int kFrameBorderThickness = 4; #endif -@@ -181,7 +181,7 @@ class WindowEventObserver : public ui::EventObserver { +@@ -184,7 +184,7 @@ class WindowEventObserver : public ui::EventObserver { gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds(); @@ -27,16 +27,16 @@ // Calculate input bounds for Linux. This is needed because the input bounds // is not necessary the same as the local bounds on Linux. if (pip_browser_frame_view_->ShouldDrawFrameShadow()) { -@@ -571,7 +571,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow +@@ -585,7 +585,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow AddChildView(std::move(auto_pip_setting_overlay)); } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - frame_background_ = std::make_unique<views::FrameBackground>(); - #endif - -@@ -774,7 +774,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( + auto* profile = browser_view->browser()->profile(); + auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); + auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); +@@ -804,7 +804,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( for (ContentSettingImageView* view : content_setting_views_) view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground)); @@ -45,7 +45,7 @@ // On Linux the top bar background will be drawn in OnPaint(). top_bar_container_view_->SetBackground(views::CreateSolidBackground( color_provider->GetColor(kColorPipWindowTopBarBackground))); -@@ -853,7 +853,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg +@@ -886,7 +886,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg BrowserNonClientFrameView::RemovedFromWidget(); } @@ -54,7 +54,7 @@ gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -1107,7 +1107,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre +@@ -1147,7 +1147,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre // views::View implementations: void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) { @@ -63,7 +63,7 @@ // Draw the PiP window frame borders and shadows, including the top bar // background. if (window_frame_provider_) { -@@ -1231,7 +1231,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -1281,7 +1281,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie } gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const { @@ -72,7 +72,7 @@ if (window_frame_provider_) { const auto insets = window_frame_provider_->GetFrameThicknessDip(); const bool tiled = frame()->tiled(); -@@ -1249,7 +1249,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor +@@ -1299,7 +1299,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor } gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const { @@ -81,12 +81,12 @@ return FrameBorderInsets(); #elif !BUILDFLAG(IS_CHROMEOS_ASH) return gfx::Insets(kResizeBorder); -@@ -1270,7 +1270,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie +@@ -1320,7 +1320,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie top_height + border_thickness.bottom()); } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void PictureInPictureBrowserFrameView::SetWindowFrameProvider( - ui::WindowFrameProvider* window_frame_provider) { - DCHECK(window_frame_provider); + bool PictureInPictureBrowserFrameView::ShouldDrawFrameShadow() const { + return static_cast<DesktopBrowserFrameAuraLinux*>( + frame()->native_browser_frame()) diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h index b5b0c94844cc..24ad747ec8cf 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h @@ -27,7 +27,7 @@ #include "ui/views/layout/flex_layout_view.h" @@ -33,10 +33,10 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Sets the window frame provider so that it will be used for drawing. - void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider); + // Returns whether a client-side shadow should be drawn for the window. + bool ShouldDrawFrameShadow() const; -@@ -370,7 +370,7 @@ class PictureInPictureBrowserFrameView +@@ -368,7 +368,7 @@ class PictureInPictureBrowserFrameView // `top_bar_color_animation_`. std::optional<SkColor> current_foreground_color_; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc index 678be0c91a87..39fcfd99ebd1 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -703,7 +703,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -726,7 +726,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc b/www/chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc index 09c31dc77347..3d29bcf1be90 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tab_search_bubble_host.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/ui/views/tab_search_bubble_host.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/views/tab_search_bubble_host.cc -@@ -296,7 +296,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT +@@ -263,7 +263,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT // Mac should have tabsearch on the right side. Windows >= Win10 has the // Tab Search button as a FrameCaptionButton, but it still needs to be on the // left if it exists. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index 75519ecc19f8..6bdbb6c8a919 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -94,7 +94,7 @@ +@@ -93,7 +93,7 @@ #include "components/remote_cocoa/browser/window.h" #endif @@ -9,7 +9,7 @@ #include "ui/aura/client/drag_drop_client.h" #endif -@@ -214,7 +214,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { +@@ -213,7 +213,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { void UpdateSystemDnDDragImage(TabDragContext* attached_context, const gfx::ImageSkia& image) { @@ -18,16 +18,16 @@ aura::Window* root_window = attached_context->GetWidget()->GetNativeWindow()->GetRootWindow(); if (aura::client::GetDragDropClient(root_window)) { -@@ -395,7 +395,7 @@ TabDragController::Liveness TabDragController::Init( +@@ -403,7 +403,7 @@ TabDragController::Liveness TabDragController::Init( // synchronous on desktop Linux, so use that. // - ChromeOS Ash // Releasing capture on Ash cancels gestures so avoid it. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - can_release_capture_ = false; + ref->can_release_capture_ = false; #endif - start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); -@@ -1039,7 +1039,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon + ref->start_point_in_screen_ = +@@ -1051,7 +1051,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +36,7 @@ // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -2088,7 +2088,7 @@ void TabDragController::CompleteDrag() { +@@ -2103,7 +2103,7 @@ void TabDragController::CompleteDrag() { } // If source window was maximized - maximize the new window as well. @@ -45,7 +45,7 @@ // Keeping maximized state breaks snap to Grid on Windows when dragging // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in -@@ -2559,7 +2559,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2533,7 +2533,7 @@ TabDragController::Liveness TabDragController::GetLoca } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc index 617b71ed2158..aa24b62b85dd 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc -@@ -373,7 +373,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta +@@ -371,7 +371,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta // not become active. Setting this to false creates the need to explicitly // hide the hovercard on press, touch, and keyboard events. SetCanActivate(false); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc deleted file mode 100644 index 66107b4140a7..000000000000 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2024-02-23 21:04:38 UTC -+++ chrome/browser/ui/views/tabs/tab_hover_card_controller.cc -@@ -82,7 +82,7 @@ void FixWidgetStackOrder(views::Widget* widget, const - return; - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Ensure the hover card Widget assumes the highest z-order to avoid occlusion - // by other secondary UI Widgets (such as the omnibox Widget, see - // crbug.com/1226536). diff --git a/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc b/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc index a287dec4c0fc..3beeeac49d80 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/views/user_education/browser_user_education_service.cc -@@ -771,7 +771,7 @@ void MaybeRegisterChromeFeaturePromos( +@@ -790,7 +790,7 @@ void MaybeRegisterChromeFeaturePromos( FeaturePromoSpecification::AcceleratorInfo()) .SetBubbleArrow(HelpBubbleArrow::kTopLeft))); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc b/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc index 6022a727c73c..3d1d5c2b844b 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc -@@ -512,7 +512,7 @@ std::string GetFileExtension(FileExtension file_extens +@@ -514,7 +514,7 @@ std::string GetFileExtension(FileExtension file_extens } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) { SiteConfig config; bool is_app_found = false; -@@ -2093,7 +2093,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc +@@ -2101,7 +2101,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc if (app_name.empty()) { app_name = GetSiteConfiguration(site).app_name; } @@ -18,7 +18,7 @@ ASSERT_TRUE(override_registration_->test_override->IsShortcutCreated( profile(), app_id, app_name)); ASSERT_TRUE( -@@ -3407,7 +3407,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna +@@ -3415,7 +3415,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna app_state->id, app_state->name); ASSERT_TRUE(icon_color.has_value()); ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value())); @@ -27,7 +27,7 @@ ASSERT_TRUE(override_registration_->test_override->IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3422,7 +3422,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3430,7 +3430,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site); ASSERT_TRUE(app_state); base::ScopedAllowBlockingForTesting allow_blocking; @@ -36,7 +36,7 @@ ASSERT_FALSE(override_registration_->test_override->IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3432,7 +3432,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3440,7 +3440,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis void WebAppIntegrationTestDriver::CheckSiteHandlesFile( Site site, FileExtension file_extension) { @@ -45,7 +45,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3448,7 +3448,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile +@@ -3456,7 +3456,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile( Site site, FileExtension file_extension) { @@ -54,7 +54,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -4271,7 +4271,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu +@@ -4279,7 +4279,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu base::FilePath shortcut_dir, const std::string& app_name, const webapps::AppId& app_id) { @@ -63,7 +63,7 @@ return override_registration_->test_override->GetShortcutPath( profile(), shortcut_dir, app_id, app_name); #else -@@ -4471,7 +4471,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre +@@ -4479,7 +4479,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre const webapps::AppId& id) { base::ScopedAllowBlockingForTesting allow_blocking; bool is_shortcut_and_icon_correct = false; @@ -72,7 +72,7 @@ bool is_shortcut_correct = override_registration_->test_override->IsShortcutCreated(profile, id, name); -@@ -4515,7 +4515,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr +@@ -4523,7 +4523,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr do_icon_colors_match = (expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value()); } diff --git a/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__dialogs.h b/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__dialogs.h index 8048ef20514b..b98497cb15ac 100644 --- a/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__dialogs.h +++ b/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__dialogs.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/web_applications/web_app_dialogs.h.orig 2024-01-30 07:53:34 UTC +--- chrome/browser/ui/web_applications/web_app_dialogs.h.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/web_applications/web_app_dialogs.h -@@ -21,7 +21,7 @@ +@@ -22,7 +22,7 @@ #include "ui/gfx/native_widget_types.h" static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || diff --git a/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h b/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h index 0281bb883a80..ec1b77b95154 100644 --- a/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h +++ b/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/web_applications/web_app_ui_manager_impl.h.orig 2024-02-23 21:04:38 UTC +--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.h.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.h -@@ -221,7 +221,7 @@ class WebAppUiManagerImpl : public BrowserListObserver +@@ -222,7 +222,7 @@ class WebAppUiManagerImpl : public BrowserListObserver UninstallCompleteCallback uninstall_complete_callback, webapps::UninstallResultCode uninstall_code); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc index cb1cbdf9c303..f3075d8e0560 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc -@@ -392,7 +392,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create +@@ -391,7 +391,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create + app_info->start_url = start_url; bool deprecated_app = false; - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) auto* context = extension_system_->extension_service()->GetBrowserContext(); deprecated_app = extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id()); -@@ -456,7 +456,7 @@ void AppHomePageHandler::FillExtensionInfoList( +@@ -454,7 +454,7 @@ void AppHomePageHandler::FillExtensionInfoList( + continue; } - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) auto* context = extension_system_->extension_service()->GetBrowserContext(); const bool is_deprecated_app = extensions::IsExtensionUnsupportedDeprecatedApp(context, diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index c19487ba111e..ed18e457674c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -200,7 +200,7 @@ +@@ -201,7 +201,7 @@ #include "chrome/browser/ui/webui/chromeos/chrome_url_disabled/chrome_url_disabled_ui.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" #endif -@@ -226,17 +226,17 @@ +@@ -227,17 +227,17 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -30,7 +30,7 @@ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #endif -@@ -388,7 +388,7 @@ bool IsAboutUI(const GURL& url) { +@@ -389,7 +389,7 @@ bool IsAboutUI(const GURL& url) { #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -39,7 +39,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -625,7 +625,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -627,7 +627,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUIMobileSetupHost) return &NewWebUI<ash::cellular_setup::MobileSetupUI>; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -48,7 +48,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -681,7 +681,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -683,7 +683,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -57,7 +57,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -736,27 +736,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -738,27 +738,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc b/www/chromium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc index f7694fa5939b..6a43726189a2 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc @@ -1,15 +1,15 @@ ---- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig 2023-11-03 10:09:45 UTC +--- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc -@@ -6,7 +6,7 @@ - +@@ -7,7 +7,7 @@ #include "build/build_config.h" + #include "components/enterprise/buildflags/buildflags.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "base/base64url.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" -@@ -29,7 +29,7 @@ namespace utils { +@@ -38,7 +38,7 @@ namespace enterprise_connectors::utils { namespace { @@ -18,7 +18,7 @@ connectors_internals::mojom::KeyTrustLevel ParseTrustLevel( BPKUR::KeyTrustLevel trust_level) { -@@ -97,7 +97,7 @@ connectors_internals::mojom::Int32ValuePtr ToMojomValu +@@ -189,7 +189,7 @@ connectors_internals::mojom::CertificateMetadataPtr Co } // namespace connectors_internals::mojom::KeyInfoPtr GetKeyInfo() { diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc deleted file mode 100644 index c7926a99108c..000000000000 --- a/www/chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- chrome/browser/ui/webui/realbox/realbox_handler.cc.orig 2024-03-22 08:19:40 UTC -+++ chrome/browser/ui/webui/realbox/realbox_handler.cc -@@ -148,7 +148,7 @@ const char* kMacShareIconResourceName = - #elif BUILDFLAG(IS_WIN) - const char* kWinShareIconResourceName = - "//resources/cr_components/omnibox/icons/win_share.svg"; --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const char* kLinuxShareIconResourceName = - "//resources/cr_components/omnibox/icons/share.svg"; - #else -@@ -207,7 +207,7 @@ static void DefineChromeRefreshRealboxIcons() { - #elif BUILDFLAG(IS_WIN) - kWinShareIconResourceName = - "//resources/cr_components/omnibox/icons/win_share_cr23.svg"; --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - kLinuxShareIconResourceName = - "//resources/cr_components/omnibox/icons/share_cr23.svg"; - #else -@@ -837,7 +837,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN - icon.name == omnibox::kShareWinChromeRefreshIcon.name) { - return kWinShareIconResourceName; - } --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (icon.name == omnibox::kShareIcon.name || - icon.name == omnibox::kShareLinuxChromeRefreshIcon.name) { - return kLinuxShareIconResourceName; diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index f0fee1f3fa5a..ac49a8f73a28 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc @@ -138,7 +138,7 @@ #include "ash/webui/settings/public/constants/routes.mojom.h" @@ -36,7 +36,7 @@ {"overscrollHistoryNavigationTitle", IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE}, {"overscrollHistoryNavigationSubtitle", -@@ -432,7 +432,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -433,7 +433,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, {"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT}, {"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT}, @@ -45,7 +45,7 @@ {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -442,7 +442,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -443,7 +443,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif @@ -54,7 +54,7 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -467,7 +467,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -468,7 +468,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_web__applications_extension__status__utils.h b/www/chromium/files/patch-chrome_browser_web__applications_extension__status__utils.h index 4bb635a4f3b2..4e4891829d10 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_extension__status__utils.h +++ b/www/chromium/files/patch-chrome_browser_web__applications_extension__status__utils.h @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/extension_status_utils.h.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/web_applications/extension_status_utils.h.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/web_applications/extension_status_utils.h -@@ -56,7 +56,7 @@ bool ClearExternalExtensionUninstalled(content::Browse +@@ -55,7 +55,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo + bool ClearExternalExtensionUninstalled(content::BrowserContext* context, const std::string& extension_id); - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - // Returns whether |extension_id| is a Chrome App and should be blocked by the - // Chrome Apps Deprecation. Policy installed Chrome Apps are still allowed, and - // all apps are allowed if the deprecation feature flag is not enabled. +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // If this method returns true, then |extension_id| will not be launchable. + // + // The eventual goal is that this method should return true for all hosted apps, diff --git a/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc b/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc index 4f915cc85885..daa2195539c9 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc @@ -1,20 +1,20 @@ ---- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/web_applications/extensions/extension_status_utils.cc -@@ -26,7 +26,7 @@ namespace { +@@ -25,7 +25,7 @@ namespace { + const char* g_preinstalled_app_for_testing = nullptr; - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // TODO(b/268221237): Remove this allow-list. const char kDefaultAllowedExtensionIds[] = "alhngdkjgnedakdlnamimgfihgkmenbh," -@@ -116,7 +116,7 @@ bool ClearExternalExtensionUninstalled(content::Browse +@@ -114,7 +114,7 @@ bool ClearExternalExtensionUninstalled(content::Browse + extension_id); } - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool IsExtensionUnsupportedDeprecatedApp(content::BrowserContext* context, const std::string& extension_id) { if (testing::g_enable_chrome_apps_for_testing) { diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc index f724163a3001..80cf5431f7c3 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc -@@ -440,7 +440,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B +@@ -441,7 +441,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B } } diff --git a/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc b/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc index a3bda1d01ea3..0745dcde1a70 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/web_applications/policy/web_app_policy_manager.cc -@@ -112,7 +112,7 @@ namespace web_app { +@@ -111,7 +111,7 @@ namespace web_app { BASE_FEATURE(kDesktopPWAsForceUnregisterOSIntegration, "DesktopPWAsForceUnregisterOSIntegration", diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__helpers.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__helpers.cc new file mode 100644 index 000000000000..023e12c1a417 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__helpers.cc @@ -0,0 +1,11 @@ +--- chrome/browser/web_applications/web_app_helpers.cc.orig 2024-04-19 13:02:56 UTC ++++ chrome/browser/web_applications/web_app_helpers.cc +@@ -146,7 +146,7 @@ bool IsValidWebAppUrl(const GURL& app_url) { + + bool allow_extension_apps = true; + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + // Stop allowing apps to be extension urls when the shortcuts are separated - + // they can be extension urls instead. + allow_extension_apps = diff --git a/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc index 32fc449eb238..d8a012492279 100644 --- a/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -805,7 +805,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc +@@ -859,7 +859,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc g_observer->ConfiguringCable(request_type); } diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index 3bb04a90da53..9c08a42d5dc8 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/chromium/files/patch-chrome_common_chrome__features.cc @@ -1,4 +1,4 @@ ---- chrome/common/chrome_features.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/common/chrome_features.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/common/chrome_features.cc @@ -81,7 +81,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims, #endif // BUILDFLAG(IS_MAC) @@ -18,7 +18,7 @@ // Enables the Restart background mode optimization. When all Chrome UI is // closed and it goes in the background, allows to restart the browser to // discard memory. -@@ -321,7 +321,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, +@@ -302,7 +302,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, BASE_FEATURE(kDesktopPWAsRunOnOsLogin, "DesktopPWAsRunOnOsLogin", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -360,7 +360,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, +@@ -341,7 +341,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ // Controls whether Chrome Apps are supported. See https://crbug.com/1221251. // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome // Apps will not launch and will be marked in the UI as deprecated. -@@ -383,7 +383,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati +@@ -364,7 +364,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati BASE_FEATURE(kDnsOverHttps, "DnsOverHttps", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -45,16 +45,16 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -399,7 +399,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa - const base::FeatureParam<bool> kDnsOverHttpsShowUiParam { - &kDnsOverHttps, "ShowUi", +@@ -380,7 +380,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa + const base::FeatureParam<bool> kDnsOverHttpsShowUiParam{&kDnsOverHttps, + "ShowUi", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - true + true #else - false -@@ -974,7 +974,7 @@ BASE_FEATURE(kLacrosSharedComponentsDir, + false +@@ -918,7 +918,7 @@ BASE_FEATURE(kLacrosSharedComponentsDir, base::FEATURE_ENABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -63,7 +63,7 @@ BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -987,7 +987,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -931,7 +931,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit &kLinuxLowMemoryMonitor, "critical_level", 255}; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index 15e7deb95acc..34deb0d43a6a 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.h +++ b/www/chromium/files/patch-chrome_common_chrome__features.h @@ -1,4 +1,4 @@ ---- chrome/common/chrome_features.h.orig 2024-03-22 08:19:40 UTC +--- chrome/common/chrome_features.h.orig 2024-04-19 13:02:56 UTC +++ chrome/common/chrome_features.h @@ -60,13 +60,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims); #endif // BUILDFLAG(IS_MAC) @@ -16,7 +16,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -228,7 +228,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -216,7 +216,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -25,7 +25,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kShortcutsNotApps); -@@ -572,7 +572,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -543,7 +543,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLacrosSharedComponentsDir); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -34,7 +34,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor); COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel; -@@ -580,7 +580,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -551,7 +551,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index 7fb0c081ae50..fa4d6225172b 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/common/chrome_switches.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/common/chrome_switches.cc -@@ -876,14 +876,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -881,14 +881,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h index b5b2d88bc9a6..84ac2cd95949 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/chromium/files/patch-chrome_common_chrome__switches.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.h.orig 2024-03-22 08:19:40 UTC +--- chrome/common/chrome_switches.h.orig 2024-04-19 13:02:56 UTC +++ chrome/common/chrome_switches.h -@@ -276,12 +276,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -277,12 +277,12 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index c87b826c641b..3f8d14cc4b97 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.h +++ b/www/chromium/files/patch-chrome_common_pref__names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2024-03-22 08:19:40 UTC +--- chrome/common/pref_names.h.orig 2024-04-19 13:02:56 UTC +++ chrome/common/pref_names.h -@@ -1304,7 +1304,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u +@@ -1288,7 +1288,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. inline constexpr char kSystemTheme[] = "extensions.theme.system_theme"; #endif -@@ -1435,7 +1435,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = +@@ -1428,7 +1428,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = "browser.show_update_promotion_info_bar"; #endif @@ -18,7 +18,7 @@ // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). inline constexpr char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -1995,7 +1995,7 @@ inline constexpr char kDownloadDefaultDirectory[] = +@@ -1997,7 +1997,7 @@ inline constexpr char kDownloadDefaultDirectory[] = inline constexpr char kDownloadDirUpgraded[] = "download.directory_upgrade"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +27,7 @@ inline constexpr char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -2427,14 +2427,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s +@@ -2431,14 +2431,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data"; #endif // BUILDFLAG(IS_WIN) @@ -44,7 +44,7 @@ // Records whether the user has seen an HTTP auth "negotiate" header. inline constexpr char kReceivedHttpAuthNegotiateHeader[] = "net.received_http_auth_negotiate_headers"; -@@ -2512,7 +2512,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM +@@ -2516,7 +2516,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM inline constexpr char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -53,7 +53,7 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3030,7 +3030,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] +@@ -3034,7 +3034,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] #endif // BUILDFLAG(IS_CHROMEOS) @@ -62,7 +62,7 @@ // Defines administrator-set availability of Chrome for Testing. inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed"; #endif -@@ -3580,7 +3580,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes +@@ -3584,7 +3584,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes inline constexpr char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -71,7 +71,7 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. inline constexpr char kAllowSystemNotifications[] = -@@ -3629,7 +3629,7 @@ inline constexpr char kCACertificateManagementAllowed[ +@@ -3633,7 +3633,7 @@ inline constexpr char kCACertificateManagementAllowed[ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -80,7 +80,7 @@ inline constexpr char kEnforceLocalAnchorConstraintsEnabled[] = "enforce_local_anchor_constraints_enabled"; #endif -@@ -3943,7 +3943,7 @@ inline constexpr char kThrottleNonVisibleCrossOriginIf +@@ -3941,7 +3941,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ inline constexpr char kNewBaseUrlInheritanceBehaviorAllowed[] = "new_base_url_inheritance_behavior_allowed"; diff --git a/www/chromium/files/patch-chrome_common_url__constants.h b/www/chromium/files/patch-chrome_common_url__constants.h index 11752ddccd21..798d05061d7d 100644 --- a/www/chromium/files/patch-chrome_common_url__constants.h +++ b/www/chromium/files/patch-chrome_common_url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/url_constants.h.orig 2024-03-22 08:19:40 UTC +--- chrome/common/url_constants.h.orig 2024-04-19 13:02:56 UTC +++ chrome/common/url_constants.h -@@ -842,7 +842,7 @@ inline constexpr char kPhoneHubPermissionLearnMoreURL[ +@@ -848,7 +848,7 @@ inline constexpr char kPhoneHubPermissionLearnMoreURL[ "https://support.google.com/chromebook?p=multidevice"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc index 9b88f692c2f7..c0adbb4040a8 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/common/webui_url_constants.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/common/webui_url_constants.cc -@@ -512,18 +512,18 @@ const char kOsUISystemURL[] = "os://system"; +@@ -518,18 +518,18 @@ const char kOsUISystemURL[] = "os://system"; const char kOsUIVersionURL[] = "os://version"; #endif @@ -22,7 +22,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -@@ -538,14 +538,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr +@@ -544,14 +544,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -39,7 +39,7 @@ const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; const char kChromeUIIntroHost[] = "intro"; -@@ -564,7 +564,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro +@@ -570,7 +570,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif @@ -48,7 +48,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; -@@ -644,7 +644,7 @@ const char kCookiesSubPagePath[] = "/cookies"; +@@ -650,7 +650,7 @@ const char kCookiesSubPagePath[] = "/cookies"; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -57,7 +57,7 @@ const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; const char kChromeUIWebAppSettingsHost[] = "app-settings"; #endif -@@ -875,7 +875,7 @@ const char* const kChromeDebugURLs[] = { +@@ -879,7 +879,7 @@ const char* const kChromeDebugURLs[] = { blink::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h index 5f1d042ce187..cdb49c4775ac 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.h +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.h.orig 2024-03-22 08:19:40 UTC +--- chrome/common/webui_url_constants.h.orig 2024-04-19 13:02:56 UTC +++ chrome/common/webui_url_constants.h -@@ -432,24 +432,24 @@ extern const char kOsUISystemURL[]; +@@ -437,24 +437,24 @@ extern const char kOsUISystemURL[]; extern const char kOsUIVersionURL[]; #endif @@ -29,7 +29,7 @@ extern const char kChromeUIWebAppSettingsURL[]; extern const char kChromeUIWebAppSettingsHost[]; #endif -@@ -464,14 +464,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; +@@ -469,14 +469,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -46,7 +46,7 @@ extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIIntroHost[]; -@@ -487,7 +487,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -492,7 +492,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif diff --git a/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc b/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc index 7b086505708e..ecb4426cda6b 100644 --- a/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc +++ b/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc @@ -1,6 +1,6 @@ ---- chrome/renderer/chrome_render_frame_observer.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/renderer/chrome_render_frame_observer.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/renderer/chrome_render_frame_observer.cc -@@ -351,7 +351,7 @@ void ChromeRenderFrameObserver::WillDetach(blink::Deta +@@ -358,7 +358,7 @@ void ChromeRenderFrameObserver::WillDetach(blink::Deta void ChromeRenderFrameObserver::DraggableRegionsChanged() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc b/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc index bce81e4bed7e..167d26944f95 100644 --- a/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc +++ b/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc @@ -1,6 +1,6 @@ ---- chrome/services/speech/audio_source_fetcher_impl.cc.orig 2023-11-03 10:09:45 UTC +--- chrome/services/speech/audio_source_fetcher_impl.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/services/speech/audio_source_fetcher_impl.cc -@@ -129,7 +129,7 @@ void AudioSourceFetcherImpl::Start( +@@ -132,7 +132,7 @@ void AudioSourceFetcherImpl::Start( // TODO(crbug.com/1185978): Check implementation / sandbox policy on Mac and // Windows. diff --git a/www/chromium/files/patch-chrome_updater_util_posix__util.cc b/www/chromium/files/patch-chrome_updater_util_posix__util.cc index ad0dddc812ae..027078c4b3b3 100644 --- a/www/chromium/files/patch-chrome_updater_util_posix__util.cc +++ b/www/chromium/files/patch-chrome_updater_util_posix__util.cc @@ -1,6 +1,6 @@ ---- chrome/updater/util/posix_util.cc.orig 2024-01-30 07:53:34 UTC +--- chrome/updater/util/posix_util.cc.orig 2024-04-19 13:02:56 UTC +++ chrome/updater/util/posix_util.cc -@@ -18,7 +18,7 @@ +@@ -20,7 +20,7 @@ #include "chrome/updater/updater_branding.h" #include "chrome/updater/util/util.h" diff --git a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc index c504cc5cdc88..fe4ae096f6a0 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/personal_data_manager.cc.orig 2024-03-22 08:19:40 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2024-04-19 13:02:56 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -2329,7 +2329,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -1063,7 +1063,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc index 8710a5313e18..b21eb54a1cf2 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2024-02-23 21:04:38 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2024-04-19 13:02:56 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -281,7 +281,7 @@ BASE_FEATURE(kAutofillEnableVirtualCards, +@@ -276,7 +276,7 @@ BASE_FEATURE(kAutofillEnableVirtualCards, bool ShouldShowImprovedUserConsentForCreditCardSave() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc index 6cd9c0d87d48..940471bcf112 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2024-03-22 08:19:40 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2024-04-19 13:02:56 UTC +++ components/feature_engagement/public/feature_configurations.cc -@@ -93,7 +93,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro +@@ -94,7 +94,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro std::optional<FeatureConfig> GetClientSideFeatureConfig( const base::Feature* feature) { @@ -9,7 +9,7 @@ // The IPH bubble for link capturing has a trigger set to ANY so that it // always shows up. The per app specific guardrails are independently stored -@@ -112,7 +112,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi +@@ -113,7 +113,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ if (kIPHPasswordsAccountStorageFeature.name == feature->name) { std::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -1555,7 +1555,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi +@@ -1393,7 +1393,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -28,3 +28,12 @@ if (kIPHAutofillExternalAccountProfileSuggestionFeature.name == feature->name) { +@@ -1965,7 +1966,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi + } + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + if (kIPHDeepScanPromptRemovalFeature.name == feature->name) { + std::optional<FeatureConfig> config = FeatureConfig(); + config->valid = true; diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc index bfb576b87e44..ebc4d1c30bf0 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2024-03-22 08:19:40 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2024-04-19 13:02:56 UTC +++ components/feature_engagement/public/feature_constants.cc @@ -18,7 +18,7 @@ BASE_FEATURE(kIPHDemoMode, "IPH_DemoMode", base::FEATU BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ BASE_FEATURE(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -611,7 +611,8 @@ const char kGestureInProductHelpDaysBetweenOccurrences +@@ -584,7 +584,8 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,7 +19,7 @@ BASE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature, "IPH_AutofillExternalAccountProfileSuggestion", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -736,7 +737,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, +@@ -712,7 +713,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, base::FEATURE_DISABLED_BY_DEFAULT); #endif diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h index 6f064b691d5e..a2694ce6d6d7 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2024-03-22 08:19:40 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2024-04-19 13:02:56 UTC +++ components/feature_engagement/public/feature_constants.h @@ -20,7 +20,7 @@ BASE_DECLARE_FEATURE(kIPHDemoMode); BASE_DECLARE_FEATURE(kIPHDummyFeature); @@ -9,7 +9,7 @@ BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature); BASE_DECLARE_FEATURE(kIPHCompanionSidePanelFeature); BASE_DECLARE_FEATURE(kIPHCompanionSidePanelRegionSearchFeature); -@@ -255,7 +255,7 @@ extern const char kGestureInProductHelpDaysBetweenOccu +@@ -244,7 +244,7 @@ BASE_DECLARE_FEATURE(kDefaultBrowserTriggerCriteriaExp #endif // BUILDFLAG(IS_IOS) @@ -17,8 +17,8 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) BASE_DECLARE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature); - BASE_DECLARE_FEATURE(kIPHAutofillVirtualCardCVCSuggestionFeature); -@@ -303,7 +303,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea + BASE_DECLARE_FEATURE(kIPHAutofillManualFallbackFeature); +@@ -293,7 +293,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea BASE_DECLARE_FEATURE(kIPHScalableIphGamingFeature); #endif diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc index 8b155d9a4205..4e8fc171317d 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc @@ -1,7 +1,7 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2024-03-22 08:19:40 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2024-04-19 13:02:56 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -157,7 +157,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHiOSPostDefaultAbandonmentPromoFeature, +@@ -147,7 +147,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHiOSOverflowMenuCustomizationFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -9,7 +9,7 @@ &kIPHBatterySaverModeFeature, &kIPHCompanionSidePanelFeature, &kIPHCompanionSidePanelRegionSearchFeature, -@@ -213,7 +213,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -203,7 +203,7 @@ const base::Feature* const kAllFeatures[] = { #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -17,8 +17,8 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) &kIPHAutofillExternalAccountProfileSuggestionFeature, - &kIPHAutofillVirtualCardCVCSuggestionFeature, -@@ -261,7 +261,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHAutofillManualFallbackFeature, +@@ -252,7 +252,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHScalableIphGamingFeature, #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h index f620f51982b6..e0887e68c85f 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_list.h.orig 2024-03-22 08:19:40 UTC +--- components/feature_engagement/public/feature_list.h.orig 2024-04-19 13:02:56 UTC +++ components/feature_engagement/public/feature_list.h -@@ -290,7 +290,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSPostDefaultAbandonmentPr +@@ -266,7 +266,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSOverflowMenuCustomizatio #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode"); DEFINE_VARIATION_PARAM(kIPHCompanionSidePanelFeature, "IPH_CompanionSidePanel"); DEFINE_VARIATION_PARAM(kIPHCompanionSidePanelRegionSearchFeature, -@@ -386,7 +386,7 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, +@@ -362,7 +362,7 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -18,7 +18,7 @@ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) DEFINE_VARIATION_PARAM(kIPHAutofillExternalAccountProfileSuggestionFeature, "IPH_AutofillExternalAccountProfileSuggestion"); -@@ -470,7 +470,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF +@@ -448,7 +448,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming"); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -27,16 +27,16 @@ DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch, "IPH_DesktopPWAsLinkCapturingLaunch"); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -618,7 +618,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHiOSSwipeToolbarToChangeTabFeature), - VARIATION_ENTRY(kIPHiOSPostDefaultAbandonmentPromoFeature), +@@ -598,7 +598,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHiOSPromoGenericDefaultBrowserFeature), + VARIATION_ENTRY(kIPHiOSOverflowMenuCustomizationFeature), #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) VARIATION_ENTRY(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHCompanionSidePanelFeature), VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature), -@@ -674,7 +674,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -654,7 +654,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -44,8 +44,8 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) VARIATION_ENTRY(kIPHAutofillExternalAccountProfileSuggestionFeature), - VARIATION_ENTRY(kIPHAutofillVirtualCardCVCSuggestionFeature), -@@ -722,7 +722,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHAutofillManualFallbackFeature), +@@ -703,7 +703,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHScalableIphGamingFeature), #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/chromium/files/patch-components_gwp__asan_client_gwp__asan.cc b/www/chromium/files/patch-components_gwp__asan_client_gwp__asan.cc index 0c00056684d7..61de4efc0c09 100644 --- a/www/chromium/files/patch-components_gwp__asan_client_gwp__asan.cc +++ b/www/chromium/files/patch-components_gwp__asan_client_gwp__asan.cc @@ -1,6 +1,6 @@ ---- components/gwp_asan/client/gwp_asan.cc.orig 2024-03-22 08:19:40 UTC +--- components/gwp_asan/client/gwp_asan.cc.orig 2024-04-19 13:02:56 UTC +++ components/gwp_asan/client/gwp_asan.cc -@@ -71,7 +71,7 @@ namespace { +@@ -72,7 +72,7 @@ namespace { // ProcessSamplingBoost is the multiplier to increase the // ProcessSamplingProbability in scenarios where we want to perform additional // testing (e.g., on canary/dev builds). diff --git a/www/chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc b/www/chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc index c52529f2b241..e1d7a7024019 100644 --- a/www/chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc +++ b/www/chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc @@ -1,6 +1,6 @@ ---- components/gwp_asan/crash_handler/crash_analyzer.cc.orig 2024-03-22 08:19:40 UTC +--- components/gwp_asan/crash_handler/crash_analyzer.cc.orig 2024-04-19 13:02:56 UTC +++ components/gwp_asan/crash_handler/crash_analyzer.cc -@@ -31,7 +31,7 @@ +@@ -30,7 +30,7 @@ #include "third_party/crashpad/crashpad/snapshot/process_snapshot.h" #include "third_party/crashpad/crashpad/util/process/process_memory.h" @@ -9,7 +9,7 @@ #include <signal.h> #elif BUILDFLAG(IS_APPLE) #include <mach/exception_types.h> -@@ -91,7 +91,7 @@ bool CrashAnalyzer::GetExceptionInfo( +@@ -90,7 +90,7 @@ bool CrashAnalyzer::GetExceptionInfo( crashpad::VMAddress CrashAnalyzer::GetAccessAddress( const crashpad::ExceptionSnapshot& exception) { diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc index daca0b03cbdb..30fba75b837a 100644 --- a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc +++ b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc @@ -1,6 +1,6 @@ ---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2024-02-23 21:04:38 UTC +--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2024-04-19 13:02:56 UTC +++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -827,7 +827,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -817,7 +817,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C // backport, having it behave differently than in stable would be a bigger // problem. TODO: Does this work in later macOS releases? #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc index f335e09434db..6f82591d441f 100644 --- a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc +++ b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc @@ -1,6 +1,6 @@ ---- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2024-02-23 21:04:38 UTC +--- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2024-04-19 13:02:56 UTC +++ components/network_session_configurator/browser/network_session_configurator_unittest.cc -@@ -793,7 +793,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) { +@@ -781,7 +781,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) { TEST_F(NetworkSessionConfiguratorTest, DefaultCacheBackend) { #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-components_omnibox_browser_omnibox__edit__model.cc b/www/chromium/files/patch-components_omnibox_browser_omnibox__edit__model.cc deleted file mode 100644 index 91e1a01cb4dd..000000000000 --- a/www/chromium/files/patch-components_omnibox_browser_omnibox__edit__model.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- components/omnibox/browser/omnibox_edit_model.cc.orig 2024-01-30 07:53:34 UTC -+++ components/omnibox/browser/omnibox_edit_model.cc -@@ -24,6 +24,7 @@ - #include "base/trace_event/typed_macros.h" - #include "build/branding_buildflags.h" - #include "build/build_config.h" -+#include "build/branding_buildflags.h" - #include "components/bookmarks/browser/bookmark_model.h" - #include "components/dom_distiller/core/url_constants.h" - #include "components/dom_distiller/core/url_utils.h" diff --git a/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc index 56b9a9e6f5ba..c6578afcb5ee 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/features/password_features.cc.orig 2024-03-22 08:19:40 UTC +--- components/password_manager/core/browser/features/password_features.cc.orig 2024-04-19 13:02:56 UTC +++ components/password_manager/core/browser/features/password_features.cc -@@ -24,7 +24,7 @@ BASE_FEATURE(kButterOnDesktopFollowup, +@@ -30,7 +30,7 @@ BASE_FEATURE(kButterOnDesktopFollowup, BASE_FEATURE(kClearUndecryptablePasswordsOnSync, "ClearUndecryptablePasswordsInSync", @@ -9,12 +9,12 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -99,7 +99,7 @@ BASE_FEATURE(kPasswordManagerLogToTerminal, - "PasswordManagerLogToTerminal", +@@ -99,7 +99,7 @@ BASE_FEATURE(kPasswordManualFallbackAvailable, + "PasswordManualFallbackAvailable", base::FEATURE_DISABLED_BY_DEFAULT); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_FEATURE(kRestartToGainAccessToKeychain, "RestartToGainAccessToKeychain", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.h b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.h index 39fa8905f4c3..049bf94129ef 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.h +++ b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.h @@ -1,8 +1,8 @@ ---- components/password_manager/core/browser/features/password_features.h.orig 2024-03-22 08:19:40 UTC +--- components/password_manager/core/browser/features/password_features.h.orig 2024-04-19 13:02:56 UTC +++ components/password_manager/core/browser/features/password_features.h -@@ -95,7 +95,7 @@ BASE_DECLARE_FEATURE(kPasswordManagerEnableSenderServi - // terminal. - BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal); +@@ -94,7 +94,7 @@ BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal); + // Enables triggering password suggestions through the context menu. + BASE_DECLARE_FEATURE(kPasswordManualFallbackAvailable); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc index cf7ff8750bc1..9dee653dd7cc 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/password_form_manager.cc.orig 2024-03-22 08:19:40 UTC +--- components/password_manager/core/browser/password_form_manager.cc.orig 2024-04-19 13:02:56 UTC +++ components/password_manager/core/browser/password_form_manager.cc @@ -58,7 +58,7 @@ #include "components/webauthn/android/webauthn_cred_man_delegate.h" @@ -18,7 +18,7 @@ bool ShouldShowKeychainErrorBubble( std::optional<PasswordStoreBackendError> backend_error) { if (!backend_error.has_value()) { -@@ -800,7 +800,7 @@ void PasswordFormManager::OnFetchCompleted() { +@@ -833,7 +833,7 @@ void PasswordFormManager::OnFetchCompleted() { error.value().type); } diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc index 4dbf4146e67a..99848778c074 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_manager.cc.orig 2024-03-22 08:19:40 UTC +--- components/password_manager/core/browser/password_manager.cc.orig 2024-04-19 13:02:56 UTC +++ components/password_manager/core/browser/password_manager.cc -@@ -361,7 +361,7 @@ void PasswordManager::RegisterProfilePrefs( +@@ -363,7 +363,7 @@ void PasswordManager::RegisterProfilePrefs( registry->RegisterListPref(prefs::kPasswordManagerPromoCardsList); #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true); diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h b/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h index a571073e6428..1db403eb1809 100644 --- a/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h +++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h @@ -1,6 +1,6 @@ ---- components/password_manager/core/common/password_manager_pref_names.h.orig 2024-03-22 08:19:40 UTC +--- components/password_manager/core/common/password_manager_pref_names.h.orig 2024-04-19 13:02:56 UTC +++ components/password_manager/core/common/password_manager_pref_names.h -@@ -328,7 +328,7 @@ inline constexpr char kPasswordManagerPromoCardsList[] +@@ -332,7 +332,7 @@ inline constexpr char kPasswordManagerPromoCardsList[] inline constexpr char kPasswordSharingEnabled[] = "password_manager.password_sharing_enabled"; diff --git a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc index b66671da5ad2..2b2a34c5e735 100644 --- a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc +++ b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc @@ -1,6 +1,6 @@ ---- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2024-03-22 08:19:40 UTC +--- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2024-04-19 13:02:56 UTC +++ components/policy/core/browser/policy_pref_mapping_test.cc -@@ -322,7 +322,7 @@ class PolicyTestCase { +@@ -413,7 +413,7 @@ class PolicyTestCase { const std::string os("chromeos_lacros"); #elif BUILDFLAG(IS_IOS) const std::string os("ios"); diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc index 09e1b7859f50..5b90f912cdf3 100644 --- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc +++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc @@ -1,6 +1,6 @@ ---- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2024-03-22 08:19:40 UTC +--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2024-04-19 13:02:56 UTC +++ components/policy/core/common/cloud/cloud_policy_client.cc -@@ -578,7 +578,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason +@@ -594,7 +594,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason fetch_request->set_invalidation_payload(invalidation_payload_); } } diff --git a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py index 77ee94e3be5f..6682ee179894 100644 --- a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py +++ b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py @@ -1,6 +1,6 @@ ---- components/policy/tools/generate_policy_source.py.orig 2023-09-13 12:11:42 UTC +--- components/policy/tools/generate_policy_source.py.orig 2024-04-19 13:02:56 UTC +++ components/policy/tools/generate_policy_source.py -@@ -37,9 +37,9 @@ PLATFORM_STRINGS = { +@@ -38,9 +38,9 @@ PLATFORM_STRINGS = { 'ios': ['ios'], 'fuchsia': ['fuchsia'], 'chrome.win': ['win'], diff --git a/www/chromium/files/patch-components_safe__browsing_core_common_features.cc b/www/chromium/files/patch-components_safe__browsing_core_common_features.cc deleted file mode 100644 index 9ff494307405..000000000000 --- a/www/chromium/files/patch-components_safe__browsing_core_common_features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/safe_browsing/core/common/features.cc.orig 2024-03-22 08:19:40 UTC -+++ components/safe_browsing/core/common/features.cc -@@ -240,7 +240,7 @@ BASE_FEATURE(kSafeBrowsingSkipSubresources, - BASE_FEATURE(kSafeBrowsingSkipSubresources2, - "SafeBrowsingSkipSubResources2", - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc b/www/chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc index 6f249c239aa3..73a9a89910bb 100644 --- a/www/chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc +++ b/www/chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc @@ -1,6 +1,6 @@ ---- components/search_engines/search_engine_choice/search_engine_choice_service.cc.orig 2024-03-22 08:19:40 UTC +--- components/search_engines/search_engine_choice/search_engine_choice_service.cc.orig 2024-04-19 13:02:56 UTC +++ components/search_engines/search_engine_choice/search_engine_choice_service.cc -@@ -428,7 +428,7 @@ void SearchEngineChoiceService::PreprocessPrefsForRepr +@@ -437,7 +437,7 @@ void SearchEngineChoiceService::PreprocessPrefsForRepr int SearchEngineChoiceService::GetCountryIdInternal() { // `country_codes::kCountryIDAtInstall` may not be set yet. diff --git a/www/chromium/files/patch-components_search__engines_template__url__service.cc b/www/chromium/files/patch-components_search__engines_template__url__service.cc index 2376cc901f94..318b49f0155c 100644 --- a/www/chromium/files/patch-components_search__engines_template__url__service.cc +++ b/www/chromium/files/patch-components_search__engines_template__url__service.cc @@ -1,6 +1,6 @@ ---- components/search_engines/template_url_service.cc.orig 2024-03-22 08:19:40 UTC +--- components/search_engines/template_url_service.cc.orig 2024-04-19 13:02:56 UTC +++ components/search_engines/template_url_service.cc -@@ -2925,7 +2925,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( +@@ -2930,7 +2930,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( std::unique_ptr<EnterpriseSiteSearchManager> TemplateURLService::GetEnterpriseSiteSearchManager(PrefService* prefs) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_services_screen__ai_public_cpp_utilities.cc b/www/chromium/files/patch-components_services_screen__ai_public_cpp_utilities.cc deleted file mode 100644 index 094e6ab8b4e8..000000000000 --- a/www/chromium/files/patch-components_services_screen__ai_public_cpp_utilities.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/services/screen_ai/public/cpp/utilities.cc.orig 2024-03-22 08:19:40 UTC -+++ components/services/screen_ai/public/cpp/utilities.cc -@@ -34,7 +34,7 @@ constexpr char kScreenAIDlcRootPath[] = - #endif - - #if BUILDFLAG(ENABLE_SCREEN_AI_BROWSERTESTS) --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - constexpr base::FilePath::CharType kScreenAIResourcePathForTests[] = - FILE_PATH_LITERAL("third_party/screen-ai/linux/resources"); - #elif BUILDFLAG(IS_MAC) diff --git a/www/chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc b/www/chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc deleted file mode 100644 index 2b34a2dce1c6..000000000000 --- a/www/chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2024-01-30 07:53:34 UTC -+++ components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc -@@ -53,6 +53,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi - } - } - -+#if !BUILDFLAG(IS_BSD) - auto* instance = sandbox::policy::SandboxLinux::GetInstance(); - - std::vector<BrokerFilePermission> permissions{ -@@ -75,6 +76,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi - sandbox::syscall_broker::COMMAND_OPEN}), - permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), options); - instance->EngageNamespaceSandboxIfPossible(); -+#endif - - return true; - } diff --git a/www/chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h b/www/chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h deleted file mode 100644 index 6b3f292f8d21..000000000000 --- a/www/chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h +++ /dev/null @@ -1,16 +0,0 @@ ---- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h.orig 2023-04-28 17:01:32 UTC -+++ components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h -@@ -5,7 +5,13 @@ - #ifndef COMPONENTS_SERVICES_SCREEN_AI_SANDBOX_SCREEN_AI_SANDBOX_HOOK_LINUX_H_ - #define COMPONENTS_SERVICES_SCREEN_AI_SANDBOX_SCREEN_AI_SANDBOX_HOOK_LINUX_H_ - -+#include "build/build_config.h" -+ -+#if BUILDFLAG(IS_BSD) -+#include "sandbox/policy/sandbox.h" -+#else - #include "sandbox/policy/linux/sandbox_linux.h" -+#endif - - namespace screen_ai { - diff --git a/www/chromium/files/patch-components_signin_public_base_signin__switches.cc b/www/chromium/files/patch-components_signin_public_base_signin__switches.cc index ec456f8ed02f..f62411cb27e8 100644 --- a/www/chromium/files/patch-components_signin_public_base_signin__switches.cc +++ b/www/chromium/files/patch-components_signin_public_base_signin__switches.cc @@ -1,6 +1,6 @@ ---- components/signin/public/base/signin_switches.cc.orig 2024-03-22 08:19:40 UTC +--- components/signin/public/base/signin_switches.cc.orig 2024-04-19 13:02:56 UTC +++ components/signin/public/base/signin_switches.cc -@@ -121,7 +121,7 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled( +@@ -132,7 +132,7 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled( } #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ @@ -9,7 +9,7 @@ BASE_FEATURE(kMinorModeRestrictionsForHistorySyncOptIn, "MinorModeRestrictionsForHistorySyncOptIn", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -130,7 +130,7 @@ constexpr int kMinorModeRestrictionsFetchDeadlineDefau +@@ -141,7 +141,7 @@ constexpr int kMinorModeRestrictionsFetchDeadlineDefau #if BUILDFLAG(IS_ANDROID) // Based on Signin.AccountCapabilities.UserVisibleLatency 400; diff --git a/www/chromium/files/patch-components_signin_public_base_signin__switches.h b/www/chromium/files/patch-components_signin_public_base_signin__switches.h index 0b12cf8168dc..867df2dec5a5 100644 --- a/www/chromium/files/patch-components_signin_public_base_signin__switches.h +++ b/www/chromium/files/patch-components_signin_public_base_signin__switches.h @@ -1,6 +1,6 @@ ---- components/signin/public/base/signin_switches.h.orig 2024-03-22 08:19:40 UTC +--- components/signin/public/base/signin_switches.h.orig 2024-04-19 13:02:56 UTC +++ components/signin/public/base/signin_switches.h -@@ -119,7 +119,7 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled( +@@ -123,7 +123,7 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled( // Controls the view mode for (history) sync screen. #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ diff --git a/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc b/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc index 12bc5fc0af82..5deae2c26986 100644 --- a/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc +++ b/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc @@ -1,4 +1,4 @@ ---- components/supervised_user/core/browser/supervised_user_service.cc.orig 2024-03-22 08:19:40 UTC +--- components/supervised_user/core/browser/supervised_user_service.cc.orig 2024-04-19 13:02:56 UTC +++ components/supervised_user/core/browser/supervised_user_service.cc @@ -170,7 +170,7 @@ FirstTimeInterstitialBannerState SupervisedUserService const FirstTimeInterstitialBannerState original_state) { @@ -6,6 +6,6 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_IOS) + BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) - if (supervised_user::CanDisplayFirstTimeInterstitialBanner()) { - if (original_state != FirstTimeInterstitialBannerState::kSetupComplete && - can_show_first_time_interstitial_banner_) { + if (original_state != FirstTimeInterstitialBannerState::kSetupComplete && + can_show_first_time_interstitial_banner_) { + target_state = FirstTimeInterstitialBannerState::kNeedToShow; diff --git a/www/chromium/files/patch-components_supervised__user_core_common_features.cc b/www/chromium/files/patch-components_supervised__user_core_common_features.cc index de4ea8a4d0ba..ceaa4133d4b8 100644 --- a/www/chromium/files/patch-components_supervised__user_core_common_features.cc +++ b/www/chromium/files/patch-components_supervised__user_core_common_features.cc @@ -1,33 +1,6 @@ ---- components/supervised_user/core/common/features.cc.orig 2024-03-22 08:19:40 UTC +--- components/supervised_user/core/common/features.cc.orig 2024-04-19 13:02:56 UTC +++ components/supervised_user/core/common/features.cc -@@ -66,7 +66,7 @@ bool IsLocalWebApprovalsEnabled() { - BASE_FEATURE(kFilterWebsitesForSupervisedUsersOnDesktopAndIOS, - "FilterWebsitesForSupervisedUsersOnDesktopAndIOS", - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_IOS) -+ BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT); - #else - base::FEATURE_DISABLED_BY_DEFAULT); -@@ -74,7 +74,7 @@ BASE_FEATURE(kFilterWebsitesForSupervisedUsersOnDeskto - - BASE_FEATURE(kSupervisedPrefsControlledBySupervisedStore, - "SupervisedPrefsControlledBySupervisedStore", --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT); - #else - base::FEATURE_DISABLED_BY_DEFAULT); -@@ -84,7 +84,7 @@ BASE_FEATURE(kSupervisedPrefsControlledBySupervisedSto - // users in various UI surfaces. - BASE_FEATURE(kEnableManagedByParentUi, - "EnableManagedByParentUi", --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT); - #else - base::FEATURE_DISABLED_BY_DEFAULT); -@@ -94,7 +94,7 @@ BASE_FEATURE(kEnableSupervisedUserSkipParentApprovalTo +@@ -63,7 +63,7 @@ BASE_FEATURE(kEnableSupervisedUserSkipParentApprovalTo "EnableSupervisedUserSkipParentApprovalToInstallExtensions", base::FEATURE_DISABLED_BY_DEFAULT); @@ -36,12 +9,12 @@ BASE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop, "EnableExtensionsPermissionsForSupervisedUsersOnDesktop", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -143,7 +143,7 @@ bool IsChildAccountSupervisionEnabled() { +@@ -74,7 +74,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens + #if BUILDFLAG(IS_CHROMEOS) return base::FeatureList::IsEnabled( - supervised_user:: - kFilterWebsitesForSupervisedUsersOnDesktopAndIOS) || --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - base::FeatureList::IsEnabled( - supervised_user:: - kEnableExtensionsPermissionsForSupervisedUsersOnDesktop) || + kEnableSupervisedUserSkipParentApprovalToInstallExtensions); +-#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + bool skipParentApprovalEnabled = base::FeatureList::IsEnabled( + kEnableSupervisedUserSkipParentApprovalToInstallExtensions); + bool permissionExtensionsForSupervisedUsersEnabled = diff --git a/www/chromium/files/patch-components_supervised__user_core_common_features.h b/www/chromium/files/patch-components_supervised__user_core_common_features.h index 89b0702f651c..4b1713457f73 100644 --- a/www/chromium/files/patch-components_supervised__user_core_common_features.h +++ b/www/chromium/files/patch-components_supervised__user_core_common_features.h @@ -1,6 +1,6 @@ ---- components/supervised_user/core/common/features.h.orig 2024-03-22 08:19:40 UTC +--- components/supervised_user/core/common/features.h.orig 2024-04-19 13:02:56 UTC +++ components/supervised_user/core/common/features.h -@@ -28,7 +28,7 @@ extern const base::FeatureParam<std::string> kManagedB +@@ -23,7 +23,7 @@ BASE_DECLARE_FEATURE(kLocalWebApprovals); BASE_DECLARE_FEATURE( kEnableSupervisedUserSkipParentApprovalToInstallExtensions); diff --git a/www/chromium/files/patch-components_supervised__user_core_common_pref__names.h b/www/chromium/files/patch-components_supervised__user_core_common_pref__names.h new file mode 100644 index 000000000000..782809dbe592 --- /dev/null +++ b/www/chromium/files/patch-components_supervised__user_core_common_pref__names.h @@ -0,0 +1,11 @@ +--- components/supervised_user/core/common/pref_names.h.orig 2024-04-19 13:02:56 UTC ++++ components/supervised_user/core/common/pref_names.h +@@ -131,7 +131,7 @@ inline constexpr char kFirstTimeInterstitialBannerStat + "profile.managed.banner_state"; + + #if BUILDFLAG(ENABLE_EXTENSIONS) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // An integer pref that stores the current state of the local extension + // parent approval migration when the feature + // `kEnableSupervisedUserSkipParentApprovalToInstallExtensions` becomes enabled. diff --git a/www/chromium/files/patch-components_sync_base_features.cc b/www/chromium/files/patch-components_sync_base_features.cc index 71eedf43533e..59a5a0612642 100644 --- a/www/chromium/files/patch-components_sync_base_features.cc +++ b/www/chromium/files/patch-components_sync_base_features.cc @@ -1,6 +1,6 @@ ---- components/sync/base/features.cc.orig 2024-03-22 08:19:40 UTC +--- components/sync/base/features.cc.orig 2024-04-19 13:02:56 UTC +++ components/sync/base/features.cc -@@ -122,7 +122,7 @@ BASE_FEATURE(kEnablePreferencesAccountStorage, +@@ -126,7 +126,7 @@ BASE_FEATURE(kEnablePreferencesAccountStorage, BASE_FEATURE(kSyncPollImmediatelyOnEveryStartup, "SyncPollImmediatelyOnEveryStartup2", #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc index 77374ca3ad2e..a0a51fe0e131 100644 --- a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc +++ b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2024-03-22 08:19:40 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2024-04-19 13:02:56 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1519,7 +1519,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1526,7 +1526,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetDeviceQueue() ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, vk_format, yuv_color_space, ycbcr_info); diff --git a/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc index ac00413cd507..3711cc5ce6a2 100644 --- a/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc +++ b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display/skia_renderer.cc.orig 2024-03-22 08:19:40 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2024-04-19 13:02:56 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1466,7 +1466,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1448,7 +1448,7 @@ void SkiaRenderer::ClearFramebuffer() { if (current_frame()->current_render_pass->has_transparent_background) { ClearCanvas(SkColors::kTransparent); } else { diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc index 2e300d44c8b4..1a3381f6e758 100644 --- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2024-03-22 08:19:40 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2024-04-19 13:02:56 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -@@ -112,7 +112,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -111,7 +111,7 @@ RootCompositorFrameSinkImpl::Create( output_surface->SetNeedsSwapSizeNotifications( params->send_swap_size_notifications); @@ -9,10 +9,10 @@ // For X11, we need notify client about swap completion after resizing, so the // client can use it for synchronize with X11 WM. output_surface->SetNeedsSwapSizeNotifications(true); -@@ -712,7 +712,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw - #if BUILDFLAG(IS_ANDROID) - if (display_client_ && enable_swap_competion_callback_) +@@ -649,7 +649,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw + if (display_client_ && enable_swap_completion_callback_) { display_client_->DidCompleteSwapWithSize(pixel_size); + } -#elif BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) +#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) if (display_client_ && pixel_size != last_swap_pixel_size_) { diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h index 643202be2986..68f6c90f56aa 100644 --- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -1,8 +1,8 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2024-01-30 07:53:34 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2024-04-19 13:02:56 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -210,7 +210,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl - // to actually unref. - LocalSurfaceId to_evict_on_next_draw_and_swap_ = LocalSurfaceId(); +@@ -209,7 +209,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl + // See comments on `EvictionHandler`. + EvictionHandler eviction_handler_; -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn index e8d75b0234ce..6eca2da664cc 100644 --- a/www/chromium/files/patch-content_browser_BUILD.gn +++ b/www/chromium/files/patch-content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- content/browser/BUILD.gn.orig 2024-03-22 08:19:40 UTC +--- content/browser/BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ content/browser/BUILD.gn -@@ -2476,6 +2476,13 @@ source_set("browser") { +@@ -2406,6 +2406,13 @@ source_set("browser") { deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] } diff --git a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc index a436ee6f07ee..fd852fcb7398 100644 --- a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc @@ -1,14 +1,14 @@ ---- content/browser/browser_child_process_host_impl.cc.orig 2024-03-22 08:19:40 UTC +--- content/browser/browser_child_process_host_impl.cc.orig 2024-04-19 13:02:56 UTC +++ content/browser/browser_child_process_host_impl.cc -@@ -326,6 +326,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo - switches::kDisableBestEffortTasks, - switches::kDisableLogging, - switches::kEnableLogging, +@@ -329,6 +329,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo + switches::kMojoCoreLibraryPath, + switches::kPerfettoDisableInterning, + switches::kTraceToConsole, + switches::kDisableUnveil, - switches::kIPCConnectionTimeout, - switches::kLogBestEffortTasks, - switches::kLogFile, -@@ -650,7 +651,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() + }; + cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches); + +@@ -644,7 +645,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() ->child_process()); #endif diff --git a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.h b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.h index b11fc9ac6cfa..01c48bc74f14 100644 --- a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.h +++ b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.h @@ -1,4 +1,4 @@ ---- content/browser/browser_child_process_host_impl.h.orig 2024-02-23 21:04:38 UTC +--- content/browser/browser_child_process_host_impl.h.orig 2024-04-19 13:02:56 UTC +++ content/browser/browser_child_process_host_impl.h @@ -34,7 +34,7 @@ #include "base/win/object_watcher.h" @@ -9,7 +9,7 @@ #include "content/browser/child_thread_type_switcher_linux.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -264,7 +264,7 @@ class BrowserChildProcessHostImpl +@@ -266,7 +266,7 @@ class BrowserChildProcessHostImpl std::unique_ptr<tracing::SystemTracingService> system_tracing_service_; #endif diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc index 9dc4630888eb..d212da0d13ad 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2024-03-22 08:19:40 UTC +--- content/browser/browser_main_loop.cc.orig 2024-04-19 13:02:56 UTC +++ content/browser/browser_main_loop.cc -@@ -250,6 +250,12 @@ +@@ -251,6 +251,12 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" #endif @@ -13,7 +13,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -555,6 +561,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -556,6 +562,12 @@ int BrowserMainLoop::EarlyInitialization() { // by now since a thread to start the ServiceManager has been created // before the browser main loop starts. DCHECK(SandboxHostLinux::GetInstance()->IsInitialized()); @@ -26,7 +26,7 @@ #endif // GLib's spawning of new processes is buggy, so it's important that at this -@@ -592,7 +604,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -593,7 +605,7 @@ int BrowserMainLoop::EarlyInitialization() { base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing); #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-content_browser_child__process__launcher__helper.h b/www/chromium/files/patch-content_browser_child__process__launcher__helper.h index 7130e42a209b..6358752b531b 100644 --- a/www/chromium/files/patch-content_browser_child__process__launcher__helper.h +++ b/www/chromium/files/patch-content_browser_child__process__launcher__helper.h @@ -1,6 +1,6 @@ ---- content/browser/child_process_launcher_helper.h.orig 2024-03-22 08:19:40 UTC +--- content/browser/child_process_launcher_helper.h.orig 2024-04-19 13:02:56 UTC +++ content/browser/child_process_launcher_helper.h -@@ -271,7 +271,7 @@ class ChildProcessLauncherHelper +@@ -293,7 +293,7 @@ class ChildProcessLauncherHelper std::unique_ptr<SandboxedProcessLauncherDelegate> delegate_; base::WeakPtr<ChildProcessLauncher> child_process_launcher_; diff --git a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc index 8425af68d1ba..2d1843fe277c 100644 --- a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc +++ b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc @@ -1,6 +1,6 @@ ---- content/browser/compositor/viz_process_transport_factory.cc.orig 2024-01-30 07:53:34 UTC +--- content/browser/compositor/viz_process_transport_factory.cc.orig 2024-04-19 13:02:56 UTC +++ content/browser/compositor/viz_process_transport_factory.cc -@@ -118,7 +118,7 @@ class HostDisplayClient : public viz::HostDisplayClien +@@ -105,7 +105,7 @@ class HostDisplayClient : public viz::HostDisplayClien HostDisplayClient& operator=(const HostDisplayClient&) = delete; // viz::HostDisplayClient: diff --git a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc index ff5ba368436d..6ad4ea61d97a 100644 --- a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc +++ b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc @@ -1,6 +1,6 @@ ---- content/browser/devtools/protocol/system_info_handler.cc.orig 2023-09-13 12:11:42 UTC +--- content/browser/devtools/protocol/system_info_handler.cc.orig 2024-04-19 13:02:56 UTC +++ content/browser/devtools/protocol/system_info_handler.cc -@@ -49,7 +49,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS +@@ -50,7 +50,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS // 1046598, and 1153667. // Windows builds need more time -- see Issue 873112 and 1004472. // Mac builds need more time - see Issue angleproject:6182. diff --git a/www/chromium/files/patch-content_browser_gpu_compositor__util.cc b/www/chromium/files/patch-content_browser_gpu_compositor__util.cc index 853dd4cfb41c..d9084c632939 100644 --- a/www/chromium/files/patch-content_browser_gpu_compositor__util.cc +++ b/www/chromium/files/patch-content_browser_gpu_compositor__util.cc @@ -1,20 +1,20 @@ ---- content/browser/gpu/compositor_util.cc.orig 2024-01-30 07:53:34 UTC +--- content/browser/gpu/compositor_util.cc.orig 2024-04-19 13:02:56 UTC +++ content/browser/gpu/compositor_util.cc -@@ -149,7 +149,7 @@ const GpuFeatureData GetGpuFeatureData( - {"video_decode", - SafeGetFeatureStatus(gpu_feature_info, - gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE), +@@ -149,7 +149,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( + "video_decode", + SafeGetFeatureStatus( + gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE, -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - !base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) || + !base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) || #endif // BUILDFLAG(IS_LINUX) - command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode), -@@ -160,7 +160,7 @@ const GpuFeatureData GetGpuFeatureData( - {"video_encode", - SafeGetFeatureStatus(gpu_feature_info, - gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE), + command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode)), +@@ -161,7 +161,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( + "video_encode", + SafeGetFeatureStatus( + gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE, -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - !base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux), + !base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux)), #else - command_line.HasSwitch(switches::kDisableAcceleratedVideoEncode), + command_line.HasSwitch(switches::kDisableAcceleratedVideoEncode)), diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc index d64286c43285..f7c90c69ea55 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl.cc.orig 2023-04-28 17:01:32 UTC +--- content/browser/gpu/gpu_data_manager_impl.cc.orig 2024-04-19 13:02:56 UTC +++ content/browser/gpu/gpu_data_manager_impl.cc -@@ -405,7 +405,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged( +@@ -394,7 +394,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged( private_->OnDisplayMetricsChanged(display, changed_metrics); } diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h index 1ee580a41d04..a9f6b6851ab3 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h +++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl.h.orig 2023-04-28 17:01:32 UTC +--- content/browser/gpu/gpu_data_manager_impl.h.orig 2024-04-19 13:02:56 UTC +++ content/browser/gpu/gpu_data_manager_impl.h -@@ -221,7 +221,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa +@@ -217,7 +217,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa void OnDisplayMetricsChanged(const display::Display& display, uint32_t changed_metrics) override; diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc index 5b3f6ee6c17c..da4369a9a95f 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2024-03-22 08:19:40 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2024-04-19 13:02:56 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1807,7 +1807,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1673,7 +1673,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode); } diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h index 5a5be812c8b8..7e878d710b14 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h +++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2023-09-13 12:11:42 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2024-04-19 13:02:56 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.h -@@ -151,7 +151,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { +@@ -149,7 +149,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { void OnDisplayMetricsChanged(const display::Display& display, uint32_t changed_metrics); @@ -9,7 +9,7 @@ bool IsGpuMemoryBufferNV12Supported(); void SetGpuMemoryBufferNV12Supported(bool supported); #endif // BUILDFLAG(IS_LINUX) -@@ -306,7 +306,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { +@@ -301,7 +301,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { bool application_is_visible_ = true; bool disable_gpu_compositing_ = false; diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc index 38727bd529f0..f3ec73f9128b 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,14 +1,14 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2024-03-22 08:19:40 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2024-04-19 13:02:56 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -261,6 +261,7 @@ static const char* const kSwitchNames[] = { - switches::kEnableGpuRasterization, - switches::kEnableSkiaGraphite, - switches::kEnableLogging, +@@ -264,6 +264,7 @@ static const char* const kSwitchNames[] = { + switches::kEnableLowEndDeviceMode, + switches::kDisableSkiaGraphite, + switches::kDisableLowEndDeviceMode, + switches::kDisableUnveil, - switches::kDoubleBufferCompositing, - switches::kHeadless, - switches::kLoggingLevel, -@@ -295,7 +296,7 @@ static const char* const kSwitchNames[] = { + switches::kProfilingAtStart, + switches::kProfilingFile, + switches::kProfilingFlush, +@@ -290,7 +291,7 @@ static const char* const kSwitchNames[] = { switches::kDisableExplicitDmaFences, switches::kOzoneDumpFile, #endif diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index 54ee1950b4fd..93e6ac80fc40 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2024-03-22 08:19:40 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2024-04-19 13:02:56 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -224,7 +224,7 @@ +@@ -225,7 +225,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -966,7 +966,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -967,7 +967,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,7 +18,7 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1148,7 +1148,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1149,7 +1149,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public IOThreadHostImpl& operator=(const IOThreadHostImpl& other) = delete; void SetPid(base::ProcessId child_pid) { @@ -27,7 +27,7 @@ child_thread_type_switcher_.SetPid(child_pid); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -1165,7 +1165,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1166,7 +1166,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } @@ -36,7 +36,7 @@ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -1259,7 +1259,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1260,7 +1260,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public std::unique_ptr<service_manager::BinderRegistry> binders_; mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; @@ -45,7 +45,7 @@ mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory> video_encode_accelerator_factory_remote_; ChildThreadTypeSwitcher child_thread_type_switcher_; -@@ -3352,7 +3352,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( +@@ -3353,7 +3353,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( base::TimeTicks::UnixEpoch().since_origin().InMicroseconds())); } diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc index d30979048522..a018ade93ce6 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2024-02-23 21:04:38 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2024-04-19 13:02:56 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -270,7 +270,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -272,7 +272,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index 46e9ad7e916f..fb935548bb16 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2024-03-22 08:19:40 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2024-04-19 13:02:56 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -118,7 +118,7 @@ +@@ -119,7 +119,7 @@ #include "ui/gfx/gdi_util.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/text_input_flags.h" -@@ -451,7 +451,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -452,7 +452,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); @@ -18,8 +18,8 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1694,7 +1694,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { - return GetTextInputManager() && GetTextInputManager()->should_do_learning(); +@@ -1705,7 +1705,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { + return host_->delegate() && host_->delegate()->ShouldDoLearning(); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2526,7 +2526,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2538,7 +2538,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2710,7 +2710,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2722,7 +2722,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h index 982104643768..ad519c87a011 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2024-03-22 08:19:40 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2024-04-19 13:02:56 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.h -@@ -258,7 +258,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -259,7 +259,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/chromium/files/patch-content_browser_utility__process__host.cc b/www/chromium/files/patch-content_browser_utility__process__host.cc index 3276fdb7b82f..61d6657762f5 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host.cc +++ b/www/chromium/files/patch-content_browser_utility__process__host.cc @@ -1,4 +1,4 @@ ---- content/browser/utility_process_host.cc.orig 2024-03-22 08:19:40 UTC +--- content/browser/utility_process_host.cc.orig 2024-04-19 13:02:56 UTC +++ content/browser/utility_process_host.cc @@ -61,7 +61,7 @@ #include "content/browser/v8_snapshot_files.h" @@ -33,10 +33,19 @@ file_data_(std::make_unique<ChildProcessLauncherFileData>()), -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + allowed_gpu_(false), gpu_client_(nullptr, base::OnTaskRunnerDeleter(nullptr)), #endif - client_(std::move(client)) { -@@ -431,7 +431,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -234,7 +234,7 @@ void UtilityProcessHost::SetPinUser32() { + #endif // BUILDFLAG(IS_WIN) + + void UtilityProcessHost::SetAllowGpuClient() { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + allowed_gpu_ = true; + #endif + } +@@ -434,7 +434,7 @@ bool UtilityProcessHost::StartProcess() { file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload()); #endif // BUILDFLAG(IS_POSIX) @@ -45,7 +54,7 @@ // The network service should have access to the parent directories // necessary for its usage. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { -@@ -442,13 +442,13 @@ bool UtilityProcessHost::StartProcess() { +@@ -445,13 +445,13 @@ bool UtilityProcessHost::StartProcess() { } #endif // BUILDFLAG(IS_LINUX) diff --git a/www/chromium/files/patch-content_browser_utility__process__host.h b/www/chromium/files/patch-content_browser_utility__process__host.h index 34cc52d1338e..5563360ffdb5 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host.h +++ b/www/chromium/files/patch-content_browser_utility__process__host.h @@ -1,4 +1,4 @@ ---- content/browser/utility_process_host.h.orig 2024-02-23 21:04:38 UTC +--- content/browser/utility_process_host.h.orig 2024-04-19 13:02:56 UTC +++ content/browser/utility_process_host.h @@ -39,7 +39,7 @@ namespace base { class Thread; @@ -9,12 +9,12 @@ namespace viz { class GpuClient; } // namespace viz -@@ -225,7 +225,7 @@ class CONTENT_EXPORT UtilityProcessHost +@@ -228,7 +228,7 @@ class CONTENT_EXPORT UtilityProcessHost std::vector<RunServiceDeprecatedCallback> pending_run_service_callbacks_; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + bool allowed_gpu_; std::unique_ptr<viz::GpuClient, base::OnTaskRunnerDeleter> gpu_client_; #endif - diff --git a/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc b/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc index 48ff081a2245..01d070d67677 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc +++ b/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc @@ -1,4 +1,4 @@ ---- content/browser/utility_process_host_receiver_bindings.cc.orig 2024-02-23 21:04:38 UTC +--- content/browser/utility_process_host_receiver_bindings.cc.orig 2024-04-19 13:02:56 UTC +++ content/browser/utility_process_host_receiver_bindings.cc @@ -10,12 +10,12 @@ #include "content/public/browser/content_browser_client.h" @@ -28,6 +28,6 @@ #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - if (auto gpu_receiver = receiver.As<viz::mojom::Gpu>()) { - gpu_client_ = - content::CreateGpuClient(std::move(gpu_receiver), base::DoNothing()); + if (allowed_gpu_) { + // TODO(crbug.com/328099369) Remove once all clients get this directly. + if (auto gpu_receiver = receiver.As<viz::mojom::Gpu>()) { diff --git a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc index 1e0e0cef4b08..d2b6094e510b 100644 --- a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc +++ b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc @@ -1,4 +1,4 @@ ---- content/browser/web_contents/web_contents_view_aura.cc.orig 2024-03-22 08:19:40 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2024-04-19 13:02:56 UTC +++ content/browser/web_contents/web_contents_view_aura.cc @@ -174,7 +174,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr<aura::Window> window_; @@ -18,7 +18,7 @@ // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over // a shortcut so we add it first. -@@ -1322,7 +1322,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1330,7 +1330,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* // Linux window managers like to handle raise-on-click themselves. If we // raise-on-click manually, this may override user settings that prevent // focus-stealing. diff --git a/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc index 134c7cd1f13a..12922a8aeae2 100644 --- a/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc +++ b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc @@ -1,6 +1,6 @@ ---- content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2024-01-30 07:53:34 UTC +--- content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2024-04-19 13:02:56 UTC +++ content/browser/zygote_host/zygote_host_impl_linux.cc -@@ -19,8 +19,10 @@ +@@ -18,8 +18,10 @@ #include "build/chromeos_buildflags.h" #include "content/common/zygote/zygote_commands_linux.h" #include "content/common/zygote/zygote_communication_linux.h" @@ -11,7 +11,7 @@ #include "sandbox/linux/services/credentials.h" #include "sandbox/linux/services/namespace_sandbox.h" #include "sandbox/linux/suid/client/setuid_sandbox_host.h" -@@ -38,6 +40,7 @@ namespace content { +@@ -37,6 +39,7 @@ namespace content { namespace { @@ -19,7 +19,7 @@ // Receive a fixed message on fd and return the sender's PID. // Returns true if the message received matches the expected message. bool ReceiveFixedMessage(int fd, -@@ -59,6 +62,7 @@ bool ReceiveFixedMessage(int fd, +@@ -58,6 +61,7 @@ bool ReceiveFixedMessage(int fd, return false; return true; } @@ -27,7 +27,7 @@ } // namespace -@@ -68,9 +72,13 @@ ZygoteHost* ZygoteHost::GetInstance() { +@@ -67,9 +71,13 @@ ZygoteHost* ZygoteHost::GetInstance() { } ZygoteHostImpl::ZygoteHostImpl() @@ -41,7 +41,7 @@ sandbox_binary_(), zygote_pids_lock_(), zygote_pids_() {} -@@ -83,6 +91,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() { +@@ -82,6 +90,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() { } void ZygoteHostImpl::Init(const base::CommandLine& command_line) { @@ -49,7 +49,7 @@ if (command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) { return; } -@@ -133,6 +142,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com +@@ -132,6 +141,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com "you can try using --" << sandbox::policy::switches::kNoSandbox << "."; } @@ -57,7 +57,7 @@ } void ZygoteHostImpl::AddZygotePid(pid_t pid) { -@@ -157,6 +167,7 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -156,6 +166,7 @@ pid_t ZygoteHostImpl::LaunchZygote( base::CommandLine* cmd_line, base::ScopedFD* control_fd, base::FileHandleMappingVector additional_remapped_fds) { @@ -65,7 +65,7 @@ int fds[2]; CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, fds)); CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0])); -@@ -225,9 +236,12 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -224,9 +235,12 @@ pid_t ZygoteHostImpl::LaunchZygote( AddZygotePid(pid); return pid; diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index eed48a2848c3..1d04f98784ee 100644 --- a/www/chromium/files/patch-content_common_BUILD.gn +++ b/www/chromium/files/patch-content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/common/BUILD.gn.orig 2024-02-23 21:04:38 UTC +--- content/common/BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ content/common/BUILD.gn -@@ -442,20 +442,29 @@ source_set("common") { +@@ -444,19 +444,28 @@ source_set("common") { } if (is_linux || is_chromeos) { @@ -22,7 +22,6 @@ public_deps += [ "//sandbox/policy" ] deps += [ ":sandbox_support_linux", - ":set_process_title_linux", "//media/gpu:buildflags", "//sandbox/linux:sandbox_services", - "//sandbox/linux:seccomp_bpf", @@ -35,13 +34,3 @@ if (use_v4l2_codec) { deps += [ "//media/gpu/v4l2" ] } -@@ -525,6 +534,9 @@ if (is_linux || is_chromeos) { - public = [ "set_process_title_linux.h" ] - sources = [ "set_process_title_linux.cc" ] - deps = [ "//base" ] -+ if (is_bsd) { -+ sources -= [ "set_process_title_linux.cc" ] -+ } - } - } - diff --git a/www/chromium/files/patch-content_common_features.cc b/www/chromium/files/patch-content_common_features.cc index 69d40aa62b6d..a4b0ea019803 100644 --- a/www/chromium/files/patch-content_common_features.cc +++ b/www/chromium/files/patch-content_common_features.cc @@ -1,6 +1,6 @@ ---- content/common/features.cc.orig 2024-03-22 08:19:40 UTC +--- content/common/features.cc.orig 2024-04-19 13:02:56 UTC +++ content/common/features.cc -@@ -166,7 +166,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe +@@ -169,7 +169,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe base::FEATURE_DISABLED_BY_DEFAULT); // Enables error reporting for JS errors inside DevTools frontend host @@ -9,7 +9,7 @@ BASE_FEATURE(kEnableDevToolsJsErrorReporting, "EnableDevToolsJsErrorReporting", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -262,7 +262,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin, +@@ -272,7 +272,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin, // process and having browser process handle adjusting thread properties (nice // value, c-group, latency sensitivity...) for children which have sandbox // restrictions. diff --git a/www/chromium/files/patch-content_common_features.h b/www/chromium/files/patch-content_common_features.h index 0642480c9cea..9b74dafa9b2e 100644 --- a/www/chromium/files/patch-content_common_features.h +++ b/www/chromium/files/patch-content_common_features.h @@ -1,6 +1,6 @@ ---- content/common/features.h.orig 2024-03-22 08:19:40 UTC +--- content/common/features.h.orig 2024-04-19 13:02:56 UTC +++ content/common/features.h -@@ -37,7 +37,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg +@@ -38,7 +38,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableBackForwardCacheForScreenReader); CONTENT_EXPORT BASE_DECLARE_FEATURE( kEnableBackForwardCacheForOngoingSubframeNavigation); @@ -9,7 +9,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableDevToolsJsErrorReporting); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnsureAllowBindingsIsAlwaysForWebUI); -@@ -61,7 +61,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> +@@ -63,7 +63,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> CONTENT_EXPORT BASE_DECLARE_FEATURE(kGpuInfoCollectionSeparatePrefetch); #endif CONTENT_EXPORT BASE_DECLARE_FEATURE(kGroupNIKByJoiningOrigin); diff --git a/www/chromium/files/patch-content_common_gpu__pre__sandbox__hook__bsd.cc b/www/chromium/files/patch-content_common_gpu__pre__sandbox__hook__bsd.cc index 116af54772ab..b3b5ba3fb25d 100644 --- a/www/chromium/files/patch-content_common_gpu__pre__sandbox__hook__bsd.cc +++ b/www/chromium/files/patch-content_common_gpu__pre__sandbox__hook__bsd.cc @@ -1,6 +1,6 @@ ---- content/common/gpu_pre_sandbox_hook_bsd.cc.orig 2024-01-30 07:53:34 UTC +--- content/common/gpu_pre_sandbox_hook_bsd.cc.orig 2024-04-19 13:02:56 UTC +++ content/common/gpu_pre_sandbox_hook_bsd.cc -@@ -0,0 +1,69 @@ +@@ -0,0 +1,68 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -27,7 +27,6 @@ +#include "build/build_config.h" +#include "build/buildflag.h" +#include "build/chromeos_buildflags.h" -+#include "content/common/set_process_title.h" +#include "content/public/common/content_switches.h" +#include "media/gpu/buildflags.h" + diff --git a/www/chromium/files/patch-content_common_gpu__pre__sandbox__hook__linux.h b/www/chromium/files/patch-content_common_gpu__pre__sandbox__hook__linux.h new file mode 100644 index 000000000000..c2eab1f687ba --- /dev/null +++ b/www/chromium/files/patch-content_common_gpu__pre__sandbox__hook__linux.h @@ -0,0 +1,16 @@ +--- content/common/gpu_pre_sandbox_hook_linux.h.orig 2024-04-19 13:02:56 UTC ++++ content/common/gpu_pre_sandbox_hook_linux.h +@@ -5,8 +5,13 @@ + #ifndef CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_LINUX_H_ + #define CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_LINUX_H_ + ++#include "build/build_config.h" + #include "base/component_export.h" ++#if BUILDFLAG(IS_BSD) ++#include "sandbox/policy/sandbox.h" ++#else + #include "sandbox/policy/linux/sandbox_linux.h" ++#endif + + namespace content { + diff --git a/www/chromium/files/patch-content_gpu_gpu__child__thread.cc b/www/chromium/files/patch-content_gpu_gpu__child__thread.cc index 144a3ea7f587..078c44304a3a 100644 --- a/www/chromium/files/patch-content_gpu_gpu__child__thread.cc +++ b/www/chromium/files/patch-content_gpu_gpu__child__thread.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_child_thread.cc.orig 2023-12-10 06:10:27 UTC +--- content/gpu/gpu_child_thread.cc.orig 2024-04-19 13:02:56 UTC +++ content/gpu/gpu_child_thread.cc -@@ -59,7 +59,7 @@ +@@ -58,7 +58,7 @@ #include "third_party/skia/include/ports/SkFontConfigInterface.h" #endif @@ -9,7 +9,7 @@ #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -143,7 +143,8 @@ void GpuChildThread::Init(const base::TimeTicks& proce +@@ -142,7 +142,8 @@ void GpuChildThread::Init(const base::TimeTicks& proce viz_main_.gpu_service()->set_start_time(process_start_time); diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index 2cc852a2044e..52a1c3350848 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_main.cc.orig 2024-03-22 08:19:40 UTC +--- content/gpu/gpu_main.cc.orig 2024-04-19 13:02:56 UTC +++ content/gpu/gpu_main.cc -@@ -91,7 +91,7 @@ +@@ -91,10 +91,14 @@ #include "sandbox/win/src/sandbox.h" #endif @@ -8,8 +8,15 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "content/child/sandboxed_process_thread_type_handler.h" #include "content/common/gpu_pre_sandbox_hook_linux.h" ++#if BUILDFLAG(IS_BSD) ++#include "sandbox/policy/sandbox.h" ++#else #include "sandbox/policy/linux/sandbox_linux.h" -@@ -114,7 +114,7 @@ namespace content { ++#endif + #include "sandbox/policy/sandbox_type.h" + #endif + +@@ -114,7 +118,7 @@ namespace content { namespace { @@ -18,7 +25,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -179,7 +179,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -179,7 +183,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { @@ -27,7 +34,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif BUILDFLAG(IS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -291,7 +291,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -291,7 +295,7 @@ int GpuMain(MainFunctionParams parameters) { std::make_unique<base::SingleThreadTaskExecutor>( gpu_preferences.message_pump_type); } @@ -36,7 +43,7 @@ #error "Unsupported Linux platform." #elif BUILDFLAG(IS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -328,7 +328,8 @@ int GpuMain(MainFunctionParams parameters) { +@@ -328,7 +332,8 @@ int GpuMain(MainFunctionParams parameters) { // before it. InitializeSkia(); @@ -46,7 +53,7 @@ // Thread type delegate of the process should be registered before // first thread type change in ChildProcess constructor. // It also needs to be registered before the process has multiple threads, -@@ -436,7 +437,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -436,7 +441,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { @@ -55,7 +62,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -476,7 +477,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -476,7 +481,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo sandbox_options.accelerated_video_encode_enabled = !gpu_prefs.disable_accelerated_video_encode; diff --git a/www/chromium/files/patch-content_public_browser_content__browser__client.cc b/www/chromium/files/patch-content_public_browser_content__browser__client.cc index cfcd065d69db..340ba95a4231 100644 --- a/www/chromium/files/patch-content_public_browser_content__browser__client.cc +++ b/www/chromium/files/patch-content_public_browser_content__browser__client.cc @@ -1,6 +1,6 @@ ---- content/public/browser/content_browser_client.cc.orig 2024-03-22 08:19:40 UTC +--- content/public/browser/content_browser_client.cc.orig 2024-04-19 13:02:56 UTC +++ content/public/browser/content_browser_client.cc -@@ -1277,7 +1277,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem +@@ -1283,7 +1283,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem // that can be adequately sandboxed. // Currently Android's network service will not run out of process or sandboxed, // so OutOfProcessSystemDnsResolution is not currently enabled on Android. diff --git a/www/chromium/files/patch-content_public_browser_service__process__host.cc b/www/chromium/files/patch-content_public_browser_service__process__host.cc new file mode 100644 index 000000000000..bd77d5fab65c --- /dev/null +++ b/www/chromium/files/patch-content_public_browser_service__process__host.cc @@ -0,0 +1,11 @@ +--- content/public/browser/service_process_host.cc.orig 2024-04-19 13:02:56 UTC ++++ content/public/browser/service_process_host.cc +@@ -76,7 +76,7 @@ ServiceProcessHost::Options& ServiceProcessHost::Optio + + ServiceProcessHost::Options& ServiceProcessHost::Options::WithGpuClient( + base::PassKey<ServiceProcessHostGpuClient> passkey) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + allow_gpu_client = true; + #endif + return *this; diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc index 1006428f467c..ed8436f3e825 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_features.cc.orig 2024-03-22 08:19:40 UTC +--- content/public/common/content_features.cc.orig 2024-04-19 13:02:56 UTC +++ content/public/common/content_features.cc -@@ -32,7 +32,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, +@@ -27,7 +27,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, "AudioServiceOutOfProcess", // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -44,7 +44,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, +@@ -39,7 +39,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, // kAudioServiceOutOfProcess feature is enabled. BASE_FEATURE(kAudioServiceSandbox, "AudioServiceSandbox", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1179,7 +1179,7 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1199,7 +1199,7 @@ BASE_FEATURE(kWebAssemblyTiering, BASE_FEATURE(kWebAssemblyTrapHandler, "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -27,7 +27,7 @@ defined(ARCH_CPU_X86_64)) || \ (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -1221,7 +1221,11 @@ BASE_FEATURE(kWebUICodeCache, +@@ -1241,7 +1241,11 @@ BASE_FEATURE(kWebUICodeCache, // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc index e0f4925eec2a..4b7ee87ee215 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.cc +++ b/www/chromium/files/patch-content_public_common_content__switches.cc @@ -1,4 +1,4 @@ ---- content/public/common/content_switches.cc.orig 2024-02-23 21:04:38 UTC +--- content/public/common/content_switches.cc.orig 2024-04-19 13:02:56 UTC +++ content/public/common/content_switches.cc @@ -366,6 +366,8 @@ const char kEnableIsolatedWebAppsInRenderer[] = // builds. @@ -9,7 +9,7 @@ // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables // triggering of change attribute of the NetInfo API when there is a change in // the connection type. -@@ -1009,7 +1011,7 @@ const char kPreventResizingContentsForTesting[] = +@@ -1007,7 +1009,7 @@ const char kPreventResizingContentsForTesting[] = // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h index 3803247c7880..80f69c9c4fad 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.h.orig 2024-01-30 07:53:34 UTC +--- content/public/common/content_switches.h.orig 2024-04-19 13:02:56 UTC +++ content/public/common/content_switches.h -@@ -115,6 +115,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe +@@ -113,6 +113,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[]; CONTENT_EXPORT extern const char kEnableLCDText[]; CONTENT_EXPORT extern const char kEnableLogging[]; @@ -8,7 +8,7 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -269,7 +270,7 @@ CONTENT_EXPORT extern const char kPreventResizingConte +@@ -268,7 +269,7 @@ CONTENT_EXPORT extern const char kPreventResizingConte // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc index 46274313602c..f55d22b10731 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,4 +1,4 @@ ---- content/renderer/render_thread_impl.cc.orig 2024-03-22 08:19:40 UTC +--- content/renderer/render_thread_impl.cc.orig 2024-04-19 13:02:56 UTC +++ content/renderer/render_thread_impl.cc @@ -203,6 +203,8 @@ @@ -27,7 +27,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) && -@@ -1753,7 +1755,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create +@@ -1769,7 +1771,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create bool enable_video_encode_accelerator) { mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider> vea_provider; diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index 52391dfe1bbd..db00816f6199 100644 --- a/www/chromium/files/patch-content_shell_BUILD.gn +++ b/www/chromium/files/patch-content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- content/shell/BUILD.gn.orig 2024-03-22 08:19:40 UTC +--- content/shell/BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ content/shell/BUILD.gn -@@ -1027,7 +1027,7 @@ group("content_shell_crash_test") { +@@ -1064,7 +1064,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc index 31e54525c09e..18fb4b97fea5 100644 --- a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc +++ b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc @@ -1,6 +1,6 @@ ---- content/shell/app/shell_main_delegate.cc.orig 2024-03-22 08:19:40 UTC +--- content/shell/app/shell_main_delegate.cc.orig 2024-04-19 13:02:56 UTC +++ content/shell/app/shell_main_delegate.cc -@@ -223,7 +223,7 @@ void ShellMainDelegate::PreSandboxStartup() { +@@ -283,7 +283,7 @@ void ShellMainDelegate::PreSandboxStartup() { // Reporting for sub-processes will be initialized in ZygoteForked. if (process_type != switches::kZygoteProcess) { crash_reporter::InitializeCrashpad(process_type.empty(), process_type); diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn deleted file mode 100644 index 5c7e5a36990f..000000000000 --- a/www/chromium/files/patch-content_test_BUILD.gn +++ /dev/null @@ -1,20 +0,0 @@ ---- content/test/BUILD.gn.orig 2024-03-22 08:19:40 UTC -+++ content/test/BUILD.gn -@@ -2278,7 +2278,7 @@ static_library("run_all_unittests") { - ":test_support", - "//base/test:test_support", - ] -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - deps += [ "//content/common:set_process_title_linux" ] - } - } -@@ -3388,7 +3388,7 @@ test("content_unittests") { - deps += [ "//third_party/boringssl" ] - } - -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - sources += [ "../common/set_process_title_linux_unittest.cc" ] - deps += [ "//content/common:set_process_title_linux" ] - } diff --git a/www/chromium/files/patch-content_utility_services.cc b/www/chromium/files/patch-content_utility_services.cc index 531f6b8528dc..398dec910413 100644 --- a/www/chromium/files/patch-content_utility_services.cc +++ b/www/chromium/files/patch-content_utility_services.cc @@ -1,6 +1,6 @@ ---- content/utility/services.cc.orig 2024-03-22 08:19:40 UTC +--- content/utility/services.cc.orig 2024-04-19 13:02:56 UTC +++ content/utility/services.cc -@@ -67,7 +67,7 @@ +@@ -74,7 +74,7 @@ extern sandbox::TargetServices* g_utility_target_services; #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ #include "media/mojo/services/mojo_video_encode_accelerator_provider_factory.h" #include "sandbox/linux/services/libc_interceptor.h" #include "sandbox/policy/mojom/sandbox.mojom.h" -@@ -90,7 +90,7 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -97,7 +97,7 @@ extern sandbox::TargetServices* g_utility_target_servi #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -18,16 +18,23 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) #include "content/common/features.h" #include "media/mojo/services/stable_video_decoder_factory_process_service.h" // nogncheck -@@ -107,7 +107,7 @@ extern sandbox::TargetServices* g_utility_target_servi - #include "ui/accessibility/accessibility_features.h" +@@ -115,13 +115,13 @@ extern sandbox::TargetServices* g_utility_target_servi #endif // BUILDFLAG(ENABLE_ACCESSIBILITY_SERVICE) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ +- BUILDFLAG(ENABLE_VIDEO_EFFECTS) ++ BUILDFLAG(ENABLE_VIDEO_EFFECTS) || BUILDFLAG(IS_BSD) + #include "services/viz/public/cpp/gpu/gpu.h" + #include "services/viz/public/mojom/gpu.mojom.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || + // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(ENABLE_VIDEO_EFFECTS) + -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) #include "media/capture/capture_switches.h" - #include "services/viz/public/cpp/gpu/gpu.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || -@@ -226,7 +226,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi + // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -239,7 +239,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi << "task_policy_set TASK_QOS_POLICY"; #endif @@ -36,7 +43,7 @@ auto* command_line = base::CommandLine::ForCurrentProcess(); if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) { -@@ -312,7 +312,7 @@ auto RunVideoCapture( +@@ -328,7 +328,7 @@ auto RunVideoCapture( #endif // BUILDFLAG(IS_CHROMEOS_ASH) auto service = std::make_unique<UtilityThreadVideoCaptureServiceImpl>( std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault()); @@ -45,7 +52,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) { #else -@@ -356,7 +356,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( +@@ -407,7 +407,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -54,7 +61,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) auto RunStableVideoDecoderFactoryProcessService( mojo::PendingReceiver< -@@ -367,7 +367,7 @@ auto RunStableVideoDecoderFactoryProcessService( +@@ -418,7 +418,7 @@ auto RunStableVideoDecoderFactoryProcessService( #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) @@ -63,7 +70,7 @@ auto RunVideoEncodeAcceleratorProviderFactory( mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory> receiver) { -@@ -390,7 +390,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se +@@ -441,7 +441,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se // loop of type IO that can get notified when pipes have data. services.Add(RunNetworkService); @@ -72,7 +79,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) if (base::FeatureList::IsEnabled( features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) { -@@ -438,7 +438,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -493,7 +493,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -81,7 +88,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) if (!base::FeatureList::IsEnabled( features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) { -@@ -447,7 +447,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -502,7 +502,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) diff --git a/www/chromium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc b/www/chromium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc index 999fdd535821..3d37d2ec6bed 100644 --- a/www/chromium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- content/utility/speech/speech_recognition_sandbox_hook_linux.cc.orig 2023-01-11 09:17:16 UTC +--- content/utility/speech/speech_recognition_sandbox_hook_linux.cc.orig 2024-04-19 13:02:56 UTC +++ content/utility/speech/speech_recognition_sandbox_hook_linux.cc @@ -12,11 +12,14 @@ #include "sandbox/linux/syscall_broker/broker_command.h" @@ -27,9 +27,9 @@ #if BUILDFLAG(ENABLE_SODA_INTEGRATION_TESTS) base::FilePath test_binary_path = GetSodaTestBinaryPath(); DVLOG(0) << "SODA test binary path: " << test_binary_path.value().c_str(); -@@ -77,6 +82,7 @@ bool SpeechRecognitionPreSandboxHook( - sandbox::policy::SandboxLinux::PreSandboxHook(), - options); +@@ -75,6 +80,7 @@ bool SpeechRecognitionPreSandboxHook( + }), + GetSodaFilePermissions(), options); instance->EngageNamespaceSandboxIfPossible(); +#endif diff --git a/www/chromium/files/patch-content_utility_utility__main.cc b/www/chromium/files/patch-content_utility_utility__main.cc index 5d968ce3283f..0ad7aa73724d 100644 --- a/www/chromium/files/patch-content_utility_utility__main.cc +++ b/www/chromium/files/patch-content_utility_utility__main.cc @@ -1,4 +1,4 @@ ---- content/utility/utility_main.cc.orig 2024-02-23 21:04:38 UTC +--- content/utility/utility_main.cc.orig 2024-04-19 13:02:56 UTC +++ content/utility/utility_main.cc @@ -37,17 +37,21 @@ #include "third_party/icu/source/common/unicode/unistr.h" @@ -10,7 +10,7 @@ #include "base/files/file_util.h" #include "base/pickle.h" #include "content/child/sandboxed_process_thread_type_handler.h" -+#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "content/common/gpu_pre_sandbox_hook_linux.h" +#endif #include "content/public/common/content_descriptor_keys.h" @@ -46,10 +46,10 @@ #if (BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))) + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))) - #include "components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h" // nogncheck + #include "services/screen_ai/public/cpp/utilities.h" // nogncheck + #include "services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h" // nogncheck #endif - -@@ -100,7 +109,7 @@ namespace content { +@@ -101,7 +110,7 @@ namespace content { namespace { @@ -58,8 +58,11 @@ std::vector<std::string> GetNetworkContextsParentDirectories() { base::MemoryMappedFile::Region region; base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD( -@@ -128,7 +137,7 @@ std::vector<std::string> GetNetworkContextsParentDirec +@@ -127,9 +136,10 @@ std::vector<std::string> GetNetworkContextsParentDirec + return dirs; + } ++#if !BUILDFLAG(IS_BSD) bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox sandbox_type) { const bool obtain_gpu_info = -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) @@ -67,7 +70,15 @@ sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding; -@@ -251,7 +260,8 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -144,6 +154,7 @@ bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox san + + return false; + } ++#endif + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + + #if BUILDFLAG(IS_WIN) +@@ -252,7 +263,8 @@ int UtilityMain(MainFunctionParams parameters) { } } @@ -77,7 +88,7 @@ // Thread type delegate of the process should be registered before // first thread type change in ChildProcess constructor. // It also needs to be registered before the process has multiple threads, -@@ -262,7 +272,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -263,7 +275,7 @@ int UtilityMain(MainFunctionParams parameters) { } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -86,8 +97,8 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -297,7 +307,7 @@ int UtilityMain(MainFunctionParams parameters) { - pre_sandbox_hook = base::BindOnce(&screen_ai::ScreenAIPreSandboxHook); +@@ -301,7 +313,7 @@ int UtilityMain(MainFunctionParams parameters) { + screen_ai::GetBinaryPathSwitch())); break; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) @@ -95,7 +106,7 @@ case sandbox::mojom::Sandbox::kHardwareVideoDecoding: pre_sandbox_hook = base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); -@@ -324,6 +334,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -328,6 +340,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -103,7 +114,7 @@ if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { sandbox_options.use_amd_specific_policies = -@@ -331,6 +342,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -335,6 +348,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } diff --git a/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc b/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc index d14481aa4806..488b0f4b222d 100644 --- a/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc +++ b/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc @@ -1,4 +1,4 @@ ---- extensions/shell/app/shell_main_delegate.cc.orig 2023-11-03 10:09:45 UTC +--- extensions/shell/app/shell_main_delegate.cc.orig 2024-04-19 13:02:56 UTC +++ extensions/shell/app/shell_main_delegate.cc @@ -43,7 +43,7 @@ #if BUILDFLAG(IS_WIN) @@ -9,8 +9,8 @@ #include "base/nix/xdg_util.h" #elif BUILDFLAG(IS_MAC) #include "base/base_paths_mac.h" -@@ -62,7 +62,7 @@ base::FilePath GetDataPath() { - return cmd_line->GetSwitchValuePath(switches::kContentShellDataPath); +@@ -63,7 +63,7 @@ base::FilePath GetDataPath() { + } base::FilePath data_dir; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc index 3bc1bd615cf3..e74e66f2535d 100644 --- a/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc +++ b/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2023-09-13 12:11:42 UTC +--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2024-04-19 13:02:56 UTC +++ gpu/command_buffer/common/gpu_memory_buffer_support.cc @@ -182,7 +182,7 @@ uint32_t GetPlatformSpecificTextureTarget() { #if BUILDFLAG(IS_MAC) @@ -9,7 +9,7 @@ return GL_TEXTURE_EXTERNAL_OES; #elif BUILDFLAG(IS_IOS) return GL_TEXTURE_2D; -@@ -217,7 +217,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu +@@ -209,7 +209,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu gfx::BufferFormat format, gfx::BufferPlane plane) { #if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc b/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc index 69efa9be8748..836149752058 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/dawn_context_provider.cc.orig 2024-01-30 07:53:34 UTC +--- gpu/command_buffer/service/dawn_context_provider.cc.orig 2024-04-19 13:02:56 UTC +++ gpu/command_buffer/service/dawn_context_provider.cc -@@ -186,7 +186,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke +@@ -203,7 +203,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12) ? wgpu::BackendType::D3D12 : wgpu::BackendType::D3D11; diff --git a/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc b/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc index da63bfef3b9c..d40c456e19a1 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2024-03-22 08:19:40 UTC +--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2024-04-19 13:02:56 UTC +++ gpu/command_buffer/service/gles2_cmd_decoder.cc -@@ -2984,7 +2984,7 @@ GLES2Decoder* GLES2Decoder::Create( +@@ -2987,7 +2987,7 @@ GLES2Decoder* GLES2Decoder::Create( } // Allow linux to run fuzzers. diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc index 514541e9f434..b9b9c1fc9666 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2024-03-22 08:19:40 UTC +--- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2024-04-19 13:02:56 UTC +++ gpu/command_buffer/service/shared_image/shared_image_manager.cc -@@ -568,7 +568,7 @@ bool SharedImageManager::SupportsScanoutImages() { +@@ -569,7 +569,7 @@ bool SharedImageManager::SupportsScanoutImages() { return true; #elif BUILDFLAG(IS_ANDROID) return base::AndroidHardwareBufferCompat::IsSupportAvailable(); diff --git a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc index 24c49af54cbe..008d5db154d3 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2024-03-22 08:19:40 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2024-04-19 13:02:56 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1239,7 +1239,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1255,7 +1255,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( force_fallback_adapter = true; } @@ -9,7 +9,7 @@ if (!shared_context_state_->GrContextIsVulkan() && !shared_context_state_->IsGraphiteDawnVulkan() && use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) { -@@ -1891,7 +1891,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( +@@ -1922,7 +1922,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( } #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \ diff --git a/www/chromium/files/patch-gpu_config_gpu__finch__features.cc b/www/chromium/files/patch-gpu_config_gpu__finch__features.cc index 8a0acb57a855..95dc2b8a22da 100644 --- a/www/chromium/files/patch-gpu_config_gpu__finch__features.cc +++ b/www/chromium/files/patch-gpu_config_gpu__finch__features.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_finch_features.cc.orig 2024-03-22 08:19:40 UTC +--- gpu/config/gpu_finch_features.cc.orig 2024-04-19 13:02:56 UTC +++ gpu/config/gpu_finch_features.cc -@@ -131,7 +131,7 @@ const base::FeatureParam<std::string> +@@ -145,7 +145,7 @@ const base::FeatureParam<std::string> BASE_FEATURE(kDefaultEnableGpuRasterization, "DefaultEnableGpuRasterization", #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -144,7 +144,7 @@ BASE_FEATURE(kCanvasOopRasterization, +@@ -158,7 +158,7 @@ BASE_FEATURE(kCanvasOopRasterization, "CanvasOopRasterization", #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc index 93bb5eab9d3b..47df468187e0 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2024-03-22 08:19:40 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2024-04-19 13:02:56 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -354,7 +354,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -391,7 +391,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; #endif @@ -9,7 +9,7 @@ bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early; #else // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) // For some reasons MacOSX's VideoToolbox might crash when called after -@@ -391,7 +391,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -428,7 +428,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -18,7 +18,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -492,7 +492,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -529,7 +529,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL gpu_preferences_.gr_context_type = GrContextType::kGL; } @@ -27,7 +27,7 @@ // The ContentSandboxHelper is currently the only one implementation of // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -574,7 +574,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -611,7 +611,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -36,7 +36,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -721,7 +721,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -767,7 +767,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -45,7 +45,7 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -776,7 +776,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -822,7 +822,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } } @@ -54,7 +54,7 @@ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -930,7 +930,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -989,7 +989,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled; @@ -63,7 +63,7 @@ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -990,7 +990,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1049,7 +1049,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc index ffc74d30158f..d46d1a1053f2 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_util.cc.orig 2024-02-23 21:04:38 UTC +--- gpu/vulkan/vulkan_util.cc.orig 2024-04-19 13:02:56 UTC +++ gpu/vulkan/vulkan_util.cc -@@ -443,7 +443,7 @@ bool CheckVulkanCompatibilities(const VulkanInfo& vulk +@@ -467,7 +467,7 @@ bool CheckVulkanCompatibilities( } } diff --git a/www/chromium/files/patch-media_audio_audio__input__device.cc b/www/chromium/files/patch-media_audio_audio__input__device.cc index cb7279cbfc30..0e8b9b3c9a98 100644 --- a/www/chromium/files/patch-media_audio_audio__input__device.cc +++ b/www/chromium/files/patch-media_audio_audio__input__device.cc @@ -1,6 +1,6 @@ ---- media/audio/audio_input_device.cc.orig 2023-04-28 17:01:32 UTC +--- media/audio/audio_input_device.cc.orig 2024-04-19 13:02:56 UTC +++ media/audio/audio_input_device.cc -@@ -262,7 +262,7 @@ void AudioInputDevice::OnStreamCreated( +@@ -264,7 +264,7 @@ void AudioInputDevice::OnStreamCreated( // here. See comments in AliveChecker and PowerObserverHelper for details and // todos. if (detect_dead_stream_ == DeadStreamDetection::kEnabled) { diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc index 139083b6a5f9..2bd334016a61 100644 --- a/www/chromium/files/patch-media_base_media__switches.cc +++ b/www/chromium/files/patch-media_base_media__switches.cc @@ -1,4 +1,4 @@ ---- media/base/media_switches.cc.orig 2024-04-04 19:13:34 UTC +--- media/base/media_switches.cc.orig 2024-04-19 13:02:56 UTC +++ media/base/media_switches.cc @@ -21,7 +21,7 @@ #include "ui/gl/gl_features.h" @@ -9,7 +9,7 @@ #include "base/cpu.h" #endif -@@ -368,8 +368,8 @@ BASE_FEATURE(kMacLoopbackAudioForScreenShare, +@@ -363,8 +363,8 @@ BASE_FEATURE(kMacLoopbackAudioForScreenShare, "MacLoopbackAudioForScreenShare", base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_MAC) @@ -20,7 +20,7 @@ // Enables system audio mirroring using pulseaudio. BASE_FEATURE(kPulseaudioLoopbackForCast, "PulseaudioLoopbackForCast", -@@ -602,7 +602,7 @@ BASE_FEATURE(kUseWritePixelsYUV, +@@ -597,7 +597,7 @@ BASE_FEATURE(kUseWritePixelsYUV, BASE_FEATURE(kUseMultiPlaneFormatForHardwareVideo, "UseMultiPlaneFormatForHardwareVideo", #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || \ @@ -29,7 +29,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -715,7 +715,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, +@@ -713,7 +713,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", @@ -38,7 +38,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -743,7 +743,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, +@@ -741,7 +741,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, // If enabled, users can request Media Remoting without fullscreen-in-tab. BASE_FEATURE(kMediaRemotingWithoutFullscreen, "MediaRemotingWithoutFullscreen", @@ -47,7 +47,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -755,7 +755,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, +@@ -753,7 +753,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -56,7 +56,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -784,7 +784,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -782,7 +782,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -65,16 +65,16 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. BASE_FEATURE(kVaapiVideoDecodeLinux, -@@ -875,7 +875,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, +@@ -873,7 +873,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, "VaapiVp9SModeHWEncoding", base::FEATURE_DISABLED_BY_DEFAULT); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Enables the new V4L2StatefulVideoDecoder instead of V4L2VideoDecoder. - BASE_FEATURE(kV4L2FlatStatelessVideoDecoder, - "V4L2FlatStatelessVideoDecoder", -@@ -994,7 +994,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK, + // Enables the new V4L2 flat video decoder clients instead of V4L2VideoDecoder. + // Owners: frkoenig@chromium.org, mcasas@chromium.org + // Expiry: When flat decoders are supported on all platforms and the legacy +@@ -998,7 +998,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK, // Live Caption can be used in multiple languages, as opposed to just English. BASE_FEATURE(kLiveCaptionMultiLanguage, "LiveCaptionMultiLanguage", @@ -83,8 +83,17 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1466,7 +1466,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding, - ); +@@ -1033,7 +1033,7 @@ BASE_FEATURE(kLiveCaptionSystemWideOnChromeOS, + // Live Translate translates captions generated by Live Caption. + BASE_FEATURE(kLiveTranslate, + "LiveTranslate", +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT +@@ -1500,7 +1500,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, + base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-media_base_media__switches.h b/www/chromium/files/patch-media_base_media__switches.h index 2cff3f25f3f9..e0d750889720 100644 --- a/www/chromium/files/patch-media_base_media__switches.h +++ b/www/chromium/files/patch-media_base_media__switches.h @@ -1,6 +1,6 @@ ---- media/base/media_switches.h.orig 2024-03-22 08:19:40 UTC +--- media/base/media_switches.h.orig 2024-04-19 13:02:56 UTC +++ media/base/media_switches.h -@@ -313,7 +313,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder +@@ -315,7 +315,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend); @@ -9,7 +9,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForCast); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForScreenShare); #endif // BUILDFLAG(IS_LINUX) -@@ -331,7 +331,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay); +@@ -333,7 +333,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseAndroidOverlayForSecureOnly); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamForWebRTC); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream); @@ -18,17 +18,17 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux); -@@ -350,7 +350,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa +@@ -352,7 +352,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatelessVideoDecoder); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatVideoDecoder); MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatefulVideoDecoder); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -484,7 +484,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV - MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding); +@@ -491,7 +491,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide + MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseGTFOOutOfProcessVideoDecoding); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index b7873e8c2403..fa6bd935a94e 100644 --- a/www/chromium/files/patch-media_base_video__frame.cc +++ b/www/chromium/files/patch-media_base_video__frame.cc @@ -1,4 +1,4 @@ ---- media/base/video_frame.cc.orig 2024-03-22 08:19:40 UTC +--- media/base/video_frame.cc.orig 2024-04-19 13:02:56 UTC +++ media/base/video_frame.cc @@ -80,7 +80,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; @@ -54,7 +54,7 @@ DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1312,7 +1312,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( +@@ -1345,7 +1345,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( : mailbox_holders_[texture_index]; } @@ -63,7 +63,7 @@ size_t VideoFrame::NumDmabufFds() const { return dmabuf_fds_->size(); } -@@ -1429,7 +1429,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1462,7 +1462,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, storage_type_(storage_type), visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), natural_size_(natural_size), diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index 9b51b20061e4..ab252656a3ce 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,4 +1,4 @@ ---- media/base/video_frame.h.orig 2024-02-23 21:04:38 UTC +--- media/base/video_frame.h.orig 2024-04-19 13:02:56 UTC +++ media/base/video_frame.h @@ -44,7 +44,7 @@ #include "base/apple/scoped_cftyperef.h" @@ -27,7 +27,7 @@ // Wraps provided dmabufs // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will -@@ -593,7 +593,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -598,7 +598,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // mailbox, the caller must wait for the included sync point. const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const; @@ -36,7 +36,7 @@ // The number of DmaBufs will be equal or less than the number of planes of // the frame. If there are less, this means that the last FD contains the // remaining planes. Should be > 0 for STORAGE_DMABUFS. -@@ -811,7 +811,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -816,7 +816,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER. std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_; diff --git a/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc b/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc index ace05c1bb66f..fd1eb48a0fd6 100644 --- a/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc +++ b/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc @@ -1,6 +1,6 @@ ---- media/capture/video/linux/fake_v4l2_impl.cc.orig 2024-02-23 21:04:38 UTC +--- media/capture/video/linux/fake_v4l2_impl.cc.orig 2024-04-19 13:02:56 UTC +++ media/capture/video/linux/fake_v4l2_impl.cc -@@ -561,7 +561,7 @@ int FakeV4L2Impl::close(int fd) { +@@ -562,7 +562,7 @@ int FakeV4L2Impl::close(int fd) { return kSuccessReturnValue; } diff --git a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc index a1d7f7bac183..8ea1a7515106 100644 --- a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc +++ b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc @@ -1,6 +1,20 @@ ---- media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig 2023-05-02 13:49:23 UTC +--- media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig 2024-04-19 13:02:56 UTC +++ media/capture/video/linux/video_capture_device_factory_v4l2.cc -@@ -75,6 +75,9 @@ class DevVideoFilePathsDeviceProvider +@@ -38,6 +38,7 @@ bool CompareCaptureDevices(const VideoCaptureDeviceInf + return a.descriptor < b.descriptor; + } + ++#if !BUILDFLAG(IS_OPENBSD) + // USB VID and PID are both 4 bytes long. + const size_t kVidPidSize = 4; + const size_t kMaxInterfaceNameSize = 256; +@@ -70,11 +71,15 @@ std::string ExtractFileNameFromDeviceId(const std::str + DCHECK(base::StartsWith(device_id, kDevDir, base::CompareCase::SENSITIVE)); + return device_id.substr(strlen(kDevDir), device_id.length()); + } ++#endif + + class DevVideoFilePathsDeviceProvider : public VideoCaptureDeviceFactoryV4L2::DeviceProvider { public: void GetDeviceIds(std::vector<std::string>* target_container) override { @@ -10,7 +24,7 @@ const base::FilePath path("/dev/"); base::FileEnumerator enumerator(path, false, base::FileEnumerator::FILES, "video*"); -@@ -82,9 +85,13 @@ class DevVideoFilePathsDeviceProvider +@@ -82,9 +87,13 @@ class DevVideoFilePathsDeviceProvider const base::FileEnumerator::FileInfo info = enumerator.GetInfo(); target_container->emplace_back(path.value() + info.GetName().value()); } @@ -20,21 +34,33 @@ std::string GetDeviceModelId(const std::string& device_id) override { +#if BUILDFLAG(IS_OPENBSD) + return std::string(); -+#endif ++#else const std::string file_name = ExtractFileNameFromDeviceId(device_id); std::string usb_id; const std::string vid_path = -@@ -104,6 +111,9 @@ class DevVideoFilePathsDeviceProvider +@@ -101,9 +110,13 @@ class DevVideoFilePathsDeviceProvider + } + + return usb_id; ++#endif } std::string GetDeviceDisplayName(const std::string& device_id) override { +#if BUILDFLAG(IS_OPENBSD) + return std::string(); -+#endif ++#else const std::string file_name = ExtractFileNameFromDeviceId(device_id); const std::string interface_path = base::StringPrintf(kInterfacePathTemplate, file_name.c_str()); -@@ -219,7 +229,7 @@ void VideoCaptureDeviceFactoryV4L2::GetDevicesInfo( +@@ -114,6 +127,7 @@ class DevVideoFilePathsDeviceProvider + return std::string(); + } + return display_name; ++#endif + } + }; + +@@ -219,7 +233,7 @@ void VideoCaptureDeviceFactoryV4L2::GetDevicesInfo( std::move(callback).Run(std::move(devices_info)); } diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc index 64b0f621c90e..173e8463271a 100644 --- a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc +++ b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc @@ -1,6 +1,6 @@ ---- media/capture/video/video_capture_device_client.cc.orig 2023-12-10 06:10:27 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2024-04-19 13:02:56 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -150,7 +150,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat( +@@ -151,7 +151,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat( CHECK(!is_width_odd && !is_height_odd); return {libyuv::FOURCC_UYVY}; case media::PIXEL_FORMAT_RGB24: diff --git a/www/chromium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc b/www/chromium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc index 06fa56adfcbb..83704b86179c 100644 --- a/www/chromium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc +++ b/www/chromium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc @@ -1,4 +1,4 @@ ---- media/gpu/chromeos/libyuv_image_processor_backend.cc.orig 2024-03-22 08:19:40 UTC +--- media/gpu/chromeos/libyuv_image_processor_backend.cc.orig 2024-04-19 13:02:56 UTC +++ media/gpu/chromeos/libyuv_image_processor_backend.cc @@ -48,7 +48,7 @@ static constexpr struct { #define CONV(in, out, trans, result) \ @@ -9,7 +9,7 @@ CONV(NV12, AR24, kConversion, Supported), #endif CONV(NV12, NV12, kConversion, Supported), -@@ -434,7 +434,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr +@@ -436,7 +436,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr fr->GetWritableVisibleData(VideoFrame::kUVPlane)), \ fr->stride(VideoFrame::kUVPlane) @@ -18,7 +18,7 @@ #define ARGB_DATA(fr) \ fr->GetWritableVisibleData(VideoFrame::kARGBPlane), \ fr->stride(VideoFrame::kARGBPlane) -@@ -595,7 +595,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr +@@ -597,7 +597,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr } } diff --git a/www/chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc b/www/chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc index 9c4c3b5704f1..6b1ec820db47 100644 --- a/www/chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc +++ b/www/chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig 2024-03-22 08:19:40 UTC +--- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig 2024-04-19 13:02:56 UTC +++ media/gpu/chromeos/mailbox_video_frame_converter.cc -@@ -62,7 +62,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe +@@ -63,7 +63,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe << static_cast<int>(buffer_format); NOTREACHED_NORETURN(); } diff --git a/www/chromium/files/patch-media_gpu_chromeos_native__pixmap__frame__resource.cc b/www/chromium/files/patch-media_gpu_chromeos_native__pixmap__frame__resource.cc new file mode 100644 index 000000000000..9147c398e1fa --- /dev/null +++ b/www/chromium/files/patch-media_gpu_chromeos_native__pixmap__frame__resource.cc @@ -0,0 +1,11 @@ +--- media/gpu/chromeos/native_pixmap_frame_resource.cc.orig 2024-04-19 13:02:56 UTC ++++ media/gpu/chromeos/native_pixmap_frame_resource.cc +@@ -166,7 +166,7 @@ scoped_refptr<NativePixmapFrameResource> NativePixmapF + const bool is_intel_media_compression_enabled = + #if BUILDFLAG(IS_CHROMEOS) + base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + false; + #endif + CHECK(!is_intel_media_compressed_buffer || diff --git a/www/chromium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc b/www/chromium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc index e347be5170db..c40bd7660a06 100644 --- a/www/chromium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc +++ b/www/chromium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc @@ -1,4 +1,4 @@ ---- media/gpu/chromeos/platform_video_frame_utils.cc.orig 2024-03-22 08:19:40 UTC +--- media/gpu/chromeos/platform_video_frame_utils.cc.orig 2024-04-19 13:02:56 UTC +++ media/gpu/chromeos/platform_video_frame_utils.cc @@ -68,7 +68,7 @@ static std::unique_ptr<ui::GbmDevice> CreateGbmDevice( const base::FilePath dev_path(FILE_PATH_LITERAL( @@ -18,7 +18,7 @@ false; #endif if (is_intel_media_compression_enabled) { -@@ -334,7 +334,7 @@ scoped_refptr<VideoFrame> CreateGpuMemoryBufferVideoFr +@@ -347,7 +347,7 @@ scoped_refptr<VideoFrame> CreateVideoFrameFromGpuMemor const bool is_intel_media_compression_enabled = #if BUILDFLAG(IS_CHROMEOS) base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression); diff --git a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc index 32bab1918ba0..91e6d983819e 100644 --- a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc +++ b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2024-03-22 08:19:40 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2024-04-19 13:02:56 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -1017,7 +1017,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1038,7 +1038,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } #endif @@ -9,7 +9,7 @@ // Linux should always use a custom allocator (to allocate buffers using // libva) and a PlatformVideoFramePool. CHECK(allocator.has_value()); -@@ -1027,7 +1027,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1048,7 +1048,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( // to create NativePixmap-backed frames. main_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator( *allocator, VideoFrame::STORAGE_GPU_MEMORY_BUFFER); @@ -18,7 +18,7 @@ // Linux w/ V4L2 should not use a custom allocator // Only tested with video_decode_accelerator_tests // TODO(wenst@) Test with full Chromium Browser -@@ -1185,7 +1185,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1206,7 +1206,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( << " VideoFrames"; auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_); diff --git a/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc b/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc index a984d1cf4af5..e9d24ec7ecfc 100644 --- a/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc +++ b/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc @@ -1,6 +1,6 @@ ---- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2023-09-13 12:11:42 UTC +--- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2024-04-19 13:02:56 UTC +++ media/gpu/gpu_video_encode_accelerator_factory.cc -@@ -119,7 +119,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions +@@ -118,7 +118,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions return vea_factory_functions; #if BUILDFLAG(USE_VAAPI) diff --git a/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc index 4a6cda343b9c..754952b561c7 100644 --- a/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2024-03-22 08:19:40 UTC +--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2024-04-19 13:02:56 UTC +++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc @@ -16,7 +16,9 @@ #include "media/gpu/vaapi/vaapi_wrapper.h" @@ -18,7 +18,7 @@ void AllowAccessToRenderNodes(std::vector<BrokerFilePermission>& permissions, bool include_sys_dev_char, bool read_write) { -@@ -166,6 +169,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( +@@ -182,6 +185,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( NOTREACHED_NORETURN(); #endif // BUILDFLAG(USE_V4L2_CODEC) } @@ -26,7 +26,7 @@ } // namespace -@@ -181,6 +185,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( +@@ -197,6 +201,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( // (at least). bool HardwareVideoDecodingPreSandboxHook( sandbox::policy::SandboxLinux::Options options) { @@ -34,10 +34,10 @@ using HardwareVideoDecodingProcessPolicy = sandbox::policy::HardwareVideoDecodingProcessPolicy; using PolicyType = -@@ -227,6 +232,7 @@ bool HardwareVideoDecodingPreSandboxHook( +@@ -242,6 +247,7 @@ bool HardwareVideoDecodingPreSandboxHook( + // |permissions| is empty? sandbox::policy::SandboxLinux::GetInstance()->StartBrokerProcess( - command_set, permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), - options); + command_set, permissions, options); +#endif return true; } diff --git a/www/chromium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc b/www/chromium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc index ed8f42914eb9..e59de2f27ed8 100644 --- a/www/chromium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc.orig 2023-09-13 12:11:42 UTC +--- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc.orig 2024-04-19 13:02:56 UTC +++ media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc @@ -18,12 +18,15 @@ #include "media/gpu/v4l2/v4l2_device.h" @@ -16,7 +16,7 @@ sandbox::syscall_broker::BrokerCommandSet command_set; std::vector<BrokerFilePermission> permissions; -@@ -121,6 +124,7 @@ bool HardwareVideoEncodingPreSandboxHook( +@@ -120,6 +123,7 @@ bool HardwareVideoEncodingPreSandboxHook( return false; } } diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc index 55873e2d9c20..88c151005ad8 100644 --- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc +++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc @@ -1,6 +1,6 @@ ---- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2024-03-22 08:19:40 UTC +--- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2024-04-19 13:02:56 UTC +++ media/gpu/vaapi/vaapi_video_decoder.cc -@@ -779,7 +779,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree +@@ -780,7 +780,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree const gfx::Size decoder_natural_size = aspect_ratio_.GetNaturalSize(decoder_visible_rect); diff --git a/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc b/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc index 8a5d7f78f875..6db9406f8c32 100644 --- a/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc +++ b/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc @@ -1,4 +1,4 @@ ---- media/video/fake_gpu_memory_buffer.cc.orig 2024-02-23 21:04:38 UTC +--- media/video/fake_gpu_memory_buffer.cc.orig 2024-04-19 13:02:56 UTC +++ media/video/fake_gpu_memory_buffer.cc @@ -9,7 +9,7 @@ #include "media/base/format_utils.h" @@ -9,7 +9,7 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> -@@ -47,7 +47,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB +@@ -52,7 +52,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB } // namespace @@ -18,7 +18,7 @@ base::ScopedFD GetDummyFD() { base::ScopedFD fd(open("/dev/zero", O_RDWR)); DCHECK(fd.is_valid()); -@@ -77,7 +77,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si +@@ -82,7 +82,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si static base::AtomicSequenceNumber buffer_id_generator; handle_.id = gfx::GpuMemoryBufferId(buffer_id_generator.GetNext()); @@ -27,12 +27,12 @@ for (size_t i = 0; i < VideoFrame::NumPlanes(video_pixel_format_); i++) { const gfx::Size plane_size_in_bytes = VideoFrame::PlaneSize(video_pixel_format_, i, size_); -@@ -132,7 +132,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH +@@ -144,7 +144,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH gfx::GpuMemoryBufferHandle handle; handle.type = gfx::NATIVE_PIXMAP; handle.id = handle_.id; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) handle.native_pixmap_handle = gfx::CloneHandleForIPC(handle_.native_pixmap_handle); #endif diff --git a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index 5eaec57ba456..c70de90e2c46 100644 --- a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,4 +1,4 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2024-03-22 08:19:40 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2024-04-19 13:02:56 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc @@ -803,7 +803,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } @@ -18,7 +18,7 @@ is_webgpu_compatible = (gpu_memory_buffer != nullptr); if (is_webgpu_compatible) { is_webgpu_compatible &= -@@ -1307,7 +1307,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1306,7 +1306,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | gpu::SHARED_IMAGE_USAGE_SCANOUT; diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc index d91dcd01f6eb..391655c3ac5c 100644 --- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc +++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter.cc.orig 2024-03-22 08:19:40 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2024-04-19 13:02:56 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -160,7 +160,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( +@@ -157,7 +157,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( if (is_rgb) config.input_format = PIXEL_FORMAT_I420; @@ -9,7 +9,7 @@ if (format != PIXEL_FORMAT_I420 || !VideoFrame::IsStorageTypeMappable(storage_type)) { // ChromeOS/Linux hardware video encoders supports I420 on-memory -@@ -485,7 +485,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -482,7 +482,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal SetUpVeaConfig(profile_, options_, format, first_frame->storage_type(), supported_rc_modes_, required_encoder_type_); diff --git a/www/chromium/files/patch-media_webrtc_helpers.cc b/www/chromium/files/patch-media_webrtc_helpers.cc index 4cef2cca5ca8..22caff51258e 100644 --- a/www/chromium/files/patch-media_webrtc_helpers.cc +++ b/www/chromium/files/patch-media_webrtc_helpers.cc @@ -1,4 +1,4 @@ ---- media/webrtc/helpers.cc.orig 2024-03-22 08:19:40 UTC +--- media/webrtc/helpers.cc.orig 2024-04-19 13:02:56 UTC +++ media/webrtc/helpers.cc @@ -41,14 +41,14 @@ void ConfigAutomaticGainControl(const AudioProcessingS return; @@ -17,12 +17,3 @@ // Use AGC2 digital and input volume controller. // TODO(crbug.com/1375239): Remove `kWebRtcAllowInputVolumeAdjustment` safely. if (kInputVolumeAdjustmentOverrideAllowed && -@@ -161,7 +161,7 @@ rtc::scoped_refptr<webrtc::AudioProcessing> CreateWebR - #endif - #if !(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ -- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)) || BUILDFLAG(IS_BSD) - apm_config.transient_suppression.enabled = - settings.transient_noise_suppression; - #endif diff --git a/www/chromium/files/patch-media_webrtc_helpers__unittests.cc b/www/chromium/files/patch-media_webrtc_helpers__unittests.cc index bb8d9560d238..993c77c653cc 100644 --- a/www/chromium/files/patch-media_webrtc_helpers__unittests.cc +++ b/www/chromium/files/patch-media_webrtc_helpers__unittests.cc @@ -1,4 +1,4 @@ ---- media/webrtc/helpers_unittests.cc.orig 2024-03-22 08:19:40 UTC +--- media/webrtc/helpers_unittests.cc.orig 2024-04-19 13:02:56 UTC +++ media/webrtc/helpers_unittests.cc @@ -40,7 +40,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau EXPECT_TRUE(config.echo_canceller.enabled); @@ -9,16 +9,7 @@ EXPECT_FALSE(config.gain_controller1.enabled); EXPECT_TRUE(config.gain_controller2.enabled); #elif BUILDFLAG(IS_CASTOS) || BUILDFLAG(IS_CAST_ANDROID) -@@ -58,7 +58,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau - webrtc::AudioProcessing::Config::NoiseSuppression::kHigh); - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - EXPECT_FALSE(config.transient_suppression.enabled); - #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) - // Android and iOS use echo cancellation optimized for mobiles, and does not -@@ -79,7 +79,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, +@@ -73,7 +73,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +18,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, InputVolumeAdjustmentEnabledWithAgc2) { ::base::test::ScopedFeatureList feature_list; -@@ -95,7 +95,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, +@@ -89,7 +89,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -36,7 +27,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CanDisableInputVolumeAdjustmentWithAgc2) { ::base::test::ScopedFeatureList feature_list; -@@ -112,7 +112,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, +@@ -106,7 +106,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -45,12 +36,3 @@ TEST(CreateWebRtcAudioProcessingModuleTest, OnlyOneInputVolumeControllerEnabledOnDesktopPlatforms) { auto config = CreateApmGetConfig( -@@ -197,7 +197,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, ToggleTran - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ -- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) - // Transient suppression is not supported (nor useful) on mobile platforms. - EXPECT_FALSE(config.transient_suppression.enabled); - #else diff --git a/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni index e67311d70d70..9cc86c147119 100644 --- a/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni +++ b/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni @@ -1,4 +1,4 @@ ---- mojo/public/tools/bindings/mojom.gni.orig 2024-02-23 21:04:38 UTC +--- mojo/public/tools/bindings/mojom.gni.orig 2024-04-19 13:02:56 UTC +++ mojo/public/tools/bindings/mojom.gni @@ -748,6 +748,16 @@ template("mojom") { enabled_features += [ "is_apple" ] @@ -16,4 +16,4 @@ + action(parser_target_name) { allow_remote = true - custom_processor = "mojom_parser" + diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index eb3604339ce5..3cd4eadbb07e 100644 --- a/www/chromium/files/patch-net_BUILD.gn +++ b/www/chromium/files/patch-net_BUILD.gn @@ -1,6 +1,6 @@ ---- net/BUILD.gn.orig 2024-03-22 08:19:40 UTC +--- net/BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ net/BUILD.gn -@@ -122,7 +122,7 @@ net_configs = [ +@@ -123,7 +123,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1174,6 +1174,19 @@ component("net") { +@@ -1188,6 +1188,19 @@ component("net") { ] } @@ -29,7 +29,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1330,7 +1343,7 @@ component("net") { +@@ -1344,7 +1357,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -38,7 +38,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -2796,7 +2809,7 @@ test("net_unittests") { +@@ -2821,7 +2834,7 @@ test("net_unittests") { ] } @@ -47,7 +47,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -2884,6 +2897,10 @@ test("net_unittests") { +@@ -2909,6 +2922,10 @@ test("net_unittests") { ] } @@ -58,7 +58,7 @@ if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -2944,7 +2961,7 @@ test("net_unittests") { +@@ -2969,7 +2986,7 @@ test("net_unittests") { ] } @@ -67,7 +67,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3076,7 +3093,7 @@ test("net_unittests") { +@@ -3105,7 +3122,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/chromium/files/patch-net_base_features.cc b/www/chromium/files/patch-net_base_features.cc index b62bfa09d479..90ddda075e94 100644 --- a/www/chromium/files/patch-net_base_features.cc +++ b/www/chromium/files/patch-net_base_features.cc @@ -1,4 +1,4 @@ ---- net/base/features.cc.orig 2024-03-22 08:19:40 UTC +--- net/base/features.cc.orig 2024-04-19 13:02:56 UTC +++ net/base/features.cc @@ -26,7 +26,7 @@ BASE_FEATURE(kCapReferrerToOriginOnCrossOrigin, BASE_FEATURE(kAsyncDns, @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -510,7 +510,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, +@@ -504,7 +504,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, "SpdyHeadersToHttpResponseUseBuilder", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc.h b/www/chromium/files/patch-net_cert_cert__verify__proc.h index 2355d7657239..2dadc50d4ab0 100644 --- a/www/chromium/files/patch-net_cert_cert__verify__proc.h +++ b/www/chromium/files/patch-net_cert_cert__verify__proc.h @@ -1,6 +1,6 @@ ---- net/cert/cert_verify_proc.h.orig 2024-02-23 21:04:38 UTC +--- net/cert/cert_verify_proc.h.orig 2024-04-19 13:02:56 UTC +++ net/cert/cert_verify_proc.h -@@ -145,7 +145,7 @@ class NET_EXPORT CertVerifyProc +@@ -174,7 +174,7 @@ class NET_EXPORT CertVerifyProc kMaxValue = kChainLengthOne }; diff --git a/www/chromium/files/patch-net_dns_BUILD.gn b/www/chromium/files/patch-net_dns_BUILD.gn index c87d4b095af9..8c130b336675 100644 --- a/www/chromium/files/patch-net_dns_BUILD.gn +++ b/www/chromium/files/patch-net_dns_BUILD.gn @@ -1,6 +1,6 @@ ---- net/dns/BUILD.gn.orig 2024-02-23 21:04:38 UTC +--- net/dns/BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ net/dns/BUILD.gn -@@ -134,7 +134,7 @@ source_set("dns") { +@@ -136,7 +136,7 @@ source_set("dns") { "dns_config_service_android.cc", "dns_config_service_android.h", ] @@ -9,7 +9,7 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -175,6 +175,7 @@ source_set("dns") { +@@ -177,6 +177,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +17,7 @@ ] allow_circular_includes_from = [ -@@ -440,9 +441,9 @@ source_set("tests") { +@@ -444,9 +445,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/www/chromium/files/patch-net_dns_address__sorter__posix.cc b/www/chromium/files/patch-net_dns_address__sorter__posix.cc index 788ac7c12b66..ae7045b502f9 100644 --- a/www/chromium/files/patch-net_dns_address__sorter__posix.cc +++ b/www/chromium/files/patch-net_dns_address__sorter__posix.cc @@ -1,4 +1,4 @@ ---- net/dns/address_sorter_posix.cc.orig 2023-04-28 17:01:32 UTC +--- net/dns/address_sorter_posix.cc.orig 2024-04-19 13:02:56 UTC +++ net/dns/address_sorter_posix.cc @@ -27,6 +27,7 @@ #include "net/dns/netinet_in_var_ios.h" @@ -7,4 +7,4 @@ +#include <netinet6/in6_var.h> #endif // BUILDFLAG(IS_IOS) #endif - + #include <vector> diff --git a/www/chromium/files/patch-net_socket_udp__socket__unittest.cc b/www/chromium/files/patch-net_socket_udp__socket__unittest.cc index 460834fc87c3..7614d0189516 100644 --- a/www/chromium/files/patch-net_socket_udp__socket__unittest.cc +++ b/www/chromium/files/patch-net_socket_udp__socket__unittest.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_unittest.cc.orig 2024-03-22 08:19:40 UTC +--- net/socket/udp_socket_unittest.cc.orig 2024-04-19 13:02:56 UTC +++ net/socket/udp_socket_unittest.cc -@@ -352,7 +352,7 @@ TEST_F(UDPSocketTest, PartialRecv) { +@@ -358,7 +358,7 @@ TEST_F(UDPSocketTest, PartialRecv) { EXPECT_EQ(second_packet, received); } @@ -9,7 +9,7 @@ // - MacOS: requires root permissions on OSX 10.7+. // - Android: devices attached to testbots don't have default network, so // broadcasting to 255.255.255.255 returns error -109 (Address not reachable). -@@ -663,7 +663,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) { +@@ -669,7 +669,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) { EXPECT_THAT(rv, IsOk()); rv = client.SetDoNotFragment(); @@ -18,7 +18,7 @@ // TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia. EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); #elif BUILDFLAG(IS_MAC) -@@ -691,7 +691,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) { +@@ -697,7 +697,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) { EXPECT_THAT(rv, IsOk()); rv = server.SetDoNotFragment(); @@ -27,7 +27,7 @@ // TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia. EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); #elif BUILDFLAG(IS_MAC) -@@ -756,7 +756,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { +@@ -762,7 +762,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { // TODO(https://crbug.com/947115): failing on device on iOS 12.2. // TODO(https://crbug.com/1227554): flaky on Mac 11. @@ -36,7 +36,7 @@ #define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress #else #define MAYBE_SharedMulticastAddress SharedMulticastAddress -@@ -810,7 +810,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { +@@ -816,7 +816,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { NetLogSource()); ASSERT_THAT(client_socket.Connect(send_address), IsOk()); diff --git a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc index 534bad9aba24..7f00b3572d31 100644 --- a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc +++ b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc @@ -1,4 +1,4 @@ ---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2024-02-23 21:04:38 UTC +--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2024-04-19 13:02:56 UTC +++ net/tools/cert_verify_tool/cert_verify_tool.cc @@ -33,7 +33,7 @@ #include "third_party/boringssl/src/pki/trust_store.h" @@ -18,7 +18,7 @@ // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // -@@ -566,7 +566,7 @@ int main(int argc, char** argv) { +@@ -571,7 +571,7 @@ int main(int argc, char** argv) { std::string impls_str = command_line.GetSwitchValueASCII("impls"); if (impls_str.empty()) { // Default value. diff --git a/www/chromium/files/patch-printing_print__settings__conversion.cc b/www/chromium/files/patch-printing_print__settings__conversion.cc index 19ba0f070bb4..cd094bec27a5 100644 --- a/www/chromium/files/patch-printing_print__settings__conversion.cc +++ b/www/chromium/files/patch-printing_print__settings__conversion.cc @@ -1,6 +1,6 @@ ---- printing/print_settings_conversion.cc.orig 2023-10-11 18:22:24 UTC +--- printing/print_settings_conversion.cc.orig 2024-04-19 13:02:56 UTC +++ printing/print_settings_conversion.cc -@@ -287,7 +287,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet +@@ -285,7 +285,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet settings->set_is_modifiable(is_modifiable.value()); } diff --git a/www/chromium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc b/www/chromium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc index e59ff7c8d692..051ceb9e0751 100644 --- a/www/chromium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- printing/sandbox/print_backend_sandbox_hook_linux.cc.orig 2023-04-28 17:01:32 UTC +--- printing/sandbox/print_backend_sandbox_hook_linux.cc.orig 2024-04-19 13:02:56 UTC +++ printing/sandbox/print_backend_sandbox_hook_linux.cc @@ -10,20 +10,27 @@ #include "base/path_service.h" @@ -40,8 +40,8 @@ #if BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(USE_CUPS) // Create the socket connections to the CUPS server before engaging the // sandbox, since new connections cannot be made after that. -@@ -92,6 +101,7 @@ bool PrintBackendPreSandboxHook( - sandbox::policy::SandboxLinux::PreSandboxHook(), options); +@@ -91,6 +100,7 @@ bool PrintBackendPreSandboxHook( + GetPrintBackendFilePermissions(), options); instance->EngageNamespaceSandboxIfPossible(); +#endif diff --git a/www/chromium/files/patch-remoting_host_basic__desktop__environment.cc b/www/chromium/files/patch-remoting_host_basic__desktop__environment.cc index 3953460a5ba8..aeb2aa8bd1cc 100644 --- a/www/chromium/files/patch-remoting_host_basic__desktop__environment.cc +++ b/www/chromium/files/patch-remoting_host_basic__desktop__environment.cc @@ -1,6 +1,6 @@ ---- remoting/host/basic_desktop_environment.cc.orig 2023-08-17 07:33:31 UTC +--- remoting/host/basic_desktop_environment.cc.orig 2024-04-19 13:02:56 UTC +++ remoting/host/basic_desktop_environment.cc -@@ -195,7 +195,7 @@ BasicDesktopEnvironment::CreateVideoCapturer() { +@@ -195,7 +195,7 @@ std::unique_ptr<DesktopCapturer> BasicDesktopEnvironme scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner; #if BUILDFLAG(IS_CHROMEOS_ASH) capture_task_runner = ui_task_runner_; diff --git a/www/chromium/files/patch-remoting_host_client__session.cc b/www/chromium/files/patch-remoting_host_client__session.cc index a3aa12fb1116..7bfefc2ff724 100644 --- a/www/chromium/files/patch-remoting_host_client__session.cc +++ b/www/chromium/files/patch-remoting_host_client__session.cc @@ -1,6 +1,6 @@ ---- remoting/host/client_session.cc.orig 2024-02-23 21:04:38 UTC +--- remoting/host/client_session.cc.orig 2024-04-19 13:02:56 UTC +++ remoting/host/client_session.cc -@@ -160,7 +160,7 @@ void ClientSession::NotifyClientResolution( +@@ -161,7 +161,7 @@ void ClientSession::NotifyClientResolution( if (desktop_environment_options_.enable_curtaining()) { dpi_vector.set(resolution.x_dpi(), resolution.y_dpi()); } diff --git a/www/chromium/files/patch-remoting_host_desktop__capturer__proxy.cc b/www/chromium/files/patch-remoting_host_desktop__capturer__proxy.cc index 4b31452946f3..98793b85de1a 100644 --- a/www/chromium/files/patch-remoting_host_desktop__capturer__proxy.cc +++ b/www/chromium/files/patch-remoting_host_desktop__capturer__proxy.cc @@ -1,4 +1,4 @@ ---- remoting/host/desktop_capturer_proxy.cc.orig 2023-08-17 07:33:31 UTC +--- remoting/host/desktop_capturer_proxy.cc.orig 2024-04-19 13:02:56 UTC +++ remoting/host/desktop_capturer_proxy.cc @@ -26,7 +26,7 @@ #include "remoting/host/chromeos/frame_sink_desktop_capturer.h" @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #include "remoting/host/linux/wayland_desktop_capturer.h" -@@ -89,7 +89,7 @@ void DesktopCapturerProxy::Core::CreateCapturer( +@@ -91,7 +91,7 @@ void DesktopCapturerProxy::Core::CreateCapturer( #if BUILDFLAG(IS_CHROMEOS_ASH) capturer_ = std::make_unique<FrameSinkDesktopCapturer>(); @@ -18,7 +18,7 @@ static base::nix::SessionType session_type = base::nix::SessionType::kUnset; if (session_type == base::nix::SessionType::kUnset) { std::unique_ptr<base::Environment> env = base::Environment::Create(); -@@ -293,7 +293,7 @@ void DesktopCapturerProxy::OnMetadata(webrtc::DesktopC +@@ -298,7 +298,7 @@ void DesktopCapturerProxy::OnMetadata(webrtc::DesktopC bool DesktopCapturerProxy::SupportsFrameCallbacks() { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); diff --git a/www/chromium/files/patch-remoting_host_desktop__capturer__wrapper.cc b/www/chromium/files/patch-remoting_host_desktop__capturer__wrapper.cc index 5648358d1517..a7b9a34f4d27 100644 --- a/www/chromium/files/patch-remoting_host_desktop__capturer__wrapper.cc +++ b/www/chromium/files/patch-remoting_host_desktop__capturer__wrapper.cc @@ -1,4 +1,4 @@ ---- remoting/host/desktop_capturer_wrapper.cc.orig 2023-05-31 08:12:17 UTC +--- remoting/host/desktop_capturer_wrapper.cc.orig 2024-04-19 13:02:56 UTC +++ remoting/host/desktop_capturer_wrapper.cc @@ -13,7 +13,7 @@ #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h" @@ -9,8 +9,8 @@ #include "remoting/host/linux/wayland_desktop_capturer.h" #include "remoting/host/linux/wayland_utils.h" #endif -@@ -32,7 +32,7 @@ void DesktopCapturerWrapper::CreateCapturer( - const webrtc::DesktopCaptureOptions& options) { +@@ -33,7 +33,7 @@ void DesktopCapturerWrapper::CreateCapturer( + SourceId id) { DCHECK(!capturer_); -#if BUILDFLAG(IS_LINUX) @@ -18,7 +18,7 @@ if (IsRunningWayland()) { capturer_ = std::make_unique<WaylandDesktopCapturer>(options); } else { -@@ -109,7 +109,7 @@ void DesktopCapturerWrapper::OnCaptureResult( +@@ -112,7 +112,7 @@ void DesktopCapturerWrapper::OnCaptureResult( bool DesktopCapturerWrapper::SupportsFrameCallbacks() { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); diff --git a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc index b39c76fa1244..cffbd690e459 100644 --- a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2024-03-22 08:19:40 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2024-04-19 13:02:56 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -131,7 +131,7 @@ +@@ -132,7 +132,7 @@ #include "remoting/host/mac/permission_utils.h" #endif // BUILDFLAG(IS_APPLE) @@ -9,7 +9,7 @@ #if defined(REMOTING_USE_X11) #include <gtk/gtk.h> #endif // defined(REMOTING_USE_X11) -@@ -142,13 +142,13 @@ +@@ -143,13 +143,13 @@ #endif // defined(REMOTING_USE_X11) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -25,7 +25,7 @@ #include "remoting/host/host_utmp_logger.h" #endif -@@ -161,7 +161,7 @@ +@@ -162,7 +162,7 @@ #include "remoting/host/win/session_desktop_environment.h" #endif // BUILDFLAG(IS_WIN) @@ -34,7 +34,7 @@ #include "remoting/host/linux/wayland_manager.h" #include "remoting/host/linux/wayland_utils.h" #endif // BUILDFLAG(IS_LINUX) -@@ -191,7 +191,7 @@ const char kApplicationName[] = "chromoting"; +@@ -192,7 +192,7 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -43,7 +43,7 @@ // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; -@@ -400,7 +400,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -401,7 +401,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; @@ -52,7 +52,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -470,7 +470,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -471,7 +471,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<HostStatusLogger> host_status_logger_; std::unique_ptr<HostEventLogger> host_event_logger_; @@ -61,7 +61,7 @@ std::unique_ptr<HostUTMPLogger> host_utmp_logger_; #endif std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_; -@@ -779,7 +779,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -783,7 +783,7 @@ void HostProcess::StartOnNetworkThread() { void HostProcess::ShutdownOnNetworkThread() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); config_watcher_.reset(); @@ -70,7 +70,7 @@ cert_watcher_.reset(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -845,7 +845,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -849,7 +849,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); @@ -79,7 +79,7 @@ if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -970,13 +970,13 @@ void HostProcess::StartOnUiThread() { +@@ -974,13 +974,13 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -95,7 +95,7 @@ // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = -@@ -1048,7 +1048,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1052,7 +1052,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -104,7 +104,7 @@ // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. -@@ -1056,7 +1056,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1060,7 +1060,7 @@ void HostProcess::ShutdownOnUiThread() { AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -113,7 +113,7 @@ context_->input_task_runner()->PostTask( FROM_HERE, base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); })); -@@ -1414,7 +1414,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V +@@ -1418,7 +1418,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V // Returns false: never restart the host after this policy update. DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); @@ -122,8 +122,8 @@ std::optional<bool> host_username_match_required = policies.FindBool(policy::key::kRemoteAccessHostMatchUsername); if (!host_username_match_required.has_value()) { -@@ -1874,7 +1874,7 @@ void HostProcess::StartHost() { - enable_user_interface_); +@@ -1882,7 +1882,7 @@ void HostProcess::StartHost() { + corp_host_status_logger_->StartObserving(*session_manager); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) @@ -131,7 +131,7 @@ desktop_environment_options_.set_enable_remote_webauthn(is_googler_); #endif -@@ -1907,7 +1907,7 @@ void HostProcess::StartHost() { +@@ -1915,7 +1915,7 @@ void HostProcess::StartHost() { host_status_logger_ = std::make_unique<HostStatusLogger>( host_->status_monitor(), log_to_server_.get()); @@ -140,7 +140,7 @@ const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->HasSwitch(kEnableUtempter)) { host_utmp_logger_ = -@@ -1939,7 +1939,7 @@ void HostProcess::StartHost() { +@@ -1947,7 +1947,7 @@ void HostProcess::StartHost() { host_->Start(host_owner_); @@ -149,7 +149,7 @@ // For Windows, ChromotingHostServices connections are handled by the daemon // process, then the message pipe is forwarded to the network process. host_->StartChromotingHostServices(); -@@ -2072,7 +2072,7 @@ int HostProcessMain() { +@@ -2081,7 +2081,7 @@ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); @@ -158,7 +158,7 @@ #if defined(REMOTING_USE_X11) // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) -@@ -2121,7 +2121,7 @@ int HostProcessMain() { +@@ -2130,7 +2130,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); diff --git a/www/chromium/files/patch-sandbox_policy_features.cc b/www/chromium/files/patch-sandbox_policy_features.cc index 6c8e61c97185..41ef415278a9 100644 --- a/www/chromium/files/patch-sandbox_policy_features.cc +++ b/www/chromium/files/patch-sandbox_policy_features.cc @@ -1,4 +1,4 @@ ---- sandbox/policy/features.cc.orig 2024-03-22 08:19:40 UTC +--- sandbox/policy/features.cc.orig 2024-04-19 13:02:56 UTC +++ sandbox/policy/features.cc @@ -20,7 +20,11 @@ namespace sandbox::policy::features { // (Only causes an effect when feature kNetworkServiceInProcess is disabled.) @@ -12,7 +12,7 @@ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) // Enables a fine-grained seccomp-BPF syscall filter for the network service. -@@ -117,7 +121,7 @@ BASE_FEATURE(kForceSpectreVariant2Mitigation, +@@ -126,7 +130,7 @@ BASE_FEATURE(kForceSpectreVariant2Mitigation, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/chromium/files/patch-sandbox_policy_features.h b/www/chromium/files/patch-sandbox_policy_features.h index dcab6f1050f8..a78f4fa38587 100644 --- a/www/chromium/files/patch-sandbox_policy_features.h +++ b/www/chromium/files/patch-sandbox_policy_features.h @@ -1,6 +1,6 @@ ---- sandbox/policy/features.h.orig 2024-03-22 08:19:40 UTC +--- sandbox/policy/features.h.orig 2024-04-19 13:02:56 UTC +++ sandbox/policy/features.h -@@ -42,7 +42,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kSpectreVar +@@ -43,7 +43,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kSpectreVar SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kForceSpectreVariant2Mitigation); #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/chromium/files/patch-sandbox_policy_sandbox.cc b/www/chromium/files/patch-sandbox_policy_sandbox.cc index 5b629a4e982c..cfa13b30c1b2 100644 --- a/www/chromium/files/patch-sandbox_policy_sandbox.cc +++ b/www/chromium/files/patch-sandbox_policy_sandbox.cc @@ -1,4 +1,4 @@ ---- sandbox/policy/sandbox.cc.orig 2024-02-23 21:04:38 UTC +--- sandbox/policy/sandbox.cc.orig 2024-04-19 13:02:56 UTC +++ sandbox/policy/sandbox.cc @@ -18,6 +18,10 @@ #include "sandbox/policy/linux/sandbox_linux.h" @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_MAC) #include "sandbox/mac/seatbelt.h" #endif // BUILDFLAG(IS_MAC) -@@ -33,7 +37,7 @@ +@@ -32,7 +36,7 @@ namespace sandbox { namespace policy { diff --git a/www/chromium/files/patch-services_audio_audio__sandbox__hook__linux.cc b/www/chromium/files/patch-services_audio_audio__sandbox__hook__linux.cc index 2d7d3a379cff..33d94315c22d 100644 --- a/www/chromium/files/patch-services_audio_audio__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-services_audio_audio__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- services/audio/audio_sandbox_hook_linux.cc.orig 2024-01-30 07:53:34 UTC +--- services/audio/audio_sandbox_hook_linux.cc.orig 2024-04-19 13:02:56 UTC +++ services/audio/audio_sandbox_hook_linux.cc @@ -144,6 +144,7 @@ void AddPulseAudioFilePermissions( } @@ -21,7 +21,7 @@ LoadAudioLibraries(); auto* instance = sandbox::policy::SandboxLinux::GetInstance(); instance->StartBrokerProcess(MakeBrokerCommandSet({ -@@ -195,6 +198,7 @@ bool AudioPreSandboxHook(sandbox::policy::SandboxLinux +@@ -193,6 +196,7 @@ bool AudioPreSandboxHook(sandbox::policy::SandboxLinux // TODO(https://crbug.com/850878) enable namespace sandbox. Currently, if // enabled, connect() on pulse native socket fails with ENOENT (called from // pa_context_connect). diff --git a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc index 31862041ec93..a5ac8d4d488f 100644 --- a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc +++ b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc @@ -1,6 +1,6 @@ ---- services/device/geolocation/location_arbitrator.cc.orig 2024-01-30 07:53:34 UTC +--- services/device/geolocation/location_arbitrator.cc.orig 2024-04-19 13:02:56 UTC +++ services/device/geolocation/location_arbitrator.cc -@@ -194,7 +194,7 @@ LocationArbitrator::NewNetworkLocationProvider( +@@ -196,7 +196,7 @@ LocationArbitrator::NewNetworkLocationProvider( std::unique_ptr<LocationProvider> LocationArbitrator::NewSystemLocationProvider() { @@ -8,4 +8,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) return nullptr; #else - return device::NewSystemLocationProvider(main_task_runner_, + return device::NewSystemLocationProvider( diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index b233e89a2a9e..b6c1305086f3 100644 --- a/www/chromium/files/patch-services_network_BUILD.gn +++ b/www/chromium/files/patch-services_network_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/BUILD.gn.orig 2024-03-22 08:19:40 UTC +--- services/network/BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ services/network/BUILD.gn -@@ -402,7 +402,6 @@ if (is_linux || is_chromeos) { +@@ -410,7 +410,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", diff --git a/www/chromium/files/patch-services_network_network__context.cc b/www/chromium/files/patch-services_network_network__context.cc index e8d54c86ac4b..2fa7170bcc73 100644 --- a/www/chromium/files/patch-services_network_network__context.cc +++ b/www/chromium/files/patch-services_network_network__context.cc @@ -1,6 +1,6 @@ ---- services/network/network_context.cc.orig 2024-03-22 08:19:40 UTC +--- services/network/network_context.cc.orig 2024-04-19 13:02:56 UTC +++ services/network/network_context.cc -@@ -522,7 +522,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: +@@ -523,7 +523,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: NetworkContext::NetworkContextHttpAuthPreferences:: ~NetworkContextHttpAuthPreferences() = default; @@ -9,7 +9,7 @@ bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad() const { if (network_service_) { -@@ -2276,7 +2276,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( +@@ -2277,7 +2277,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( http_auth_dynamic_network_service_params->android_negotiate_account_type); #endif // BUILDFLAG(IS_ANDROID) diff --git a/www/chromium/files/patch-services_network_network__context.h b/www/chromium/files/patch-services_network_network__context.h index ac66ed71488e..7f5a7a0945c5 100644 --- a/www/chromium/files/patch-services_network_network__context.h +++ b/www/chromium/files/patch-services_network_network__context.h @@ -1,6 +1,6 @@ ---- services/network/network_context.h.orig 2024-02-23 21:04:38 UTC +--- services/network/network_context.h.orig 2024-04-19 13:02:56 UTC +++ services/network/network_context.h -@@ -663,7 +663,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -670,7 +670,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext public: explicit NetworkContextHttpAuthPreferences(NetworkService* network_service); ~NetworkContextHttpAuthPreferences() override; diff --git a/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc b/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc index 43bc6e25360b..fc3372ba765a 100644 --- a/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- services/network/network_sandbox_hook_linux.cc.orig 2024-03-22 08:19:40 UTC +--- services/network/network_sandbox_hook_linux.cc.orig 2024-04-19 13:02:56 UTC +++ services/network/network_sandbox_hook_linux.cc @@ -15,11 +15,14 @@ #include "sandbox/linux/syscall_broker/broker_file_permission.h" @@ -30,7 +30,7 @@ @@ -118,6 +123,7 @@ bool NetworkPreSandboxHook(std::vector<std::string> ne GetNetworkBrokerCommandSet(), GetNetworkFilePermissions(std::move(network_context_parent_dirs)), - sandbox::policy::SandboxLinux::PreSandboxHook(), options); + options); +#endif return true; diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc index cb6a8d92120c..39ac727da28d 100644 --- a/www/chromium/files/patch-services_network_network__service.cc +++ b/www/chromium/files/patch-services_network_network__service.cc @@ -1,4 +1,4 @@ ---- services/network/network_service.cc.orig 2024-03-22 08:19:40 UTC +--- services/network/network_service.cc.orig 2024-04-19 13:02:56 UTC +++ services/network/network_service.cc @@ -97,7 +97,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" @@ -9,7 +9,7 @@ BUILDFLAG(IS_CHROMEOS_LACROS) #include "components/os_crypt/sync/key_storage_config_linux.h" -@@ -979,7 +979,7 @@ void NetworkService::SetExplicitlyAllowedPorts( +@@ -978,7 +978,7 @@ void NetworkService::SetExplicitlyAllowedPorts( net::SetExplicitlyAllowedPorts(ports); } @@ -18,7 +18,7 @@ void NetworkService::SetGssapiLibraryLoadObserver( mojo::PendingRemote<mojom::GssapiLibraryLoadObserver> gssapi_library_load_observer) { -@@ -1061,7 +1061,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo +@@ -1060,7 +1060,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo ); } diff --git a/www/chromium/files/patch-services_network_network__service.h b/www/chromium/files/patch-services_network_network__service.h index 82dbaa840395..fd7270da64d6 100644 --- a/www/chromium/files/patch-services_network_network__service.h +++ b/www/chromium/files/patch-services_network_network__service.h @@ -1,6 +1,6 @@ ---- services/network/network_service.h.orig 2024-03-22 08:19:40 UTC +--- services/network/network_service.h.orig 2024-04-19 13:02:56 UTC +++ services/network/network_service.h -@@ -230,7 +230,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -229,7 +229,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService mojo::PendingReceiver<mojom::NetworkServiceTest> receiver) override; void SetFirstPartySets(net::GlobalFirstPartySets sets) override; void SetExplicitlyAllowedPorts(const std::vector<uint16_t>& ports) override; @@ -9,7 +9,7 @@ void SetGssapiLibraryLoadObserver( mojo::PendingRemote<mojom::GssapiLibraryLoadObserver> gssapi_library_load_observer) override; -@@ -256,7 +256,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -255,7 +255,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService std::unique_ptr<net::HttpAuthHandlerFactory> CreateHttpAuthHandlerFactory( NetworkContext* network_context); @@ -18,7 +18,7 @@ // This is called just before a GSSAPI library may be loaded. void OnBeforeGssapiLibraryLoad(); #endif // BUILDFLAG(IS_LINUX) -@@ -489,7 +489,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -481,7 +481,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService // leaking stale listeners between tests. std::unique_ptr<net::NetworkChangeNotifier> mock_network_change_notifier_; diff --git a/www/chromium/files/patch-services_network_public_cpp_BUILD.gn b/www/chromium/files/patch-services_network_public_cpp_BUILD.gn index 198adb12be4e..4f89278f6c1d 100644 --- a/www/chromium/files/patch-services_network_public_cpp_BUILD.gn +++ b/www/chromium/files/patch-services_network_public_cpp_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/public/cpp/BUILD.gn.orig 2024-03-22 08:19:40 UTC +--- services/network/public/cpp/BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ services/network/public/cpp/BUILD.gn -@@ -491,7 +491,7 @@ component("cpp_base") { +@@ -486,7 +486,7 @@ component("cpp_base") { sources += [ "transferable_directory_fuchsia.cc" ] } diff --git a/www/chromium/files/patch-services_network_public_mojom_BUILD.gn b/www/chromium/files/patch-services_network_public_mojom_BUILD.gn index ede585d4704d..4c4b8d386c12 100644 --- a/www/chromium/files/patch-services_network_public_mojom_BUILD.gn +++ b/www/chromium/files/patch-services_network_public_mojom_BUILD.gn @@ -1,4 +1,4 @@ ---- services/network/public/mojom/BUILD.gn.orig 2024-03-22 08:19:40 UTC +--- services/network/public/mojom/BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ services/network/public/mojom/BUILD.gn @@ -522,11 +522,11 @@ mojom("url_loader_base") { } @@ -14,7 +14,7 @@ # TODO(crbug.com/1431866): Remove this once is_linux in the mojom IDL does # not include lacros. enabled_features += [ "use_network_interface_change_listener" ] -@@ -1447,7 +1447,7 @@ mojom("mojom") { +@@ -1457,7 +1457,7 @@ mojom("mojom") { } } diff --git a/www/chromium/files/patch-services_screen__ai_public_cpp_utilities.cc b/www/chromium/files/patch-services_screen__ai_public_cpp_utilities.cc new file mode 100644 index 000000000000..ba2d7ddc302e --- /dev/null +++ b/www/chromium/files/patch-services_screen__ai_public_cpp_utilities.cc @@ -0,0 +1,29 @@ +--- services/screen_ai/public/cpp/utilities.cc.orig 2024-04-19 13:02:56 UTC ++++ services/screen_ai/public/cpp/utilities.cc +@@ -19,7 +19,7 @@ namespace screen_ai { + + namespace { + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + constexpr char kBinaryPathSwitch[] = "screen-ai-binary"; + #endif + +@@ -40,7 +40,7 @@ constexpr char kScreenAIDlcRootPath[] = + #endif + + #if BUILDFLAG(ENABLE_SCREEN_AI_BROWSERTESTS) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + constexpr base::FilePath::CharType kScreenAIResourcePathForTests[] = + FILE_PATH_LITERAL("third_party/screen-ai/linux/resources"); + #elif BUILDFLAG(IS_MAC) +@@ -127,7 +127,7 @@ base::FilePath GetComponentBinaryPathForTests() { + + const char* GetBinaryPathSwitch() { + // This is only used on Linux and ChromeOS. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return kBinaryPathSwitch; + #else + return nullptr; diff --git a/www/chromium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc b/www/chromium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc new file mode 100644 index 000000000000..8b9d2a942f5c --- /dev/null +++ b/www/chromium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc @@ -0,0 +1,18 @@ +--- services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2024-04-19 13:02:56 UTC ++++ services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc +@@ -53,6 +53,7 @@ bool ScreenAIPreSandboxHook(base::FilePath binary_path + } + } + ++#if !BUILDFLAG(IS_BSD) + auto* instance = sandbox::policy::SandboxLinux::GetInstance(); + + std::vector<BrokerFilePermission> permissions{ +@@ -75,6 +76,7 @@ bool ScreenAIPreSandboxHook(base::FilePath binary_path + sandbox::syscall_broker::COMMAND_OPEN}), + permissions, options); + instance->EngageNamespaceSandboxIfPossible(); ++#endif + + return true; + } diff --git a/www/chromium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h b/www/chromium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h new file mode 100644 index 000000000000..e4f1e4e5bf6f --- /dev/null +++ b/www/chromium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h @@ -0,0 +1,16 @@ +--- services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h.orig 2024-04-19 13:02:56 UTC ++++ services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h +@@ -6,7 +6,13 @@ + #define SERVICES_SCREEN_AI_SANDBOX_SCREEN_AI_SANDBOX_HOOK_LINUX_H_ + + #include "base/files/file_path.h" ++#include "build/build_config.h" ++ ++#if BUILDFLAG(IS_BSD) ++#include "sandbox/policy/sandbox.h" ++#else + #include "sandbox/policy/linux/sandbox_linux.h" ++#endif + + namespace screen_ai { + diff --git a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp index 6d1f44a6e228..15ca4c0a510d 100644 --- a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp +++ b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp @@ -1,6 +1,15 @@ ---- skia/ext/SkMemory_new_handler.cpp.orig 2023-04-28 17:01:32 UTC +--- skia/ext/SkMemory_new_handler.cpp.orig 2024-04-19 13:02:56 UTC +++ skia/ext/SkMemory_new_handler.cpp -@@ -86,7 +86,7 @@ static void* malloc_nothrow(size_t size) { +@@ -19,7 +19,7 @@ + #include <windows.h> + #elif BUILDFLAG(IS_APPLE) + #include <malloc/malloc.h> +-#else ++#elif !BUILDFLAG(IS_BSD) + #include <malloc.h> + #endif + +@@ -92,7 +92,7 @@ static void* malloc_nothrow(size_t size) { // TODO(b.kelemen): we should always use UncheckedMalloc but currently it // doesn't work as intended everywhere. void* result; diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index c9a25ba9b50e..156a5b389d2c 100644 --- a/www/chromium/files/patch-third__party_angle_BUILD.gn +++ b/www/chromium/files/patch-third__party_angle_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/BUILD.gn.orig 2024-03-22 08:19:40 UTC +--- third_party/angle/BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ third_party/angle/BUILD.gn -@@ -331,7 +331,6 @@ config("extra_warnings") { +@@ -335,7 +335,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,7 +8,7 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -502,7 +501,7 @@ template("angle_common_lib") { +@@ -506,7 +505,7 @@ template("angle_common_lib") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -657,6 +656,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -661,6 +660,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp index 42c398484d14..1efaa5b7a797 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,4 +1,4 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2024-03-22 08:19:40 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2024-04-19 13:02:56 UTC +++ third_party/angle/src/libANGLE/Display.cpp @@ -60,7 +60,7 @@ # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" @@ -36,7 +36,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable()) { -@@ -2152,7 +2152,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2158,7 +2158,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc b/www/chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc index a2df4662bc72..058231b2beb8 100644 --- a/www/chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc +++ b/www/chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc @@ -1,6 +1,6 @@ ---- third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig 2024-01-30 07:53:34 UTC +--- third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig 2024-04-19 13:02:56 UTC +++ third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc -@@ -63,7 +63,7 @@ bool StructTraits<blink::mojom::RendererPreferencesDat +@@ -68,7 +68,7 @@ bool StructTraits<blink::mojom::RendererPreferencesDat out->send_subresource_notification = data.send_subresource_notification(); diff --git a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h index 938f441c0ba2..eec17aa652b5 100644 --- a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h +++ b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2024-03-22 08:19:40 UTC +--- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2024-04-19 13:02:56 UTC +++ third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h -@@ -165,7 +165,7 @@ struct BLINK_COMMON_EXPORT +@@ -166,7 +166,7 @@ struct BLINK_COMMON_EXPORT return data.send_subresource_notification; } diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc index 52c14c4ae410..0ea962d87022 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2024-02-23 21:04:38 UTC +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2024-04-19 13:02:56 UTC +++ third_party/blink/renderer/controller/blink_initializer.cc -@@ -75,12 +75,12 @@ +@@ -80,12 +80,12 @@ #include "third_party/blink/renderer/controller/private_memory_footprint_provider.h" #endif @@ -15,7 +15,7 @@ #include "third_party/blink/renderer/controller/highest_pmf_reporter.h" #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h" #endif -@@ -247,7 +247,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder +@@ -255,7 +255,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder main_thread_task_runner); #endif @@ -24,7 +24,7 @@ binders.Add<mojom::blink::MemoryUsageMonitorLinux>( ConvertToBaseRepeatingCallback( CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)), -@@ -286,7 +286,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform +@@ -294,7 +294,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index 08827888cd0d..c2658692af35 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2024-03-22 08:19:40 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2024-04-19 13:02:56 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -425,7 +425,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { @@ -9,7 +9,7 @@ if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3376,7 +3376,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3385,7 +3385,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs renderer_preferences_.use_subpixel_positioning); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index 4da43c989664..213b880bd866 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2024-03-22 08:19:40 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2024-04-19 13:02:56 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -71,7 +71,7 @@ +@@ -73,7 +73,7 @@ #include "ui/gfx/geometry/quad_f.h" #include "ui/gfx/geometry/size_conversions.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -811,7 +811,7 @@ void LayoutView::UpdateLayout() { +@@ -832,7 +832,7 @@ void LayoutView::UpdateLayout() { intrinsic_logical_widths_ = LogicalWidth(); } diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_paint_object__paint__properties__sparse.h b/www/chromium/files/patch-third__party_blink_renderer_core_paint_object__paint__properties__sparse.h deleted file mode 100644 index a8abda97c205..000000000000 --- a/www/chromium/files/patch-third__party_blink_renderer_core_paint_object__paint__properties__sparse.h +++ /dev/null @@ -1,13 +0,0 @@ ---- third_party/blink/renderer/core/paint/object_paint_properties_sparse.h.orig 2023-10-11 18:22:24 UTC -+++ third_party/blink/renderer/core/paint/object_paint_properties_sparse.h -@@ -272,8 +272,8 @@ class CORE_EXPORT ObjectPaintPropertiesSparse : public - NodeList& nodes, - NodeId node_id, - const ParentType& parent, -- NodeType::State&& state, -- const NodeType::AnimationState& animation_state = -+ typename NodeType::State&& state, -+ const typename NodeType::AnimationState& animation_state = - NodeType::AnimationState()) { - // First, check if we need to add a new node. - if (!nodes.HasField(node_id)) { diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc index 512284730582..322b3a6045e3 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2023-11-03 10:09:45 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2024-04-19 13:02:56 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -120,7 +120,7 @@ namespace blink { +@@ -122,7 +122,7 @@ namespace blink { namespace { diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc index c56ccbcf5421..2dc30279c060 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2024-03-22 08:19:40 UTC +--- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2024-04-19 13:02:56 UTC +++ third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc -@@ -726,7 +726,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten +@@ -813,7 +813,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten mixer->get_output_params_for_testing().sample_rate()); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni b/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni index d972cb7ed516..1b186e79d497 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/modules/ml/webnn/features.gni.orig 2024-01-30 07:53:34 UTC +--- third_party/blink/renderer/modules/ml/webnn/features.gni.orig 2024-04-19 13:02:56 UTC +++ third_party/blink/renderer/modules/ml/webnn/features.gni @@ -6,7 +6,7 @@ import("//build/config/chrome_build.gni") declare_args() { @@ -8,4 +8,4 @@ + build_webnn_with_xnnpack = !is_bsd && (is_linux || is_win || is_mac) && (current_cpu == "x64" || current_cpu == "x86" || (current_cpu == "arm64" && !is_win)) - + } diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc index 2cb0fc87a501..52afa88caa76 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2024-02-23 21:04:38 UTC +--- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2024-04-19 13:02:56 UTC +++ third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc -@@ -202,7 +202,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount +@@ -204,7 +204,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount ~SharedXnnpackContext() { base::AutoLock auto_lock(SharedXnnpackContextLock()); diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc index 8a7d2f2cca6c..14c790623fd5 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2023-01-11 09:17:16 UTC +--- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2024-04-19 13:02:56 UTC +++ third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc -@@ -380,7 +380,7 @@ class AudioWorkletThreadPriorityTest +@@ -463,7 +463,7 @@ class AudioWorkletThreadPriorityTest // TODO(crbug.com/1022888): The worklet thread priority is always NORMAL // on OS_LINUX and OS_CHROMEOS regardless of the thread priority setting. diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index 1fee087bd399..37f837a8db08 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2024-03-22 08:19:40 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2024-04-19 13:02:56 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6363,7 +6363,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6358,7 +6358,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn index 88535b7a93c0..7832e8964278 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/BUILD.gn.orig 2024-03-22 08:19:40 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -1939,7 +1939,7 @@ static_library("test_support") { +@@ -1947,7 +1947,7 @@ static_library("test_support") { ] # fuzzed_data_provider may not work with a custom toolchain. diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc index f3316170c556..d51497f12a3b 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2023-12-10 06:10:27 UTC +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2024-04-19 13:02:56 UTC +++ third_party/blink/renderer/platform/fonts/font_description.cc @@ -39,7 +39,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -277,7 +277,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -275,7 +275,7 @@ FontCacheKey FontDescription::CacheKey( static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc index 2110defef19d..f002779c7ec5 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2024-01-30 07:53:34 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2024-04-19 13:02:56 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -365,7 +365,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -400,7 +400,7 @@ void VideoFrameSubmitter::OnBeginFrame( continue; auto& feedback = timing_details.find(frame_token)->value.presentation_feedback; diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc index 98c6c469c746..b668448809b7 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc @@ -1,6 +1,16 @@ ---- third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc.orig 2023-01-11 09:17:16 UTC +--- third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc.orig 2024-04-19 13:02:56 UTC +++ third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc -@@ -24,6 +24,7 @@ PartitionAllocMemoryDumpProvider* PartitionAllocMemory +@@ -14,7 +14,9 @@ + + namespace blink { + ++#if !BUILDFLAG(IS_BSD) + const char kPartitionAllocDumpName[] = "partition_alloc"; ++#endif + + PartitionAllocMemoryDumpProvider* PartitionAllocMemoryDumpProvider::Instance() { + DEFINE_STATIC_LOCAL(PartitionAllocMemoryDumpProvider, instance, ()); +@@ -24,6 +26,7 @@ PartitionAllocMemoryDumpProvider* PartitionAllocMemory bool PartitionAllocMemoryDumpProvider::OnMemoryDump( const base::trace_event::MemoryDumpArgs& args, base::trace_event::ProcessMemoryDump* memory_dump) { @@ -8,7 +18,7 @@ using base::trace_event::MemoryDumpLevelOfDetail; MemoryDumpLevelOfDetail level_of_detail = args.level_of_detail; -@@ -49,6 +50,7 @@ bool PartitionAllocMemoryDumpProvider::OnMemoryDump( +@@ -49,6 +52,7 @@ bool PartitionAllocMemoryDumpProvider::OnMemoryDump( "size", "bytes", partition_stats_dumper.total_active_bytes()); memory_dump->AddOwnershipEdge(allocated_objects_dump->guid(), partitions_dump->guid()); diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 index f7204bd4310e..e8b0df090779 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2024-03-22 08:19:40 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2024-04-19 13:02:56 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -309,7 +309,7 @@ +@@ -321,7 +321,7 @@ name: "AppTitle", status: "experimental", origin_trial_feature_name: "AppTitle", @@ -9,7 +9,7 @@ base_feature: "WebAppEnableAppTitle", }, { -@@ -1918,7 +1918,7 @@ +@@ -1969,7 +1969,7 @@ base_feature_status: "enabled", copied_from_base_feature_if: "overridden", origin_trial_feature_name: "FullscreenPopupWindows", @@ -18,7 +18,7 @@ }, { name: "GamepadButtonAxisEvents", -@@ -2795,7 +2795,7 @@ +@@ -2890,7 +2890,7 @@ name: "PaymentHandlerMinimalHeaderUX", origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX", origin_trial_allows_third_party: true, @@ -27,16 +27,16 @@ status: "stable", }, { -@@ -2987,7 +2987,7 @@ +@@ -3082,7 +3082,7 @@ { name: "PrivateNetworkAccessPermissionPrompt", origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt", - origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"], + origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"], - status: "experimental", + status: "stable", public: true, base_feature: "none", -@@ -3815,7 +3815,7 @@ +@@ -3950,7 +3950,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -45,7 +45,7 @@ }, // Enables using policy-controlled feature "usb-unrestricted" to allow // isolated context to access protected USB interface classes and to -@@ -3974,7 +3974,7 @@ +@@ -4110,7 +4110,7 @@ { name: "WebAppScopeExtensions", origin_trial_feature_name: "WebAppScopeExtensions", @@ -54,12 +54,3 @@ status: "experimental", base_feature: "none", }, -@@ -4013,7 +4013,7 @@ - status: "experimental", - base_feature: "none", - origin_trial_feature_name: "WebAppUrlHandling", -- origin_trial_os: ["win", "mac", "linux"], -+ origin_trial_os: ["win", "mac", "linux", "openbsd", "freebsd"], - }, - { - // WebAssembly JS Promise Integration, diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc index 850b6013f3fa..e00f3587712a 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig 2024-02-23 21:04:38 UTC +--- third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig 2024-04-19 13:02:56 UTC +++ third_party/blink/renderer/platform/video_capture/video_capture_impl.cc -@@ -679,7 +679,7 @@ bool VideoCaptureImpl::BindVideoFrameOnMediaTaskRunner +@@ -676,7 +676,7 @@ bool VideoCaptureImpl::BindVideoFrameOnMediaTaskRunner } const unsigned texture_target = -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Explicitly set GL_TEXTURE_EXTERNAL_OES as the + // Explicitly set GL_TEXTURE_EXTERNAL_OES if necessary: // `media::VideoFrame::RequiresExternalSampler()` requires it for NV12 - // format, while the `ImageTextureTarget()` will return GL_TEXTURE_2D. + // format, while `ClientSharedImage::GetTextureTarget(BufferUsage, diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc new file mode 100644 index 000000000000..ff10a2d7b858 --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc @@ -0,0 +1,18 @@ +--- third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc.orig 2024-04-19 13:02:56 UTC ++++ third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc +@@ -615,6 +615,7 @@ static void GbkUrlEscapedEntityCallack( + code_point, reason, err); + } + ++#if !BUILDFLAG(IS_BSD) + static void GbkCallbackSubstitute(const void* context, + UConverterFromUnicodeArgs* from_unicode_args, + const UChar* code_units, +@@ -632,6 +633,7 @@ static void GbkCallbackSubstitute(const void* context, + UCNV_FROM_U_CALLBACK_SUBSTITUTE(context, from_unicode_args, code_units, + length, code_point, reason, err); + } ++#endif + #endif // USING_SYSTEM_ICU + + static void NotReachedEntityCallback(const void* context, diff --git a/www/chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py b/www/chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py index a48abde6e45d..e7e6c332c8f3 100644 --- a/www/chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py +++ b/www/chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py @@ -1,6 +1,6 @@ ---- third_party/boringssl/src/util/generate_build_files.py.orig 2024-03-22 08:19:40 UTC +--- third_party/boringssl/src/util/generate_build_files.py.orig 2024-04-19 13:02:56 UTC +++ third_party/boringssl/src/util/generate_build_files.py -@@ -798,10 +798,10 @@ def main(platforms): +@@ -807,10 +807,10 @@ def main(platforms): ] # Generate err_data.c @@ -15,7 +15,7 @@ crypto_c_files.append('err_data.c') crypto_c_files.sort() -@@ -812,11 +812,11 @@ def main(platforms): +@@ -821,11 +821,11 @@ def main(platforms): crypto_test_files = [] if EMBED_TEST_DATA: # Generate crypto_test_data.cc diff --git a/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn b/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn index cac1b977b0b2..8256c0dc6015 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn +++ b/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- third_party/ffmpeg/BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ third_party/ffmpeg/BUILD.gn -@@ -349,7 +349,6 @@ target(link_target_type, "ffmpeg_internal") { +@@ -343,7 +343,6 @@ target(link_target_type, "ffmpeg_internal") { libs += [ "m", "z", diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py b/www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py index d44ba6a93e33..472bb9478d6b 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py +++ b/www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py @@ -1,4 +1,4 @@ ---- third_party/ffmpeg/chromium/scripts/build_ffmpeg.py.orig 2024-03-22 08:19:40 UTC +--- third_party/ffmpeg/chromium/scripts/build_ffmpeg.py.orig 2024-04-19 13:02:56 UTC +++ third_party/ffmpeg/chromium/scripts/build_ffmpeg.py @@ -32,7 +32,7 @@ NDK_ROOT_DIR = os.path.abspath( SUCCESS_TOKEN = 'THIS_BUILD_WORKED' @@ -9,75 +9,67 @@ BRANDINGS = [ 'Chrome', -@@ -45,6 +45,8 @@ ARCH_MAP = { - 'linux': [ - 'ia32', 'x64', 'noasm-x64', 'arm', 'arm-neon', 'arm64' - ], +@@ -43,6 +43,8 @@ BRANDINGS = [ + ARCH_MAP = { + 'android': ['ia32', 'x64', 'arm-neon', 'arm64'], + 'linux': ['ia32', 'x64', 'noasm-x64', 'arm', 'arm-neon', 'arm64'], + 'openbsd': ['x64', 'arm64', 'ia32'], + 'freebsd': ['x64', 'arm64', 'ia32'], 'mac': ['x64', 'arm64'], 'win': ['ia32', 'x64', 'arm64'], } -@@ -54,6 +56,8 @@ USAGE_END = """ - Valid combinations are android [%(android)s] - linux [%(linux)s] - mac [%(mac)s] -+ openbsd [%(openbsd)s] -+ freebsd [%(freebsd)s] - win [%(win)s] - - If no target architecture is specified all will be built. -@@ -124,7 +128,7 @@ def PrintAndCheckCall(argv, *args, **kwargs): +@@ -122,7 +124,7 @@ def PrintAndCheckCall(argv, *args, **kwargs): def GetDsoName(target_os, dso_name, dso_version): -- if target_os in ('linux', 'linux-noasm', 'android'): -+ if target_os in ('linux', 'linux-noasm', 'android', 'openbsd', 'freebsd'): - return 'lib%s.so.%s' % (dso_name, dso_version) - elif target_os == 'mac': - return 'lib%s.%s.dylib' % (dso_name, dso_version) -@@ -467,7 +471,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_ - # removing <sys/sysctl.h> soon, so this is needed to silence a deprecation - # #warning which will be converted to an error via -Werror. - # There is also no prctl.h -- if target_os in ['linux', 'linux-noasm']: -+ if target_os in ['linux', 'linux-noasm', 'openbsd', 'freebsd']: - pre_make_rewrites += [ - (r'(#define HAVE_SYSCTL [01])', - r'#define HAVE_SYSCTL 0 /* \1 -- forced to 0 for Fuchsia */'), -@@ -594,7 +598,7 @@ def main(argv): - configure_args = args[2:] - +- if target_os in ('linux', 'linux-noasm', 'android'): ++ if target_os in ('linux', 'linux-noasm', 'android', 'openbsd', 'freebsd'): + return 'lib%s.so.%s' % (dso_name, dso_version) + elif target_os == 'mac': + return 'lib%s.%s.dylib' % (dso_name, dso_version) +@@ -474,7 +476,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_ + # removing <sys/sysctl.h> soon, so this is needed to silence a deprecation + # #warning which will be converted to an error via -Werror. + # There is also no prctl.h +- if target_os in ['linux', 'linux-noasm']: ++ if target_os in ['linux', 'linux-noasm', 'openbsd', 'freebsd']: + pre_make_rewrites += [ + (r'(#define HAVE_SYSCTL [01])', + r'#define HAVE_SYSCTL 0 /* \1 -- forced to 0 for Fuchsia */'), +@@ -597,7 +599,7 @@ def main(argv): + configure_args = args[2:] -- if target_os not in ('android', 'linux', 'linux-noasm', 'mac', 'win', 'all'): -+ if target_os not in ('android', 'linux', 'linux-noasm', 'mac', 'win', 'all', 'openbsd', 'freebsd'): - parser.print_help() - return 1 + if target_os not in ('android', 'linux', 'linux-noasm', 'mac', 'win', +- 'all'): ++ 'all', 'openbsd', 'freebsd'): + parser.print_help() + return 1 -@@ -710,7 +714,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, - '--enable-parser=vp3,vp8', - ]) +@@ -710,7 +712,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, + '--optflags="-O2"', + ]) -- if target_os in ('linux', 'linux-noasm', 'android'): -+ if target_os in ('linux', 'linux-noasm', 'android', 'openbsd', 'freebsd'): - if target_arch == 'x64': - if target_os == 'android': - configure_flags['Common'].extend([ -@@ -822,8 +826,6 @@ def ConfigureAndBuild(target_arch, target_os, host_os, +- if target_os in ('linux', 'linux-noasm', 'android'): ++ if target_os in ('linux', 'linux-noasm', 'android', 'openbsd', 'freebsd'): + if target_arch == 'x64': + if target_os == 'android': + configure_flags['Common'].extend([ +@@ -825,9 +827,6 @@ def ConfigureAndBuild(target_arch, target_os, host_os, - configure_flags['Common'].extend([ - '--target-os=linux', -- '--sysroot=' + os.path.join(CHROMIUM_ROOT_DIR, -- 'build/linux/debian_bullseye_arm64-sysroot'), - # See crbug.com/1467681. These could be removed eventually - '--disable-dotprod', - '--disable-i8mm', -@@ -1027,7 +1029,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, - 'Chrome', configure_flags['Common'] + configure_flags['ChromeAndroid'] + - configure_args) + configure_flags['Common'].extend([ + '--target-os=linux', +- '--sysroot=' + +- os.path.join(CHROMIUM_ROOT_DIR, +- 'build/linux/debian_bullseye_arm64-sysroot'), + # See crbug.com/1467681. These could be removed eventually + '--disable-dotprod', + '--disable-i8mm', +@@ -1031,7 +1030,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, + 'Chrome', configure_flags['Common'] + + configure_flags['ChromeAndroid'] + configure_args) -- if target_os in ['linux', 'linux-noasm']: -+ if target_os in ['linux', 'linux-noasm', 'openbsd', 'freebsd']: - # ChromeOS enables MPEG4 which requires error resilience :( - chrome_os_flags = ( - configure_flags['Common'] + configure_flags['Chrome'] + +- if target_os in ['linux', 'linux-noasm']: ++ if target_os in ['linux', 'linux-noasm', 'openbsd', 'freebsd']: + # ChromeOS enables MPEG4 which requires error resilience :( + chrome_os_flags = (configure_flags['Common'] + + configure_flags['Chrome'] + diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_robo__lib_config.py b/www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_robo__lib_config.py index f70854fed683..c677afba1eec 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_robo__lib_config.py +++ b/www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_robo__lib_config.py @@ -1,55 +1,55 @@ ---- third_party/ffmpeg/chromium/scripts/robo_lib/config.py.orig 2024-03-22 08:19:40 UTC +--- third_party/ffmpeg/chromium/scripts/robo_lib/config.py.orig 2024-04-19 13:02:56 UTC +++ third_party/ffmpeg/chromium/scripts/robo_lib/config.py -@@ -49,18 +49,12 @@ class RoboConfiguration: - self._llvm_path = os.path.join(self.chrome_src(), "third_party", - "llvm-build", "Release+Asserts", "bin") +@@ -51,18 +51,12 @@ class RoboConfiguration: + self._llvm_path = os.path.join(self.chrome_src(), "third_party", + "llvm-build", "Release+Asserts", "bin") -- self.EnsurePathContainsLLVM() -- self.EnsureNoMakeInfo() - self.EnsureFFmpegHome() - self.EnsureASANConfig() -- self.ComputeBranchName() - if not quiet: - shell.log(f"Using chrome src: {self.chrome_src()}") - shell.log(f"Using script dir: {self._script_directory}") - shell.log(f"Using ffmpeg home:{self.ffmpeg_home()}") -- shell.log(f"On branch: {self.branch_name()}") -- if self.sushi_branch_name(): -- shell.log(f"On sushi branch: {self.sushi_branch_name()}") +- self.EnsurePathContainsLLVM() +- self.EnsureNoMakeInfo() + self.EnsureFFmpegHome() + self.EnsureASANConfig() +- self.ComputeBranchName() + if not quiet: + shell.log(f"Using chrome src: {self.chrome_src()}") + shell.log(f"Using script dir: {self._script_directory}") + shell.log(f"Using ffmpeg home:{self.ffmpeg_home()}") +- shell.log(f"On branch: {self.branch_name()}") +- if self.sushi_branch_name(): +- shell.log(f"On sushi branch: {self.sushi_branch_name()}") - # Filename that we'll ask generate_gn.py to write git commands to. - # TODO: Should this use script_directory, or stay with ffmpeg? As long as -@@ -152,9 +146,9 @@ class RoboConfiguration: + # Filename that we'll ask generate_gn.py to write git commands to. + # TODO: Should this use script_directory, or stay with ffmpeg? As long as +@@ -155,9 +149,9 @@ class RoboConfiguration: - if re.match(r"i.86", platform.machine()): - self._host_architecture = "ia32" -- elif platform.machine() == "x86_64" or platform.machine() == "AMD64": -+ elif platform.machine() == "x86_64" or platform.machine() == "AMD64" or platform.machine() == "amd64": - self._host_architecture = "x64" -- elif platform.machine() == "aarch64": -+ elif platform.machine() == "aarch64" or platform.machine() == "arm64": - self._host_architecture = "arm64" - elif platform.machine() == "mips32": - self._host_architecture = "mipsel" -@@ -185,6 +179,10 @@ class RoboConfiguration: - self._host_operating_system = "mac" - elif platform.system() == "Windows" or "CYGWIN_NT" in platform.system(): - self._host_operating_system = "win" -+ elif platform.system() == "OpenBSD": -+ self._host_operating_system = "openbsd" -+ elif platform.system() == "FreeBSD": -+ self._host_operating_system = "freebsd" - else: - raise ValueError(f"Unsupported platform: {platform.system()}") + if re.match(r"i.86", platform.machine()): + self._host_architecture = "ia32" +- elif platform.machine() == "x86_64" or platform.machine() == "AMD64": ++ elif platform.machine() == "x86_64" or platform.machine() == "AMD64" or platform.machine() == "amd64": + self._host_architecture = "x64" +- elif platform.machine() == "aarch64": ++ elif platform.machine() == "aarch64" or platform.machine() == "arm64": + self._host_architecture = "arm64" + elif platform.machine() == "mips32": + self._host_architecture = "mipsel" +@@ -192,6 +186,10 @@ class RoboConfiguration: + elif platform.system() == "Windows" or "CYGWIN_NT" in platform.system( + ): + self._host_operating_system = "win" ++ elif platform.system() == "OpenBSD": ++ self._host_operating_system = "openbsd" ++ elif platform.system() == "FreeBSD": ++ self._host_operating_system = "freebsd" + else: + raise ValueError(f"Unsupported platform: {platform.system()}") -@@ -193,8 +191,8 @@ class RoboConfiguration: - wd = os.getcwd() - # Walk up the tree until we find src/AUTHORS - while wd != "/": -- if os.path.isfile(os.path.join(wd, "src", "AUTHORS")): -- self._chrome_src = os.path.join(wd, "src") -+ if os.path.isfile(os.path.join(wd, "third_party", "DEPS")): -+ self._chrome_src = wd - return - wd = os.path.dirname(wd) - raise Exception("could not find src/AUTHORS in any parent of the wd") +@@ -200,8 +198,8 @@ class RoboConfiguration: + wd = os.getcwd() + # Walk up the tree until we find src/AUTHORS + while wd != "/": +- if os.path.isfile(os.path.join(wd, "src", "AUTHORS")): +- self._chrome_src = os.path.join(wd, "src") ++ if os.path.isfile(os.path.join(wd, "third_party", "DEPS")): ++ self._chrome_src = wd + return + wd = os.path.dirname(wd) + raise Exception("could not find src/AUTHORS in any parent of the wd") diff --git a/www/chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c b/www/chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c index 7d4e105d03f0..a18b66eb4f9a 100644 --- a/www/chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c +++ b/www/chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c @@ -1,6 +1,6 @@ ---- third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig 2024-03-22 13:03:21 UTC +--- third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig 2024-04-19 13:02:56 UTC +++ third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c -@@ -95,9 +95,45 @@ static int arm_get_cpu_caps(void) { +@@ -99,9 +99,45 @@ static int arm_get_cpu_caps(void) { return flags; } diff --git a/www/chromium/files/patch-third__party_libusb_src_libusb_libusb.h b/www/chromium/files/patch-third__party_libusb_src_libusb_libusb.h new file mode 100644 index 000000000000..195e21568483 --- /dev/null +++ b/www/chromium/files/patch-third__party_libusb_src_libusb_libusb.h @@ -0,0 +1,11 @@ +--- third_party/libusb/src/libusb/libusb.h.orig 2024-04-19 13:02:56 UTC ++++ third_party/libusb/src/libusb/libusb.h +@@ -60,7 +60,7 @@ typedef unsigned __int32 uint32_t; + #include <sys/types.h> + #endif + +-#if defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__) ++#if defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__OpenBSD__) || defined(__FreeBSD__) + #include <sys/time.h> + #endif + diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp index 90d110381036..8a5956e8610a 100644 --- a/www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp +++ b/www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp @@ -1,15 +1,15 @@ ---- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2022-06-17 14:20:10 UTC +--- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2024-04-19 13:02:56 UTC +++ third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp -@@ -18,7 +18,7 @@ - #include "third_party/base/check.h" +@@ -17,7 +17,7 @@ + #include "core/fxge/fx_font.h" + #include "core/fxge/systemfontinfo_iface.h" - #if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !defined(OS_FUCHSIA) && \ -- !defined(OS_ASMJS) -+ !defined(OS_ASMJS) && !BUILDFLAG(IS_BSD) +-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !defined(OS_ASMJS) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !defined(OS_ASMJS) && !BUILDFLAG(IS_BSD) #error "Included on the wrong platform" #endif -@@ -166,9 +166,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf +@@ -165,9 +165,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf std::unique_ptr<SystemFontInfoIface> CreateDefaultSystemFontInfo() override { auto pInfo = std::make_unique<CFX_LinuxFontInfo>(); if (!pInfo->ParseFontCfg(CFX_GEModule::Get()->GetUserFontPaths())) { diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_service_tracing__service__impl.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_clock__snapshots.cc index 246935885939..d627e835db6c 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_tracing_service_tracing__service__impl.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_clock__snapshots.cc @@ -1,7 +1,7 @@ ---- third_party/perfetto/src/tracing/service/tracing_service_impl.cc.orig 2024-03-22 08:19:40 UTC -+++ third_party/perfetto/src/tracing/service/tracing_service_impl.cc -@@ -3275,7 +3275,8 @@ bool TracingServiceImpl::SnapshotClocks( - +--- third_party/perfetto/src/tracing/core/clock_snapshots.cc.orig 2024-04-19 13:02:56 UTC ++++ third_party/perfetto/src/tracing/core/clock_snapshots.cc +@@ -26,7 +26,8 @@ ClockSnapshotVector CaptureClockSnapshots() { + ClockSnapshotVector snapshot_data; #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \ !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ - !PERFETTO_BUILDFLAG(PERFETTO_OS_NACL) diff --git a/www/chromium/files/patch-third__party_skia_src_base_SkContainers.cpp b/www/chromium/files/patch-third__party_skia_src_ports_SkMemory__malloc.cpp index 7bee2c85f712..3b7a973a9636 100644 --- a/www/chromium/files/patch-third__party_skia_src_base_SkContainers.cpp +++ b/www/chromium/files/patch-third__party_skia_src_ports_SkMemory__malloc.cpp @@ -1,6 +1,6 @@ ---- third_party/skia/src/base/SkContainers.cpp.orig 2023-03-09 06:31:50 UTC -+++ third_party/skia/src/base/SkContainers.cpp -@@ -14,7 +14,7 @@ +--- third_party/skia/src/ports/SkMemory_malloc.cpp.orig 2024-04-19 13:02:56 UTC ++++ third_party/skia/src/ports/SkMemory_malloc.cpp +@@ -15,7 +15,7 @@ #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) #include <malloc/malloc.h> @@ -9,12 +9,12 @@ #include <malloc.h> #elif defined(SK_BUILD_FOR_WIN) #include <malloc.h> -@@ -38,7 +38,7 @@ SkSpan<std::byte> complete_size(void* ptr, size_t size +@@ -126,7 +126,7 @@ size_t sk_malloc_size(void* addr, size_t size) { #elif defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 17 - completeSize = malloc_usable_size(ptr); + completeSize = malloc_usable_size(addr); SkASSERT(completeSize >= size); - #elif defined(SK_BUILD_FOR_UNIX) + #elif defined(SK_BUILD_FOR_UNIX) && !defined(__OpenBSD__) - completeSize = malloc_usable_size(ptr); + completeSize = malloc_usable_size(addr); SkASSERT(completeSize >= size); #elif defined(SK_BUILD_FOR_WIN) diff --git a/www/chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h b/www/chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h index 5dbb624ff3ab..a26fa26cc609 100644 --- a/www/chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h +++ b/www/chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h @@ -1,4 +1,4 @@ ---- third_party/speech-dispatcher/libspeechd_version.h.orig 2023-12-10 06:10:27 UTC +--- third_party/speech-dispatcher/libspeechd_version.h.orig 2024-04-19 13:02:56 UTC +++ third_party/speech-dispatcher/libspeechd_version.h @@ -0,0 +1,29 @@ +/* @@ -19,7 +19,7 @@ + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + * -+ * $Id: libspeechd.h,v 1.29 2008-07-30 09:47:00 hanke Exp $ ++ * $Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.4 2024/03/22 13:10:56 robert Exp $ + */ + +#ifndef _LIBSPEECHD_VERSION_H diff --git a/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c index e9959f889e36..159d76175df2 100644 --- a/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c +++ b/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c @@ -1,6 +1,6 @@ ---- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2024-03-22 08:19:40 UTC +--- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2024-04-19 13:02:56 UTC +++ third_party/sqlite/src/amalgamation/sqlite3.c -@@ -44510,7 +44510,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -44768,7 +44768,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB memset(zBuf, 0, nBuf); randomnessPid = osGetpid(0); #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS) @@ -13,7 +13,7 @@ int fd, got; fd = robust_open("/dev/urandom", O_RDONLY, 0); if( fd<0 ){ -@@ -44525,6 +44530,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -44783,6 +44788,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB robust_close(0, fd, __LINE__); } } diff --git a/www/chromium/files/patch-third__party_unrar_src_crypt.cpp b/www/chromium/files/patch-third__party_unrar_src_crypt.cpp index 8769300e8988..0276654cea97 100644 --- a/www/chromium/files/patch-third__party_unrar_src_crypt.cpp +++ b/www/chromium/files/patch-third__party_unrar_src_crypt.cpp @@ -1,6 +1,6 @@ ---- third_party/unrar/src/crypt.cpp.orig 2022-02-07 13:39:41 UTC +--- third_party/unrar/src/crypt.cpp.orig 2024-04-19 13:02:56 UTC +++ third_party/unrar/src/crypt.cpp -@@ -120,6 +120,8 @@ void GetRnd(byte *RndBuf,size_t BufSize) +@@ -117,6 +117,8 @@ void GetRnd(byte *RndBuf,size_t BufSize) Success=CryptGenRandom(hProvider, (DWORD)BufSize, RndBuf) == TRUE; CryptReleaseContext(hProvider, 0); } diff --git a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn index 7b8c55674a76..4e1694dfd571 100644 --- a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2024-01-30 07:53:34 UTC +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ third_party/webrtc/modules/audio_device/BUILD.gn -@@ -350,7 +350,7 @@ rtc_library("audio_device_impl") { +@@ -348,7 +348,7 @@ rtc_library("audio_device_impl") { if (rtc_use_dummy_audio_file_devices) { defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] } else { diff --git a/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc b/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc index 3a8e2b811edb..84acc5c1e876 100644 --- a/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc +++ b/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc @@ -1,15 +1,23 @@ ---- third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc.orig 2023-04-28 17:01:32 UTC +--- third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc.orig 2024-04-19 13:02:56 UTC +++ third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc -@@ -203,6 +203,12 @@ bool XServerPixelBuffer::Init(XAtomCache* cache, Windo +@@ -201,6 +201,12 @@ bool XServerPixelBuffer::Init(XAtomCache* cache, Windo + } + void XServerPixelBuffer::InitShm(const XWindowAttributes& attributes) { - Visual* default_visual = attributes.visual; - int default_depth = attributes.depth; +#if defined(__OpenBSD__) +// pledge(2) + RTC_LOG(LS_WARNING) << "Unable to use shmget(2) while using pledge(2). " + "Performance may be degraded."; + return; ++#else + Visual* default_visual = attributes.visual; + int default_depth = attributes.depth; + +@@ -261,6 +267,7 @@ void XServerPixelBuffer::InitShm(const XWindowAttribut + RTC_LOG(LS_VERBOSE) << "Using X shared memory extension v" << major << "." + << minor << " with" << (have_pixmaps ? "" : "out") + << " pixmaps."; +#endif + } - int major, minor; - Bool have_pixmaps; + bool XServerPixelBuffer::InitPixmaps(int depth) { diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc index 4978f2313f60..e05c71a79d4b 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2024-03-22 08:19:40 UTC +--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2024-04-19 13:02:56 UTC +++ third_party/webrtc/rtc_base/physical_socket_server.cc -@@ -53,7 +53,7 @@ +@@ -54,7 +54,7 @@ #include "rtc_base/time_utils.h" #include "system_wrappers/include/field_trial.h" @@ -9,7 +9,7 @@ #include <linux/sockios.h> #endif -@@ -73,7 +73,7 @@ typedef void* SockOptArg; +@@ -74,7 +74,7 @@ typedef void* SockOptArg; #endif // WEBRTC_POSIX @@ -18,7 +18,7 @@ int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; -@@ -307,7 +307,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) +@@ -336,7 +336,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) return -1; } if (opt == OPT_DONTFRAGMENT) { @@ -27,7 +27,7 @@ *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; #endif } else if (opt == OPT_DSCP) { -@@ -325,7 +325,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -365,7 +365,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { if (TranslateOption(opt, &slevel, &sopt) == -1) return -1; if (opt == OPT_DONTFRAGMENT) { @@ -36,7 +36,7 @@ value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; #endif } else if (opt == OPT_DSCP) { -@@ -353,7 +353,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -396,7 +396,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { int PhysicalSocket::Send(const void* pv, size_t cb) { int sent = DoSend( s_, reinterpret_cast<const char*>(pv), static_cast<int>(cb), @@ -45,7 +45,7 @@ // Suppress SIGPIPE. Without this, attempting to send on a socket whose // other end is closed will result in a SIGPIPE signal being raised to // our process, which by default will terminate the process, which we -@@ -382,7 +382,7 @@ int PhysicalSocket::SendTo(const void* buffer, +@@ -425,7 +425,7 @@ int PhysicalSocket::SendTo(const void* buffer, size_t len = addr.ToSockAddrStorage(&saddr); int sent = DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(length), @@ -54,7 +54,7 @@ // Suppress SIGPIPE. See above for explanation. MSG_NOSIGNAL, #else -@@ -666,7 +666,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -718,7 +718,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; @@ -63,3 +63,52 @@ RTC_LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported."; return -1; #elif defined(WEBRTC_POSIX) +@@ -767,7 +767,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s + return -1; + #endif + case OPT_RECV_ECN: +-#if defined(WEBRTC_POSIX) ++#if defined(WEBRTC_POSIX) && defined(IP_RECVTOS) + if (family_ == AF_INET6) { + *slevel = IPPROTO_IPV6; + *sopt = IPV6_RECVTCLASS; +@@ -787,10 +787,19 @@ int PhysicalSocket::TranslateOption(Option opt, int* s + *sopt = SO_KEEPALIVE; + break; + case OPT_TCP_KEEPCNT: ++#if !defined(TCP_KEEPCNT) ++ RTC_LOG(LS_WARNING) << "Socket::OPT_TCP_KEEPCNT not supported."; ++ return -1; ++#else + *slevel = IPPROTO_TCP; + *sopt = TCP_KEEPCNT; + break; ++#endif + case OPT_TCP_KEEPIDLE: ++#if !defined(TCP_KEEPALIVE) ++ RTC_LOG(LS_WARNING) << "Socket::OPT_TCP_KEEPALIVE not supported."; ++ return -1; ++#else + *slevel = IPPROTO_TCP; + #if !defined(WEBRTC_MAC) + *sopt = TCP_KEEPIDLE; +@@ -798,12 +807,18 @@ int PhysicalSocket::TranslateOption(Option opt, int* s + *sopt = TCP_KEEPALIVE; + #endif + break; ++#endif + case OPT_TCP_KEEPINTVL: ++#if !defined(TCP_KEEPALIVE) ++ RTC_LOG(LS_WARNING) << "Socket::OPT_TCP_KEEPINTVL not supported."; ++ return -1; ++#else + *slevel = IPPROTO_TCP; + *sopt = TCP_KEEPINTVL; + break; ++#endif + case OPT_TCP_USER_TIMEOUT: +-#if defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) ++#if (defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)) && defined(TCP_USER_TIMEOUT) + *slevel = IPPROTO_TCP; + *sopt = TCP_USER_TIMEOUT; + break; diff --git a/www/chromium/files/patch-third__party_zlib_cpu__features.c b/www/chromium/files/patch-third__party_zlib_cpu__features.c index 888381dfafd9..d2b248501655 100644 --- a/www/chromium/files/patch-third__party_zlib_cpu__features.c +++ b/www/chromium/files/patch-third__party_zlib_cpu__features.c @@ -1,16 +1,16 @@ ---- third_party/zlib/cpu_features.c.orig 2023-09-17 18:22:45 UTC +--- third_party/zlib/cpu_features.c.orig 2024-04-19 13:02:56 UTC +++ third_party/zlib/cpu_features.c -@@ -35,7 +35,8 @@ int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0; - +@@ -39,7 +39,8 @@ int ZLIB_INTERNAL riscv_cpu_enable_vclmul = 0; #ifndef CPU_NO_SIMD --#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS) -+#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS) || \ + #if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || \ +- defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS) ++ defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS) || \ + defined(ARMV8_OS_OPENBSD) || defined(ARMV8_OS_FREEBSD) #include <pthread.h> #endif -@@ -52,6 +53,10 @@ int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0; +@@ -56,6 +57,10 @@ int ZLIB_INTERNAL riscv_cpu_enable_vclmul = 0; #include <windows.h> #elif defined(ARMV8_OS_IOS) #include <sys/sysctl.h> @@ -21,17 +21,17 @@ #elif !defined(_MSC_VER) #include <pthread.h> #else -@@ -62,7 +67,8 @@ int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0; - static void _cpu_check_features(void); - #endif - --#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_IOS) -+#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_IOS) || \ -+ defined(ARMV8_OS_OPENBSD) || defined(ARMV8_OS_FREEBSD) +@@ -69,7 +74,8 @@ static void _cpu_check_features(void); + #if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || \ + defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || \ + defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_IOS) || \ +- defined(RISCV_RVV) ++ defined(RISCV_RVV) || defined(ARMV8_OS_OPENBSD) || \ ++ defined(ARMV8_OS_FREEBSD) #if !defined(ARMV8_OS_MACOS) // _cpu_check_features() doesn't need to do anything on mac/arm since all // features are known at build time, so don't call it. -@@ -115,6 +121,17 @@ static void _cpu_check_features(void) +@@ -122,6 +128,17 @@ static void _cpu_check_features(void) unsigned long features = getauxval(AT_HWCAP2); arm_cpu_enable_crc32 = !!(features & HWCAP2_CRC32); arm_cpu_enable_pmull = !!(features & HWCAP2_PMULL); diff --git a/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py b/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py new file mode 100644 index 000000000000..8f51d62c3310 --- /dev/null +++ b/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py @@ -0,0 +1,11 @@ +--- tools/gn/bootstrap/bootstrap.py.orig 2024-04-19 13:02:56 UTC ++++ tools/gn/bootstrap/bootstrap.py +@@ -122,7 +122,7 @@ def main(argv): + + shutil.copy2( + os.path.join(BOOTSTRAP_DIR, 'last_commit_position.h'), gn_build_dir) +- cmd = [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn'] ++ cmd = [ninja_binary, '-C', gn_build_dir, 'gn'] + if options.jobs: + cmd += ['-j', str(options.jobs)] + subprocess.check_call(cmd) diff --git a/www/chromium/files/patch-tools_gn_build_gen.py b/www/chromium/files/patch-tools_gn_build_gen.py index 0249ecbbb018..0d474b4eee9b 100644 --- a/www/chromium/files/patch-tools_gn_build_gen.py +++ b/www/chromium/files/patch-tools_gn_build_gen.py @@ -1,4 +1,4 @@ ---- tools/gn/build/gen.py.orig 2024-03-22 08:19:40 UTC +--- tools/gn/build/gen.py.orig 2024-04-19 13:02:56 UTC +++ tools/gn/build/gen.py @@ -94,6 +94,12 @@ class Platform(object): def is_solaris(self): @@ -13,7 +13,7 @@ def is_posix(self): return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku', 'solaris', 'msys', 'netbsd', 'serenity'] -@@ -293,7 +299,7 @@ def WriteGenericNinja(path, static_libraries, executab +@@ -304,7 +310,7 @@ def WriteGenericNinja(path, static_libraries, executab 'linux': 'build_linux.ninja.template', 'freebsd': 'build_linux.ninja.template', 'aix': 'build_aix.ninja.template', @@ -22,7 +22,7 @@ 'haiku': 'build_haiku.ninja.template', 'solaris': 'build_linux.ninja.template', 'netbsd': 'build_linux.ninja.template', -@@ -525,6 +531,9 @@ def WriteGNNinja(path, platform, host, options, args_l +@@ -539,6 +545,9 @@ def WriteGNNinja(path, platform, host, options, args_l if platform.is_posix() and not platform.is_haiku(): ldflags.append('-pthread') diff --git a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc index fc70c2abd58f..1a4a2b62d1d1 100644 --- a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc +++ b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc @@ -1,9 +1,9 @@ ---- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2023-11-03 10:09:45 UTC +--- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2024-04-19 13:02:56 UTC +++ ui/base/dragdrop/os_exchange_data_provider_non_backed.cc -@@ -96,7 +96,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData( - } +@@ -99,7 +99,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData( - bool OSExchangeDataProviderNonBacked::GetString(std::u16string* data) const { + std::optional<std::u16string> OSExchangeDataProviderNonBacked::GetString() + const { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (HasFile()) { diff --git a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc index c057142cd3b6..50064ea128ac 100644 --- a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc +++ b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc @@ -1,4 +1,4 @@ ---- ui/base/ime/init/input_method_initializer.cc.orig 2024-02-23 21:04:38 UTC +--- ui/base/ime/init/input_method_initializer.cc.orig 2024-04-19 13:02:56 UTC +++ ui/base/ime/init/input_method_initializer.cc @@ -10,7 +10,7 @@ #include "build/chromeos_buildflags.h" @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/fake_input_method_context.h" #include "ui/base/ime/linux/linux_input_method_context_factory.h" #elif BUILDFLAG(IS_WIN) -@@ -33,7 +33,7 @@ void ShutdownInputMethod() { +@@ -43,7 +43,7 @@ void RestartInputMethod() { } void InitializeInputMethodForTesting() { @@ -18,7 +18,7 @@ GetInputMethodContextFactoryForTest() = base::BindRepeating([](LinuxInputMethodContextDelegate* delegate) -> std::unique_ptr<LinuxInputMethodContext> { -@@ -46,7 +46,7 @@ void InitializeInputMethodForTesting() { +@@ -56,7 +56,7 @@ void InitializeInputMethodForTesting() { void ShutdownInputMethodForTesting() { #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \ diff --git a/www/chromium/files/patch-ui_base_ui__base__features.cc b/www/chromium/files/patch-ui_base_ui__base__features.cc index ee6af5c3286e..d0da3c97ac93 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/chromium/files/patch-ui_base_ui__base__features.cc @@ -1,6 +1,6 @@ ---- ui/base/ui_base_features.cc.orig 2024-03-22 08:19:40 UTC +--- ui/base/ui_base_features.cc.orig 2024-04-19 13:02:56 UTC +++ ui/base/ui_base_features.cc -@@ -223,7 +223,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, +@@ -227,7 +227,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -322,7 +322,7 @@ bool IsForcedColorsEnabled() { +@@ -326,7 +326,7 @@ bool IsForcedColorsEnabled() { BASE_FEATURE(kEyeDropper, "EyeDropper", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-ui_base_x_x11__display__util.cc b/www/chromium/files/patch-ui_base_x_x11__display__util.cc index 562c5392d778..1b5a6ad09de3 100644 --- a/www/chromium/files/patch-ui_base_x_x11__display__util.cc +++ b/www/chromium/files/patch-ui_base_x_x11__display__util.cc @@ -1,4 +1,4 @@ ---- ui/base/x/x11_display_util.cc.orig 2024-03-22 08:19:40 UTC +--- ui/base/x/x11_display_util.cc.orig 2024-04-19 13:02:56 UTC +++ ui/base/x/x11_display_util.cc @@ -14,7 +14,6 @@ @@ -16,13 +16,16 @@ #include "ui/gfx/x/atom_cache.h" #include "ui/gfx/x/connection.h" #include "ui/gfx/x/randr.h" -@@ -43,86 +41,42 @@ constexpr std::pair<uint32_t, uint32_t> kMinVersionXra +@@ -43,89 +41,42 @@ constexpr std::pair<uint32_t, uint32_t> kMinVersionXra constexpr const char kRandrEdidProperty[] = "EDID"; -std::map<x11::RandR::Output, size_t> GetMonitors( - const x11::Response<x11::RandR::GetMonitorsReply>& reply) { - std::map<x11::RandR::Output, size_t> output_to_monitor; +- if (!reply) { +- return output_to_monitor; +- } - for (size_t monitor = 0; monitor < reply->monitors.size(); monitor++) { - for (x11::RandR::Output output : reply->monitors[monitor].outputs) { - output_to_monitor[output] = monitor; @@ -124,7 +127,7 @@ }; // If the work area entirely contains exactly one display, assume it's meant -@@ -204,9 +158,14 @@ int DefaultBitsPerComponent() { +@@ -207,9 +158,14 @@ int DefaultBitsPerComponent() { return visual.bits_per_rgb_value; } @@ -142,7 +145,7 @@ std::vector<uint8_t> edid; if (response && response->format == 8 && response->type != x11::Atom::None) { edid = std::move(response->data); -@@ -258,8 +217,7 @@ gfx::PointF DisplayOriginPxToDip(const display::Displa +@@ -261,8 +217,7 @@ gfx::PointF DisplayOriginPxToDip(const display::Displa std::vector<display::Display> GetFallbackDisplayList( float scale, size_t* primary_display_index_out) { @@ -152,11 +155,10 @@ gfx::Size physical_size(screen.width_in_millimeters, screen.height_in_millimeters); -@@ -285,10 +243,7 @@ std::vector<display::Display> GetFallbackDisplayList( - +@@ -289,9 +244,7 @@ std::vector<display::Display> GetFallbackDisplayList( std::vector<display::Display> displays{gfx_display}; *primary_display_index_out = 0; -- + - ClipWorkArea(&displays, *primary_display_index_out, - GetWorkAreaSync(GetWorkAreaFuture(connection))); - @@ -164,11 +166,10 @@ return displays; } -@@ -303,17 +258,7 @@ std::vector<display::Display> BuildDisplaysFromXRandRI - auto& randr = connection->randr(); +@@ -307,16 +260,7 @@ std::vector<display::Display> BuildDisplaysFromXRandRI auto x_root_window = ui::GetX11RootWindow(); std::vector<display::Display> displays; -- + - auto resources_future = randr.GetScreenResourcesCurrent({x_root_window}); - auto output_primary_future = randr.GetOutputPrimary({x_root_window}); - x11::Future<x11::RandR::GetMonitorsReply> monitors_future; @@ -183,7 +184,7 @@ if (!resources) { LOG(ERROR) << "XRandR returned no displays; falling back to root window"; return GetFallbackDisplayList(primary_scale, primary_display_index_out); -@@ -322,65 +267,21 @@ std::vector<display::Display> BuildDisplaysFromXRandRI +@@ -325,65 +269,21 @@ std::vector<display::Display> BuildDisplaysFromXRandRI const int depth = connection->default_screen().root_depth; const int bits_per_component = DefaultBitsPerComponent(); @@ -254,7 +255,7 @@ if (!output_info) { continue; } -@@ -395,16 +296,15 @@ std::vector<display::Display> BuildDisplaysFromXRandRI +@@ -398,16 +298,15 @@ std::vector<display::Display> BuildDisplaysFromXRandRI continue; } @@ -276,7 +277,7 @@ auto output_32 = static_cast<uint32_t>(output_id); int64_t display_id = output_32 > 0xff ? 0 : edid_parser.GetIndexBasedDisplayId(output_32); -@@ -459,9 +359,8 @@ std::vector<display::Display> BuildDisplaysFromXRandRI +@@ -462,9 +361,8 @@ std::vector<display::Display> BuildDisplaysFromXRandRI } if (!display::HasForceDisplayColorProfile()) { @@ -288,7 +289,7 @@ gfx::ColorSpace color_space = icc_profile.GetPrimariesOnlyColorSpace(); // Most folks do not have an ICC profile set up, but we still want to -@@ -506,24 +405,63 @@ std::vector<display::Display> BuildDisplaysFromXRandRI +@@ -509,24 +407,63 @@ std::vector<display::Display> BuildDisplaysFromXRandRI ConvertDisplayBoundsToDips(&displays, *primary_display_index_out); } diff --git a/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc b/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc index c3ead00abff6..8dd3ee6e1bd4 100644 --- a/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc +++ b/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc @@ -1,4 +1,4 @@ ---- ui/base/x/x11_shm_image_pool.cc.orig 2023-03-09 06:31:50 UTC +--- ui/base/x/x11_shm_image_pool.cc.orig 2024-04-19 13:02:56 UTC +++ ui/base/x/x11_shm_image_pool.cc @@ -16,6 +16,7 @@ #include "base/functional/callback.h" @@ -23,17 +23,35 @@ } std::size_t MaxShmSegmentSize() { -@@ -65,6 +70,9 @@ bool IsRemoteHost(const std::string& name) { +@@ -57,14 +62,19 @@ std::size_t MaxShmSegmentSize() { } + #if !BUILDFLAG(IS_CHROMEOS_ASH) ++#if !BUILDFLAG(IS_BSD) + bool IsRemoteHost(const std::string& name) { + if (name.empty()) + return false; + + return !net::HostStringIsLocalhost(name); + } ++#endif + bool ShouldUseMitShm(x11::Connection* connection) { +#if BUILDFLAG(IS_BSD) + return false; -+#endif ++#else // MIT-SHM may be available on remote connetions, but it will be unusable. Do // a best-effort check to see if the host is remote to disable the SHM // codepath. It may be possible in contrived cases for there to be a -@@ -183,7 +191,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size +@@ -93,6 +103,7 @@ bool ShouldUseMitShm(x11::Connection* connection) { + return false; + + return true; ++#endif + } + #endif + +@@ -183,7 +194,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size shmctl(state.shmid, IPC_RMID, nullptr); return false; } @@ -42,7 +60,7 @@ // On Linux, a shmid can still be attached after IPC_RMID if otherwise // kept alive. Detach before XShmAttach to prevent a memory leak in case // the process dies. -@@ -202,7 +210,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size +@@ -202,7 +213,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size return false; state.shmseg = shmseg; state.shmem_attached_to_server = true; diff --git a/www/chromium/files/patch-ui_color_color__provider__utils.cc b/www/chromium/files/patch-ui_color_color__provider__utils.cc index beb8448eaa6d..fb6d892016ed 100644 --- a/www/chromium/files/patch-ui_color_color__provider__utils.cc +++ b/www/chromium/files/patch-ui_color_color__provider__utils.cc @@ -1,6 +1,6 @@ ---- ui/color/color_provider_utils.cc.orig 2024-03-22 08:19:40 UTC +--- ui/color/color_provider_utils.cc.orig 2024-04-19 13:02:56 UTC +++ ui/color/color_provider_utils.cc -@@ -189,7 +189,7 @@ base::StringPiece SystemThemeName(ui::SystemTheme syst +@@ -200,7 +200,7 @@ base::StringPiece SystemThemeName(ui::SystemTheme syst switch (system_theme) { case ui::SystemTheme::kDefault: return "kDefault"; diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc index cc80e46e7e56..fbd6a8157e5f 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.cc +++ b/www/chromium/files/patch-ui_compositor_compositor.cc @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.cc.orig 2024-02-23 21:04:38 UTC +--- ui/compositor/compositor.cc.orig 2024-04-19 13:02:56 UTC +++ ui/compositor/compositor.cc -@@ -894,7 +894,7 @@ void Compositor::OnResume() { +@@ -910,7 +910,7 @@ void Compositor::OnResume() { obs.ResetIfActive(); } diff --git a/www/chromium/files/patch-ui_compositor_compositor.h b/www/chromium/files/patch-ui_compositor_compositor.h index 01ba8d3ef3fb..4ca7bf54f599 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.h +++ b/www/chromium/files/patch-ui_compositor_compositor.h @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.h.orig 2024-02-23 21:04:38 UTC +--- ui/compositor/compositor.h.orig 2024-04-19 13:02:56 UTC +++ ui/compositor/compositor.h -@@ -461,7 +461,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe +@@ -455,7 +455,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe // base::PowerSuspendObserver: void OnResume() override; diff --git a/www/chromium/files/patch-ui_gfx_font__render__params.h b/www/chromium/files/patch-ui_gfx_font__render__params.h index a59fd487a45b..b61b423ea238 100644 --- a/www/chromium/files/patch-ui_gfx_font__render__params.h +++ b/www/chromium/files/patch-ui_gfx_font__render__params.h @@ -1,6 +1,6 @@ ---- ui/gfx/font_render_params.h.orig 2024-01-30 07:53:34 UTC +--- ui/gfx/font_render_params.h.orig 2024-04-19 13:02:56 UTC +++ ui/gfx/font_render_params.h -@@ -118,7 +118,7 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( +@@ -115,7 +115,7 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( const FontRenderParamsQuery& query, std::string* family_out); @@ -9,7 +9,7 @@ // Clears GetFontRenderParams()'s cache. Intended to be called by tests that are // changing Fontconfig's configuration. GFX_EXPORT void ClearFontRenderParamsCacheForTest(); -@@ -128,7 +128,7 @@ GFX_EXPORT void ClearFontRenderParamsCacheForTest(); +@@ -125,7 +125,7 @@ GFX_EXPORT void ClearFontRenderParamsCacheForTest(); GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-ui_gfx_linux_gbm__wrapper.cc b/www/chromium/files/patch-ui_gfx_linux_gbm__wrapper.cc index ff9675fe9aee..d3aeaf960fc3 100644 --- a/www/chromium/files/patch-ui_gfx_linux_gbm__wrapper.cc +++ b/www/chromium/files/patch-ui_gfx_linux_gbm__wrapper.cc @@ -1,9 +1,9 @@ ---- ui/gfx/linux/gbm_wrapper.cc.orig 2024-03-22 08:19:40 UTC +--- ui/gfx/linux/gbm_wrapper.cc.orig 2024-04-19 13:02:56 UTC +++ ui/gfx/linux/gbm_wrapper.cc @@ -313,7 +313,7 @@ class Device final : public ui::GbmDevice { // of 1x1 BOs which are destroyed before creating the final BO creation used // to instantiate the returned GbmBuffer. - gfx::Size size = + gfx::Size size_for_verification = -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) gfx::Size(1, 1); diff --git a/www/chromium/files/patch-ui_gfx_switches.cc b/www/chromium/files/patch-ui_gfx_switches.cc index 4ea96b097698..dbbc0a733f73 100644 --- a/www/chromium/files/patch-ui_gfx_switches.cc +++ b/www/chromium/files/patch-ui_gfx_switches.cc @@ -1,6 +1,6 @@ ---- ui/gfx/switches.cc.orig 2023-07-16 15:47:57 UTC +--- ui/gfx/switches.cc.orig 2024-04-19 13:02:56 UTC +++ ui/gfx/switches.cc -@@ -28,7 +28,7 @@ const char kForcePrefersReducedMotion[] = "force-prefe +@@ -32,7 +32,7 @@ const char kForcePrefersNoReducedMotion[] = "force-pre // Run in headless mode, i.e., without a UI or display server dependencies. const char kHeadless[] = "headless"; diff --git a/www/chromium/files/patch-ui_gfx_switches.h b/www/chromium/files/patch-ui_gfx_switches.h index 0bb851bf3e95..0022a2a90a1f 100644 --- a/www/chromium/files/patch-ui_gfx_switches.h +++ b/www/chromium/files/patch-ui_gfx_switches.h @@ -1,7 +1,7 @@ ---- ui/gfx/switches.h.orig 2023-07-16 15:47:57 UTC +--- ui/gfx/switches.h.orig 2024-04-19 13:02:56 UTC +++ ui/gfx/switches.h -@@ -18,7 +18,7 @@ GFX_SWITCHES_EXPORT extern const char kEnableNativeGpu - GFX_SWITCHES_EXPORT extern const char kForcePrefersReducedMotion[]; +@@ -19,7 +19,7 @@ GFX_SWITCHES_EXPORT extern const char kForcePrefersRed + GFX_SWITCHES_EXPORT extern const char kForcePrefersNoReducedMotion[]; GFX_SWITCHES_EXPORT extern const char kHeadless[]; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn index 8a116956beeb..4628783b179c 100644 --- a/www/chromium/files/patch-ui_gl_BUILD.gn +++ b/www/chromium/files/patch-ui_gl_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gl/BUILD.gn.orig 2024-03-22 08:19:40 UTC +--- ui/gl/BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ ui/gl/BUILD.gn -@@ -154,8 +154,6 @@ component("gl") { +@@ -153,8 +153,6 @@ component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] } @@ -9,7 +9,7 @@ all_dependent_configs = [ ":gl_config" ] public_configs = [ "//third_party/khronos:khronos_headers" ] -@@ -173,7 +171,6 @@ component("gl") { +@@ -172,7 +170,6 @@ component("gl") { ] public_deps = [ "//base", diff --git a/www/chromium/files/patch-ui_gl_gl__switches.cc b/www/chromium/files/patch-ui_gl_gl__switches.cc index d6afd6e52c29..4f330b022936 100644 --- a/www/chromium/files/patch-ui_gl_gl__switches.cc +++ b/www/chromium/files/patch-ui_gl_gl__switches.cc @@ -1,4 +1,4 @@ ---- ui/gl/gl_switches.cc.orig 2024-03-22 08:19:40 UTC +--- ui/gl/gl_switches.cc.orig 2024-04-19 13:02:56 UTC +++ ui/gl/gl_switches.cc @@ -11,7 +11,7 @@ #include "base/android/build_info.h" @@ -9,7 +9,7 @@ #include <vulkan/vulkan_core.h> #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck #endif -@@ -290,7 +290,7 @@ bool IsDefaultANGLEVulkan() { +@@ -298,7 +298,7 @@ bool IsDefaultANGLEVulkan() { base::android::SDK_VERSION_Q) return false; #endif // BUILDFLAG(IS_ANDROID) @@ -18,7 +18,7 @@ angle::SystemInfo system_info; if (!angle::GetSystemInfoVulkan(&system_info)) return false; -@@ -302,7 +302,7 @@ bool IsDefaultANGLEVulkan() { +@@ -310,7 +310,7 @@ bool IsDefaultANGLEVulkan() { const auto& active_gpu = system_info.gpus[system_info.activeGPUIndex]; diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc index 3ed2873dac3b..e6d500e4b971 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/common/wayland_util.cc.orig 2024-01-30 07:53:34 UTC +--- ui/ozone/platform/wayland/common/wayland_util.cc.orig 2024-04-19 13:02:56 UTC +++ ui/ozone/platform/wayland/common/wayland_util.cc -@@ -335,7 +335,7 @@ void TransformToWlArray( +@@ -337,7 +337,7 @@ void TransformToWlArray( } base::TimeTicks EventMillisecondsToTimeTicks(uint32_t milliseconds) { diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__connection.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__connection.cc new file mode 100644 index 000000000000..e275c510acba --- /dev/null +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__connection.cc @@ -0,0 +1,11 @@ +--- ui/ozone/platform/wayland/host/wayland_connection.cc.orig 2024-04-19 13:02:56 UTC ++++ ui/ozone/platform/wayland/host/wayland_connection.cc +@@ -539,7 +539,7 @@ bool WaylandConnection::ShouldUseOverlayDelegation() c + // isn't present on any non-exo Wayland compositors. + bool should_use_overlay_delegation = + IsWaylandOverlayDelegationEnabled() && !fractional_scale_manager_v1(); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Overlay delegation also requires a single-pixel-buffer protocol, which + // allows creation of non-backed solid color buffers. Even though only video + // overlays can be supported on Linux, these color buffers are still needed diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc index 0c950d874818..7da4f5d6aa20 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2024-03-22 08:19:40 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2024-04-19 13:02:56 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.cc -@@ -598,7 +598,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur +@@ -606,7 +606,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur const bool did_active_change = is_active_ != window_states.is_activated; is_active_ = window_states.is_activated; diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h index f8dfeb0c2367..91708306c24d 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2024-03-22 08:19:40 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2024-04-19 13:02:56 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.h -@@ -259,7 +259,7 @@ class WaylandToplevelWindow : public WaylandWindow, +@@ -265,7 +265,7 @@ class WaylandToplevelWindow : public WaylandWindow, // The display ID to switch to in case the state is `kFullscreen`. int64_t fullscreen_display_id_ = display::kInvalidDisplayId; diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h index 213fa6bb777a..c93a9a642594 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h @@ -1,4 +1,4 @@ ---- ui/ozone/platform/wayland/host/wayland_window.h.orig 2024-03-22 08:19:40 UTC +--- ui/ozone/platform/wayland/host/wayland_window.h.orig 2024-04-19 13:02:56 UTC +++ ui/ozone/platform/wayland/host/wayland_window.h @@ -40,7 +40,7 @@ #include "ui/platform_window/platform_window_init_properties.h" @@ -27,7 +27,7 @@ void OnCursorLoaded(scoped_refptr<WaylandAsyncCursor> cursor, scoped_refptr<BitmapCursor> bitmap_cursor); #endif -@@ -569,7 +569,7 @@ class WaylandWindow : public PlatformWindow, +@@ -571,7 +571,7 @@ class WaylandWindow : public PlatformWindow, wl::Object<zaura_surface> aura_surface_; diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc index 8f8f7f0d93b0..8521b49f315e 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2024-03-22 08:19:40 UTC +--- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2024-04-19 13:02:56 UTC +++ ui/ozone/platform/wayland/ozone_platform_wayland.cc -@@ -66,13 +66,13 @@ +@@ -67,13 +67,13 @@ #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h" #endif @@ -16,7 +16,7 @@ #include "ui/ozone/platform/wayland/host/linux_ui_delegate_wayland.h" #endif -@@ -267,7 +267,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -268,7 +268,7 @@ class OzonePlatformWayland : public OzonePlatform, buffer_manager_connector_ = std::make_unique<WaylandBufferManagerConnector>( connection_->buffer_manager_host()); @@ -25,7 +25,7 @@ cursor_factory_ = std::make_unique<WaylandCursorFactory>(connection_.get()); #else cursor_factory_ = std::make_unique<BitmapCursorFactory>(); -@@ -277,7 +277,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -278,7 +278,7 @@ class OzonePlatformWayland : public OzonePlatform, supported_buffer_formats_ = connection_->buffer_manager_host()->GetSupportedBufferFormats(); @@ -34,7 +34,16 @@ linux_ui_delegate_ = std::make_unique<LinuxUiDelegateWayland>(connection_.get()); #endif -@@ -522,7 +522,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -344,7 +344,7 @@ class OzonePlatformWayland : public OzonePlatform, + properties->supports_global_screen_coordinates = + kDefaultScreenCoordinateEnabled; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/40800718): Revisit (and maybe remove) once proper + // support, probably backed by org.freedesktop.portal.Screenshot.PickColor + // API is implemented. Note: this is restricted to Linux Desktop as Lacros +@@ -532,7 +532,7 @@ class OzonePlatformWayland : public OzonePlatform, DrmRenderNodePathFinder path_finder_; #endif diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc index ea19c4b45c94..8dd995607854 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2024-03-22 08:19:40 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2024-04-19 13:02:56 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -84,7 +84,7 @@ +@@ -85,7 +85,7 @@ #include "base/win/win_util.h" #endif @@ -18,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -748,7 +748,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -742,7 +742,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -27,7 +27,7 @@ auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; if (!handled && linux_ui && -@@ -931,7 +931,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -925,7 +925,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -36,7 +36,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -1984,7 +1984,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1978,7 +1978,7 @@ bool Textfield::ShouldDoLearning() { return false; } @@ -45,7 +45,7 @@ // TODO(https://crbug.com/952355): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2488,14 +2488,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2482,14 +2482,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.h b/www/chromium/files/patch-ui_views_controls_textfield_textfield.h index 23262729f076..defb178d2594 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.h +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.h @@ -1,4 +1,4 @@ ---- ui/views/controls/textfield/textfield.h.orig 2024-03-22 08:19:40 UTC +--- ui/views/controls/textfield/textfield.h.orig 2024-04-19 13:02:56 UTC +++ ui/views/controls/textfield/textfield.h @@ -47,7 +47,7 @@ #include "ui/views/view_observer.h" @@ -9,7 +9,7 @@ #include <vector> #endif -@@ -456,7 +456,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -461,7 +461,7 @@ class VIEWS_EXPORT Textfield : public View, // Set whether the text should be used to improve typing suggestions. void SetShouldDoLearning(bool value) { should_do_learning_ = value; } diff --git a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc index b7d7a0a005ab..5514fd7acff4 100644 --- a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc +++ b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc @@ -1,6 +1,6 @@ ---- ui/views/corewm/tooltip_aura.cc.orig 2023-04-28 17:01:32 UTC +--- ui/views/corewm/tooltip_aura.cc.orig 2024-04-19 13:02:56 UTC +++ ui/views/corewm/tooltip_aura.cc -@@ -38,7 +38,7 @@ namespace { +@@ -36,7 +36,7 @@ namespace { bool CanUseTranslucentTooltipWidget() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_views_focus_focus__manager.cc b/www/chromium/files/patch-ui_views_focus_focus__manager.cc index 0356a4590d74..080c684d70fc 100644 --- a/www/chromium/files/patch-ui_views_focus_focus__manager.cc +++ b/www/chromium/files/patch-ui_views_focus_focus__manager.cc @@ -1,6 +1,6 @@ ---- ui/views/focus/focus_manager.cc.orig 2023-08-17 07:33:31 UTC +--- ui/views/focus/focus_manager.cc.orig 2024-04-19 13:02:56 UTC +++ ui/views/focus/focus_manager.cc -@@ -577,7 +577,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -579,7 +579,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Processing an accelerator can delete things. Because we // need these objects afterwards on Linux, save widget_ as weak pointer and // save the close_on_deactivate property value of widget_delegate in a -@@ -594,7 +594,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -596,7 +596,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index b80749e55431..1cfef206e7d8 100644 --- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,4 +1,4 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2024-03-22 08:19:40 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2024-04-19 13:02:56 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc @@ -47,7 +47,7 @@ #include "ui/wm/core/window_util.h" @@ -27,7 +27,7 @@ std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler); #else std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler); -@@ -1097,7 +1097,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg +@@ -1117,7 +1117,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc index 505944bb1220..cf90e710f117 100644 --- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc.orig 2024-02-23 21:04:38 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc.orig 2024-04-19 13:02:56 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc -@@ -22,7 +22,7 @@ +@@ -23,7 +23,7 @@ #include "ui/views/widget/widget_delegate.h" #include "ui/views/window/native_frame_view.h" diff --git a/www/chromium/files/patch-ui_views_widget_widget.cc b/www/chromium/files/patch-ui_views_widget_widget.cc index a55b420ccb25..b7fb4023c802 100644 --- a/www/chromium/files/patch-ui_views_widget_widget.cc +++ b/www/chromium/files/patch-ui_views_widget_widget.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/widget.cc.orig 2024-03-22 08:19:40 UTC +--- ui/views/widget/widget.cc.orig 2024-04-19 13:02:56 UTC +++ ui/views/widget/widget.cc -@@ -55,7 +55,7 @@ +@@ -54,7 +54,7 @@ #include "ui/views/window/custom_frame_view.h" #include "ui/views/window/dialog_delegate.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -2111,7 +2111,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2106,7 +2106,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const if (parent_) return parent_->GetNativeTheme(); diff --git a/www/chromium/files/patch-ui_views_widget_widget.h b/www/chromium/files/patch-ui_views_widget_widget.h index d0e013200a0b..194c34c4af5d 100644 --- a/www/chromium/files/patch-ui_views_widget_widget.h +++ b/www/chromium/files/patch-ui_views_widget_widget.h @@ -1,6 +1,6 @@ ---- ui/views/widget/widget.h.orig 2024-03-22 08:19:40 UTC +--- ui/views/widget/widget.h.orig 2024-04-19 13:02:56 UTC +++ ui/views/widget/widget.h -@@ -420,7 +420,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid +@@ -427,7 +427,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid // If set, the widget was created in headless mode. bool headless_mode = false; diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index 28fdb4ba9d47..ae13e3cd9bfd 100644 --- a/www/chromium/files/patch-v8_BUILD.gn +++ b/www/chromium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2024-03-22 08:19:40 UTC +--- v8/BUILD.gn.orig 2024-04-19 13:02:56 UTC +++ v8/BUILD.gn -@@ -1450,6 +1450,14 @@ config("toolchain") { +@@ -1455,6 +1455,14 @@ config("toolchain") { } else if (target_os == "chromeos") { defines += [ "V8_HAVE_TARGET_OS" ] defines += [ "V8_TARGET_OS_CHROMEOS" ] @@ -15,7 +15,7 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -2423,6 +2431,12 @@ template("run_mksnapshot") { +@@ -2442,6 +2450,12 @@ template("run_mksnapshot") { if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) { args += [ "--reorder-builtins" ] } @@ -28,7 +28,7 @@ } # This is needed to distinguish between generating code for the simulator -@@ -6392,7 +6406,7 @@ v8_component("v8_libbase") { +@@ -6448,7 +6462,7 @@ v8_component("v8_libbase") { } } @@ -37,7 +37,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -6403,6 +6417,18 @@ v8_component("v8_libbase") { +@@ -6459,6 +6473,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc index 252ca554256a..6b75eb042528 100644 --- a/www/chromium/files/patch-v8_src_api_api.cc +++ b/www/chromium/files/patch-v8_src_api_api.cc @@ -1,4 +1,4 @@ ---- v8/src/api/api.cc.orig 2024-03-22 08:19:40 UTC +--- v8/src/api/api.cc.orig 2024-04-19 13:02:56 UTC +++ v8/src/api/api.cc @@ -144,7 +144,7 @@ #include "src/wasm/wasm-serialization.h" @@ -9,7 +9,7 @@ #include <signal.h> #include <unistd.h> -@@ -6428,7 +6428,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6396,7 +6396,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/chromium/files/patch-v8_src_execution_isolate.cc b/www/chromium/files/patch-v8_src_execution_isolate.cc index d2e9175fcf12..281fb94c55ea 100644 --- a/www/chromium/files/patch-v8_src_execution_isolate.cc +++ b/www/chromium/files/patch-v8_src_execution_isolate.cc @@ -1,4 +1,4 @@ ---- v8/src/execution/isolate.cc.orig 2024-03-22 08:19:40 UTC +--- v8/src/execution/isolate.cc.orig 2024-04-19 13:02:56 UTC +++ v8/src/execution/isolate.cc @@ -153,6 +153,10 @@ #include "src/execution/simulator-base.h" @@ -11,14 +11,16 @@ extern "C" const uint8_t v8_Default_embedded_blob_code_[]; extern "C" uint32_t v8_Default_embedded_blob_code_size_; extern "C" const uint8_t v8_Default_embedded_blob_data_[]; -@@ -4231,6 +4235,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -4232,6 +4236,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() { uint32_t code_size = DefaultEmbeddedBlobCodeSize(); const uint8_t* data = DefaultEmbeddedBlobData(); uint32_t data_size = DefaultEmbeddedBlobDataSize(); + +#if defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32) -+ mprotect(reinterpret_cast<void *>(const_cast<uint8_t *>(code)), -+ code_size, PROT_READ | PROT_EXEC); ++ if (code_size > 0) { ++ mprotect(reinterpret_cast<void *>(const_cast<uint8_t *>(code)), ++ code_size, PROT_READ | PROT_EXEC); ++ } +#endif if (StickyEmbeddedBlobCode() != nullptr) { diff --git a/www/chromium/files/patch-v8_src_flags_flags.cc b/www/chromium/files/patch-v8_src_flags_flags.cc index 4f1f5c8c7678..9dbc8dda71fd 100644 --- a/www/chromium/files/patch-v8_src_flags_flags.cc +++ b/www/chromium/files/patch-v8_src_flags_flags.cc @@ -1,4 +1,4 @@ ---- v8/src/flags/flags.cc.orig 2024-03-22 08:19:40 UTC +--- v8/src/flags/flags.cc.orig 2024-04-19 13:02:56 UTC +++ v8/src/flags/flags.cc @@ -15,6 +15,10 @@ #include <set> @@ -10,8 +10,8 @@ + #include "src/base/functional.h" #include "src/base/lazy-instance.h" - #include "src/base/logging.h" -@@ -35,7 +39,11 @@ + #include "src/base/platform/platform.h" +@@ -34,7 +38,11 @@ namespace v8::internal { // Define {v8_flags}, declared in flags.h. @@ -23,7 +23,7 @@ // {v8_flags} needs to be aligned to a memory page, and the size needs to be a // multiple of a page size. This is required for memory-protection of the memory -@@ -985,6 +993,10 @@ void FlagList::FreezeFlags() { +@@ -789,6 +797,10 @@ void FlagList::FreezeFlags() { // Note that for string flags we only protect the pointer itself, but not the // string storage. TODO(12887): Fix this. base::OS::SetDataReadOnly(&v8_flags, sizeof(v8_flags)); diff --git a/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.cc b/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.cc index 2ebfa9106bec..1356ada33686 100644 --- a/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.cc +++ b/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.cc @@ -1,4 +1,4 @@ ---- v8/src/trap-handler/handler-inside-posix.cc.orig 2023-12-10 06:10:27 UTC +--- v8/src/trap-handler/handler-inside-posix.cc.orig 2024-04-19 13:02:56 UTC +++ v8/src/trap-handler/handler-inside-posix.cc @@ -61,6 +61,8 @@ namespace trap_handler { #define CONTEXT_REG(reg, REG) &uc->uc_mcontext->__ss.__##reg @@ -9,7 +9,7 @@ #else #error "Unsupported platform." #endif -@@ -78,8 +80,12 @@ bool IsKernelGeneratedSignal(siginfo_t* info) { +@@ -80,8 +82,12 @@ bool IsKernelGeneratedSignal(siginfo_t* info) { // si_code at its default of 0 for signals that don’t originate in hardware. // The other conditions are only relevant for Linux. return info->si_code > 0 && info->si_code != SI_USER && diff --git a/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h b/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h index bbead2cbd962..19a96c42378d 100644 --- a/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h +++ b/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h @@ -1,6 +1,6 @@ ---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig 2024-03-22 08:19:40 UTC +--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig 2024-04-19 13:02:56 UTC +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h -@@ -511,7 +511,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst +@@ -510,7 +510,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst } void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr, @@ -9,7 +9,7 @@ LoadType type, uint32_t* protected_load_pc, bool /* is_load_mem */, bool /* i64_offset */, bool needs_shift) { -@@ -588,7 +588,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis +@@ -587,7 +587,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis } void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, @@ -18,7 +18,7 @@ StoreType type, LiftoffRegList pinned, uint32_t* protected_store_pc, bool /* is_store_mem */, bool /* i64_offset */) { -@@ -664,7 +664,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist +@@ -663,7 +663,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist } void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr, @@ -27,7 +27,7 @@ LoadType type, LiftoffRegList /* pinned */, bool /* i64_offset */) { if (type.value() != LoadType::kI64Load) { -@@ -682,7 +682,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, +@@ -681,7 +681,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, } void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg, @@ -36,7 +36,7 @@ StoreType type, LiftoffRegList pinned, bool /* i64_offset */) { DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max()); -@@ -752,7 +752,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; +@@ -751,7 +751,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; inline void AtomicAddOrSubOrExchange32(LiftoffAssembler* lasm, Binop binop, Register dst_addr, Register offset_reg, @@ -45,7 +45,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type) { DCHECK_EQ(value, result); -@@ -820,7 +820,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble +@@ -819,7 +819,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble } inline void AtomicBinop32(LiftoffAssembler* lasm, Binop op, Register dst_addr, @@ -54,7 +54,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type) { DCHECK_EQ(value, result); -@@ -935,7 +935,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino +@@ -934,7 +934,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino } inline void AtomicBinop64(LiftoffAssembler* lasm, Binop op, Register dst_addr, @@ -63,7 +63,7 @@ LiftoffRegister value, LiftoffRegister result) { // We need {ebx} here, which is the root register. As the root register it // needs special treatment. As we use {ebx} directly in the code below, we -@@ -1031,7 +1031,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino +@@ -1030,7 +1030,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino } // namespace liftoff void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg, @@ -72,7 +72,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1045,7 +1045,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re +@@ -1044,7 +1044,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re } void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg, @@ -81,7 +81,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1058,7 +1058,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re +@@ -1057,7 +1057,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re } void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg, @@ -90,7 +90,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1072,7 +1072,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re +@@ -1071,7 +1071,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re } void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg, @@ -99,7 +99,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1086,7 +1086,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg +@@ -1085,7 +1085,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg } void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg, @@ -108,7 +108,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1100,7 +1100,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re +@@ -1099,7 +1099,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re } void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg, @@ -117,7 +117,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type, bool /* i64_offset */) { -@@ -1115,7 +1115,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add +@@ -1114,7 +1114,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add } void LiftoffAssembler::AtomicCompareExchange( |