diff options
339 files changed, 1894 insertions, 1475 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index fe6c792a7a1f..ba69d7b59d92 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,5 +1,5 @@ PORTNAME= chromium -PORTVERSION= 129.0.6668.100 +PORTVERSION= 130.0.6723.69 PULSEMV= 16 PULSEV= ${PULSEMV}.1 CATEGORIES= www wayland @@ -127,7 +127,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \ use_system_libffi=true \ use_system_libjpeg=true \ use_udev=false \ - extra_cxxflags="${CXXFLAGS} ${PINCLUDES}" \ + extra_cxxflags="${CXXFLAGS} -I${LOCALBASE}/include/libepoll-shim ${PINCLUDES}" \ extra_ldflags="${LDFLAGS}" \ ffmpeg_branding="${FFMPEG_BRAND}" diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 86d62b995269..539f7a99ff8f 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1728496324 -SHA256 (chromium-129.0.6668.100.tar.xz) = 281daed29a5cb546f6273130035d9980666d2232f356ad95fc06af3c90121bc2 -SIZE (chromium-129.0.6668.100.tar.xz) = 6677334468 -SHA256 (chrome-linux-129.0.6668.100-llvm17.profdata.tar.xz) = eb7417c1317b1293e1d40cb9e2f3513dc476d00a9d3c96bf06f4ad2ff9561d7e -SIZE (chrome-linux-129.0.6668.100-llvm17.profdata.tar.xz) = 30461292 +TIMESTAMP = 1729947948 +SHA256 (chromium-130.0.6723.69.tar.xz) = b7e4d6a2154c61e558659bbc5b8b05c9f6f317d1420bf8624f5ffac097df565d +SIZE (chromium-130.0.6723.69.tar.xz) = 6620926572 +SHA256 (chrome-linux-130.0.6723.69-llvm17.profdata.tar.xz) = 7a3a0cc32a28f1153e7acbf36771d095b4dfa97f85a2ed593384c31ba8271711 +SIZE (chrome-linux-130.0.6723.69-llvm17.profdata.tar.xz) = 30526644 SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (chromium-129.0.6668.100-testdata.tar.xz) = 5935eb364363dc05c90e92380d62e79c2f1e05f28c2a2961a8a78826fc889d00 -SIZE (chromium-129.0.6668.100-testdata.tar.xz) = 275931720 +SHA256 (chromium-130.0.6723.69-testdata.tar.xz) = df5093c3a832bd04c4ac477057d8d9417e995ebc4f6f97b8444dd5bdf426def7 +SIZE (chromium-130.0.6723.69-testdata.tar.xz) = 281900320 diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index a32784602420..bb9e20c58dfe 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2024-09-30 07:45:04 UTC +--- BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ BUILD.gn @@ -66,7 +66,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") { +@@ -437,7 +436,7 @@ group("gn_all") { } } @@ -26,7 +26,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -623,6 +622,15 @@ group("gn_all") { +@@ -628,6 +627,15 @@ group("gn_all") { } } @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)", -@@ -671,7 +679,7 @@ group("gn_all") { +@@ -676,7 +684,7 @@ group("gn_all") { } } @@ -51,16 +51,16 @@ # The official builders use this binary from the default toolchain's # output directory after building in order to upload the symbols of that # binary. They build the binary like `ninja symupload` which requires the -@@ -1111,7 +1119,7 @@ if (use_blink && !is_cronet_build) { +@@ -1158,7 +1166,7 @@ if (use_blink && !is_cronet_build) { ] } - if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos) { + if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) { - out_dir = get_path_info(root_build_dir, "name") script_test("chrome_wpt_tests") { script = "//third_party/blink/tools/run_wpt_tests.py" -@@ -1209,7 +1217,7 @@ if (use_blink && !is_cronet_build) { + args = _common_web_test_options + [ "--product=chrome" ] +@@ -1251,7 +1259,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -69,7 +69,7 @@ # Using the default toolchain for this tool, as it's run during tests not # during the build. This places a symlink in the root_build_dir for scrips # to use. -@@ -1223,7 +1231,7 @@ if (use_blink && !is_cronet_build) { +@@ -1265,7 +1273,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//third_party/breakpad:dump_syms" ] } @@ -78,7 +78,7 @@ # Using the default toolchain for this tool, as it's run during tests not # during the build. This places a symlink in the root_build_dir for scrips # to use. -@@ -1693,7 +1701,7 @@ group("chromium_builder_perf") { +@@ -1729,7 +1737,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 8c2b51500a94..0def502abd0d 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,15 +1,6 @@ ---- base/BUILD.gn.orig 2024-09-30 07:45:04 UTC +--- base/BUILD.gn.orig 2024-10-23 07:00:35 UTC +++ base/BUILD.gn -@@ -176,7 +176,7 @@ buildflag_header("ios_cronet_buildflags") { - flags = [ "CRONET_BUILD=$is_cronet_build" ] - } - --enable_message_pump_epoll = is_linux || is_chromeos || is_android -+enable_message_pump_epoll = (is_linux || is_chromeos || is_android) && !is_bsd - buildflag_header("message_pump_buildflags") { - header = "message_pump_buildflags.h" - header_dir = "base/message_loop" -@@ -1117,11 +1117,23 @@ component("base") { +@@ -1101,11 +1101,26 @@ 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. @@ -21,7 +12,10 @@ + # *BSD needs libkvm + if (is_bsd) { -+ libs += [ "kvm" ] ++ libs += [ ++ "kvm", ++ "epoll-shim", ++ ] + } + + if (is_freebsd) { @@ -34,7 +28,7 @@ if (use_allocator_shim) { if (is_apple) { sources += [ "allocator/early_zone_registration_apple.h" ] -@@ -1141,7 +1153,7 @@ component("base") { +@@ -1125,7 +1140,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -43,7 +37,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2112,6 +2124,22 @@ component("base") { +@@ -2102,6 +2117,22 @@ component("base") { ] } @@ -66,7 +60,7 @@ # iOS if (is_ios) { sources += [ -@@ -2257,6 +2285,33 @@ component("base") { +@@ -2246,6 +2277,33 @@ component("base") { } } @@ -100,16 +94,16 @@ if (use_blink) { sources += [ "files/file_path_watcher.cc", -@@ -2267,7 +2322,7 @@ component("base") { - } +@@ -2572,7 +2630,7 @@ buildflag_header("protected_memory_buildflags") { + header = "protected_memory_buildflags.h" + header_dir = "base/memory" - if (dep_libevent) { -- deps += [ "//third_party/libevent" ] -+ public_deps += [ "//third_party/libevent" ] - } +- protected_memory_enabled = !is_component_build && is_clang && ++ protected_memory_enabled = !is_openbsd && !is_component_build && is_clang && + (is_win || is_linux || is_android || is_mac) - if (use_libevent) { -@@ -3084,7 +3139,7 @@ if (is_apple) { + flags = [ "PROTECTED_MEMORY_ENABLED=$protected_memory_enabled" ] +@@ -3055,7 +3113,7 @@ if (is_apple) { } } @@ -118,7 +112,7 @@ # This test must compile with -fstack-protector-all source_set("stack_canary_linux_unittests") { testonly = true -@@ -3743,7 +3798,7 @@ test("base_unittests") { +@@ -3717,7 +3775,7 @@ test("base_unittests") { ] } @@ -127,7 +121,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3770,7 +3825,7 @@ test("base_unittests") { +@@ -3744,7 +3802,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -136,7 +130,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3781,7 +3836,7 @@ test("base_unittests") { +@@ -3755,7 +3813,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -145,7 +139,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3966,7 +4021,7 @@ test("base_unittests") { +@@ -3942,7 +4000,7 @@ test("base_unittests") { deps += [ ":base_profiler_test_support_library" ] } 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 34950a70ad0e..3619816cbd31 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,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-09-30 07:45:04 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-10-22 08:31:56 UTC +++ base/allocator/partition_allocator/partition_alloc.gni @@ -31,7 +31,7 @@ if (is_nacl) { use_large_empty_slot_span_ring = is_mac @@ -9,7 +9,7 @@ declare_args() { # Causes all the allocations to be routed via allocator_shim.cc. Usually, -@@ -389,7 +389,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl +@@ -391,7 +391,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl # dependencies that use partition_allocator are compiled in AOSP against a # version of glibc that does not include pkeys syscall numbers. is_pkeys_available = 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 0c0b479cdb34..6a1996092d0a 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-09-30 07:45:04 UTC +--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn -@@ -856,7 +856,7 @@ if (is_clang_or_gcc) { +@@ -858,7 +858,7 @@ if (is_clang_or_gcc) { configs -= [ partition_alloc_enable_arc_config ] } } diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h index bf5d79ad9e46..83d4eab7009e 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2024-07-30 11:12:21 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2024-10-22 08:31:56 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h -@@ -411,8 +411,12 @@ bool TryRecommitSystemPagesInternal( +@@ -412,8 +412,12 @@ bool TryRecommitSystemPagesInternal( void DiscardSystemPagesInternal(uintptr_t address, size_t length) { void* ptr = reinterpret_cast<void*>(address); 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 62fadd259dc6..898ecdf52440 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-08-26 12:06:38 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-10-22 08:31:56 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h @@ -168,7 +168,7 @@ constexpr bool kUseLazyCommit = false; // This may be required on more platforms in the future. @@ -7,9 +7,9 @@ - PA_BUILDFLAG(IS_CHROMEOS)) + PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD)) - // PartitionAlloc uses PartitionRootEnumerator to acquire all - // PartitionRoots at BeforeFork and to release at AfterFork. -@@ -216,7 +216,7 @@ constexpr bool kUseLazyCommit = false; + // Enable shadow metadata. + // +@@ -231,7 +231,7 @@ constexpr bool kUseLazyCommit = false; // Also enabled on ARM64 macOS and iOS, as the 16kiB pages on this platform lead // to larger slot spans. #if PA_BUILDFLAG(IS_LINUX) || \ 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 da70b4739a41..21651f45af00 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,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-09-30 07:45:04 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-10-22 08:31:56 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc -@@ -43,7 +43,7 @@ +@@ -44,7 +44,7 @@ #include "wow64apiset.h" #endif @@ -9,7 +9,7 @@ #include <pthread.h> #endif -@@ -277,7 +277,7 @@ void PartitionAllocMallocInitOnce() { +@@ -290,7 +290,7 @@ void PartitionAllocMallocInitOnce() { return; } @@ -18,7 +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. -@@ -1076,7 +1076,7 @@ void PartitionRoot::Init(PartitionOptions opts) { +@@ -1110,7 +1110,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 620bf1a97682..ad03fda0bbb6 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 2024-06-17 12:56:06 UTC +--- base/base_paths_posix.cc.orig 2024-10-22 08:31:56 UTC +++ base/base_paths_posix.cc @@ -15,6 +15,7 @@ #include <ostream> @@ -23,7 +23,7 @@ #elif BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_AIX) #include <stdlib.h> #endif -@@ -49,8 +54,7 @@ bool PathProviderPosix(int key, FilePath* result) { +@@ -47,8 +52,7 @@ bool PathProviderPosix(int key, FilePath* result) { *result = bin_dir; return true; #elif BUILDFLAG(IS_FREEBSD) @@ -31,9 +31,9 @@ - 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_IN_MIGRATION() << "Unable to resolve path."; - return false; -@@ -67,13 +71,65 @@ bool PathProviderPosix(int key, FilePath* result) { + NOTREACHED() << "Unable to resolve path."; + } +@@ -62,13 +66,65 @@ bool PathProviderPosix(int key, FilePath* result) { *result = FilePath(bin_dir); return true; #elif BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_AIX) diff --git a/www/chromium/files/patch-base_compiler__specific.h b/www/chromium/files/patch-base_compiler__specific.h index 5a8613c6b47a..e0364a93cf53 100644 --- a/www/chromium/files/patch-base_compiler__specific.h +++ b/www/chromium/files/patch-base_compiler__specific.h @@ -1,6 +1,6 @@ ---- base/compiler_specific.h.orig 2024-09-30 07:45:04 UTC +--- base/compiler_specific.h.orig 2024-10-22 08:31:56 UTC +++ base/compiler_specific.h -@@ -326,7 +326,7 @@ +@@ -257,7 +257,7 @@ // // In some cases it's desirable to remove this, e.g. on hot functions, or if // we have purposely changed the reference canary. @@ -9,7 +9,7 @@ #if HAS_ATTRIBUTE(__no_stack_protector__) #define NO_STACK_PROTECTOR __attribute__((__no_stack_protector__)) #else -@@ -457,7 +457,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) { +@@ -388,7 +388,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) { // See https://clang.llvm.org/docs/AttributeReference.html#preserve-most for // more details. #if (defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_X86_64)) && \ diff --git a/www/chromium/files/patch-base_features.cc b/www/chromium/files/patch-base_features.cc deleted file mode 100644 index 17b14f2d6c43..000000000000 --- a/www/chromium/files/patch-base_features.cc +++ /dev/null @@ -1,27 +0,0 @@ ---- base/features.cc.orig 2024-08-26 12:06:38 UTC -+++ base/features.cc -@@ -9,8 +9,10 @@ - #include "base/threading/platform_thread.h" - #include "build/buildflag.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) -+#if !BUILDFLAG(IS_BSD) - #include "base/message_loop/message_pump_epoll.h" -+#endif - #include "base/message_loop/message_pump_libevent.h" - #endif - -@@ -116,9 +118,11 @@ void Init(EmitThreadControllerProfilerMetadata - sequence_manager::internal::ThreadController::InitializeFeatures( - emit_thread_controller_profiler_metadata); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - MessagePumpLibevent::InitializeFeatures(); -+#if !BUILDFLAG(IS_BSD) - MessagePumpEpoll::InitializeFeatures(); -+#endif - #endif - - #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_CHROMEOS) 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 0dc65817b360..807b54966832 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-09-30 07:45:04 UTC +--- base/files/file_util_unittest.cc.orig 2024-10-22 08:31:56 UTC +++ base/files/file_util_unittest.cc -@@ -3903,7 +3903,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3886,7 +3886,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"; -@@ -4625,7 +4625,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles +@@ -4608,7 +4608,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles NULL); #else size_t bytes_written = diff --git a/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc b/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc index 68e87b1fc924..11db4b58bb3e 100644 --- a/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc +++ b/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc @@ -1,6 +1,6 @@ ---- base/memory/madv_free_discardable_memory_posix.cc.orig 2024-06-17 12:56:06 UTC +--- base/memory/madv_free_discardable_memory_posix.cc.orig 2024-10-22 08:31:56 UTC +++ base/memory/madv_free_discardable_memory_posix.cc -@@ -311,6 +311,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT +@@ -310,6 +310,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT bool MadvFreeDiscardableMemoryPosix::IsResident() const { DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_); @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_APPLE) std::vector<char> vec(allocated_pages_); #else -@@ -326,6 +330,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons +@@ -325,6 +329,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons return false; } return true; diff --git a/www/chromium/files/patch-base_memory_protected__memory.h b/www/chromium/files/patch-base_memory_protected__memory.h new file mode 100644 index 000000000000..6d6d4d5693c1 --- /dev/null +++ b/www/chromium/files/patch-base_memory_protected__memory.h @@ -0,0 +1,44 @@ +--- base/memory/protected_memory.h.orig 2024-10-22 08:31:56 UTC ++++ base/memory/protected_memory.h +@@ -119,12 +119,12 @@ __declspec(selectany) char __stop_protected_memory; + + #define DECLARE_PROTECTED_DATA constinit + #define DEFINE_PROTECTED_DATA constinit __declspec(allocate("prot$mem")) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + // This value is used to align the writers variable. That variable needs to be + // aligned to ensure that the protected memory section starts on a page + // boundary. + #if (PA_BUILDFLAG(IS_ANDROID) && PA_BUILDFLAG(PA_ARCH_CPU_64_BITS)) || \ +- (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) ++ ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) + // arm64 supports 4kb, 16kb, and 64kb pages. Set to the largest of 64kb as that + // will guarantee the section is page aligned regardless of the choice. + inline constexpr int kProtectedMemoryAlignment = 65536; +@@ -339,7 +339,7 @@ class BASE_EXPORT AutoWritableMemoryBase { + // where an attacker could overwrite it with a large value and invoke code + // that constructs and destructs an AutoWritableMemory. After such a call + // protected memory would still be set writable because writers > 0. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + // On Linux, the protected memory section is not automatically page aligned. + // This means that attempts to reset the protected memory region to readonly + // will set some of the preceding section that is on the same page readonly +@@ -353,7 +353,7 @@ class BASE_EXPORT AutoWritableMemoryBase { + #endif + static inline size_t writers GUARDED_BY(writers_lock()) = 0; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + // On Linux, there is no guarantee the section following the protected + // memory section is page aligned. This can result in attempts to change + // the access permissions of the end of the protected memory section +@@ -411,7 +411,7 @@ class BASE_EXPORT AutoWritableMemoryInitializer + // the variable to something large before the section was read-only. + WriterData::writers = 0; + CHECK(SetProtectedSectionReadOnly()); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + // Set the protected_memory_section_buffer to true to ensure the buffer + // section is created. If a variable is declared but not used the memory + // section won't be created. diff --git a/www/chromium/files/patch-base_memory_protected__memory__posix.cc b/www/chromium/files/patch-base_memory_protected__memory__posix.cc new file mode 100644 index 000000000000..fb7b02a3db9f --- /dev/null +++ b/www/chromium/files/patch-base_memory_protected__memory__posix.cc @@ -0,0 +1,20 @@ +--- base/memory/protected_memory_posix.cc.orig 2024-10-22 08:31:56 UTC ++++ base/memory/protected_memory_posix.cc +@@ -6,7 +6,7 @@ + + #include <sys/mman.h> + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + #include <sys/resource.h> + #endif // BUILDFLAG(IS_LINUX) + +@@ -34,7 +34,7 @@ bool SetMemory(void* start, void* end, int prot) { + } // namespace + + namespace internal { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + void CheckMemoryReadOnly(const void* ptr) { + const uintptr_t page_start = + bits::AlignDown(reinterpret_cast<uintptr_t>(ptr), GetPageSize()); diff --git a/www/chromium/files/patch-base_message__loop_message__pump__epoll.cc b/www/chromium/files/patch-base_message__loop_message__pump__epoll.cc new file mode 100644 index 000000000000..ebfa09fd121c --- /dev/null +++ b/www/chromium/files/patch-base_message__loop_message__pump__epoll.cc @@ -0,0 +1,11 @@ +--- base/message_loop/message_pump_epoll.cc.orig 2024-10-22 08:31:56 UTC ++++ base/message_loop/message_pump_epoll.cc +@@ -42,7 +42,7 @@ std::atomic_bool g_use_batched_version = false; + std::atomic_bool g_use_poll = false; + + constexpr std::pair<uint32_t, short int> kEpollToPollEvents[] = { +- {EPOLLIN, POLLIN}, {EPOLLOUT, POLLOUT}, {EPOLLRDHUP, POLLRDHUP}, ++ {EPOLLIN, POLLIN}, {EPOLLOUT, POLLOUT}, + {EPOLLPRI, POLLPRI}, {EPOLLERR, POLLERR}, {EPOLLHUP, POLLHUP}}; + + void SetEventsForPoll(const uint32_t epoll_events, struct pollfd* poll_entry) { diff --git a/www/chromium/files/patch-base_message__loop_message__pump__epoll.h b/www/chromium/files/patch-base_message__loop_message__pump__epoll.h new file mode 100644 index 000000000000..c6398cdd54e8 --- /dev/null +++ b/www/chromium/files/patch-base_message__loop_message__pump__epoll.h @@ -0,0 +1,14 @@ +--- base/message_loop/message_pump_epoll.h.orig 2024-10-22 08:31:56 UTC ++++ base/message_loop/message_pump_epoll.h +@@ -51,7 +51,11 @@ namespace base { + // every call, don't do it when we have too many FDs. + BASE_FEATURE(kUsePollForMessagePumpEpoll, + "UsePollForMessagePumpEpoll", ++#if BUILDFLAG(IS_BSD) ++ base::FEATURE_ENABLED_BY_DEFAULT); ++#else + base::FEATURE_DISABLED_BY_DEFAULT); ++#endif + + // A MessagePump implementation suitable for I/O message loops on Linux-based + // systems with epoll API support. diff --git a/www/chromium/files/patch-base_native__library__unittest.cc b/www/chromium/files/patch-base_native__library__unittest.cc index 6e6c27253205..ff83c343cf95 100644 --- a/www/chromium/files/patch-base_native__library__unittest.cc +++ b/www/chromium/files/patch-base_native__library__unittest.cc @@ -1,6 +1,6 @@ ---- base/native_library_unittest.cc.orig 2024-03-22 08:19:40 UTC +--- base/native_library_unittest.cc.orig 2024-10-22 08:31:56 UTC +++ base/native_library_unittest.cc -@@ -133,7 +133,7 @@ TEST(NativeLibraryTest, LoadLibrary) { +@@ -135,7 +135,7 @@ TEST(NativeLibraryTest, LoadLibrary) { // versions with respect to symbol resolution scope. // TSan and MSan error out on RTLD_DEEPBIND, https://crbug.com/705255 #if !BUILDFLAG(IS_ANDROID) && !defined(THREAD_SANITIZER) && \ diff --git a/www/chromium/files/patch-base_posix_file__descriptor__shuffle.h b/www/chromium/files/patch-base_posix_file__descriptor__shuffle.h new file mode 100644 index 000000000000..f763069a2370 --- /dev/null +++ b/www/chromium/files/patch-base_posix_file__descriptor__shuffle.h @@ -0,0 +1,11 @@ +--- base/posix/file_descriptor_shuffle.h.orig 2024-10-22 08:31:56 UTC ++++ base/posix/file_descriptor_shuffle.h +@@ -26,6 +26,8 @@ + #include "base/base_export.h" + #include "base/compiler_specific.h" + ++#undef close ++ + namespace base { + + // A Delegate which performs the actions required to perform an injective diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h index 684ed62fde12..896e594bd512 100644 --- a/www/chromium/files/patch-base_process_launch.h +++ b/www/chromium/files/patch-base_process_launch.h @@ -1,6 +1,6 @@ ---- base/process/launch.h.orig 2024-08-26 12:06:38 UTC +--- base/process/launch.h.orig 2024-10-22 08:31:56 UTC +++ base/process/launch.h -@@ -211,7 +211,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -237,7 +237,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) diff --git a/www/chromium/files/patch-base_process_launch__posix.cc b/www/chromium/files/patch-base_process_launch__posix.cc index a1d5e38a63eb..dac6808e1533 100644 --- a/www/chromium/files/patch-base_process_launch__posix.cc +++ b/www/chromium/files/patch-base_process_launch__posix.cc @@ -1,6 +1,6 @@ ---- base/process/launch_posix.cc.orig 2024-06-17 12:56:06 UTC +--- base/process/launch_posix.cc.orig 2024-10-22 08:31:56 UTC +++ base/process/launch_posix.cc -@@ -66,6 +66,9 @@ +@@ -67,6 +67,9 @@ #error "macOS should use launch_mac.cc" #endif diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index 6c4db4d063fe..fdcb9a329429 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2024-05-21 18:07:39 UTC +--- base/process/process_metrics.h.orig 2024-10-22 08:31:56 UTC +++ base/process/process_metrics.h @@ -38,7 +38,7 @@ #endif @@ -18,7 +18,7 @@ // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // -@@ -116,7 +116,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -113,7 +113,7 @@ class BASE_EXPORT ProcessMetrics { // convenience wrapper for CreateProcessMetrics(). static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics(); @@ -27,7 +27,7 @@ // 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; -@@ -150,7 +150,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -147,7 +147,7 @@ class BASE_EXPORT ProcessMetrics { base::expected<TimeDelta, ProcessCPUUsageError> GetCumulativeCPUUsage(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -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 -@@ -195,7 +195,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -192,7 +192,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; -@@ -216,7 +216,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -213,7 +213,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) -@@ -238,12 +238,10 @@ class BASE_EXPORT ProcessMetrics { +@@ -235,12 +235,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_; @@ -68,7 +68,7 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -284,7 +282,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -281,7 +279,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) || \ @@ -77,7 +77,7 @@ // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -319,7 +317,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -316,7 +314,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -86,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 -@@ -334,7 +332,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -331,7 +329,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -95,7 +95,7 @@ int buffers = 0; int cached = 0; int active_anon = 0; -@@ -371,7 +369,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK +@@ -368,7 +366,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -104,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. -@@ -566,7 +564,7 @@ class BASE_EXPORT SystemMetrics { +@@ -563,7 +561,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 72062da66c7f..7b904c7c3303 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 2024-06-17 12:56:06 UTC +--- base/process/process_metrics_freebsd.cc.orig 2024-10-23 07:00:35 UTC +++ base/process/process_metrics_freebsd.cc -@@ -3,44 +3,58 @@ +@@ -3,43 +3,58 @@ // found in the LICENSE file. #include "base/process/process_metrics.h" @@ -67,14 +67,13 @@ -base::expected<TimeDelta, ProcessCPUUsageError> -ProcessMetrics::GetCumulativeCPUUsage() { -- NOTREACHED_IN_MIGRATION(); -- return base::unexpected(ProcessCPUUsageError::kNotImplemented); +- NOTREACHED(); -} - size_t GetSystemCommitCharge() { int mib[2], pagesize; unsigned long mem_total, mem_free, mem_inactive; -@@ -62,6 +76,230 @@ size_t GetSystemCommitCharge() { +@@ -61,6 +76,230 @@ size_t GetSystemCommitCharge() { pagesize = getpagesize(); return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); 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 6a9b8f8d9fdf..25f4ba1f99d9 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-06-17 12:56:06 UTC +--- base/process/process_metrics_openbsd.cc.orig 2024-10-22 08:31:56 UTC +++ base/process/process_metrics_openbsd.cc -@@ -6,75 +6,50 @@ +@@ -6,74 +6,50 @@ #include <stddef.h> #include <stdint.h> @@ -79,8 +79,7 @@ - -base::expected<TimeDelta, ProcessCPUUsageError> -ProcessMetrics::GetCumulativeCPUUsage() { -- NOTREACHED_IN_MIGRATION(); -- return base::unexpected(ProcessCPUUsageError::kNotImplemented); +- NOTREACHED(); -} - -ProcessMetrics::ProcessMetrics(ProcessHandle process) @@ -94,7 +93,7 @@ struct vmtotal vmtotal; unsigned long mem_total, mem_free, mem_inactive; size_t len = sizeof(vmtotal); -@@ -86,9 +61,136 @@ size_t GetSystemCommitCharge() { +@@ -85,9 +61,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__unittest.cc b/www/chromium/files/patch-base_process_process__unittest.cc index 5a13d8c56a58..b693102e2dfc 100644 --- a/www/chromium/files/patch-base_process_process__unittest.cc +++ b/www/chromium/files/patch-base_process_process__unittest.cc @@ -1,6 +1,6 @@ ---- base/process/process_unittest.cc.orig 2024-03-22 08:19:40 UTC +--- base/process/process_unittest.cc.orig 2024-10-22 08:31:56 UTC +++ base/process/process_unittest.cc -@@ -199,7 +199,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { +@@ -203,7 +203,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { // was spawned and a time recorded after it was spawned. However, since the // base::Time and process creation clocks don't match, tolerate some error. constexpr base::TimeDelta kTolerance = diff --git a/www/chromium/files/patch-base_rand__util__posix.cc b/www/chromium/files/patch-base_rand__util__posix.cc index d01b8c299f5e..ad3066d055a0 100644 --- a/www/chromium/files/patch-base_rand__util__posix.cc +++ b/www/chromium/files/patch-base_rand__util__posix.cc @@ -1,4 +1,4 @@ ---- base/rand_util_posix.cc.orig 2024-08-26 12:06:38 UTC +--- base/rand_util_posix.cc.orig 2024-10-22 08:31:56 UTC +++ base/rand_util_posix.cc @@ -28,7 +28,7 @@ #include "base/time/time.h" @@ -30,7 +30,7 @@ // TODO(pasko): Unify reading kernel version numbers in: // mojo/core/channel_linux.cc // chrome/browser/android/seccomp_support_detector.cc -@@ -181,6 +183,7 @@ bool UseBoringSSLForRandBytes() { +@@ -177,6 +179,7 @@ bool UseBoringSSLForRandBytes() { namespace { void RandBytesInternal(span<uint8_t> output, bool avoid_allocation) { @@ -38,7 +38,7 @@ #if !BUILDFLAG(IS_NACL) // The BoringSSL experiment takes priority over everything else. if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) { -@@ -217,6 +220,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi +@@ -213,6 +216,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi const int urandom_fd = GetUrandomFD(); const bool success = ReadFromFD(urandom_fd, as_writable_chars(output)); CHECK(success); @@ -48,7 +48,7 @@ } } // namespace -@@ -236,9 +242,11 @@ void RandBytes(span<uint8_t> output) { +@@ -232,9 +238,11 @@ void RandBytes(span<uint8_t> output) { RandBytesInternal(output, /*avoid_allocation=*/false); } diff --git a/www/chromium/files/patch-base_system_sys__info__freebsd.cc b/www/chromium/files/patch-base_system_sys__info__freebsd.cc index 1a629e711c27..52441554330f 100644 --- a/www/chromium/files/patch-base_system_sys__info__freebsd.cc +++ b/www/chromium/files/patch-base_system_sys__info__freebsd.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_freebsd.cc.orig 2024-06-17 12:56:06 UTC +--- base/system/sys_info_freebsd.cc.orig 2024-10-22 08:31:56 UTC +++ base/system/sys_info_freebsd.cc -@@ -9,30 +9,106 @@ +@@ -9,28 +9,103 @@ #include <sys/sysctl.h> #include "base/notreached.h" @@ -21,7 +21,7 @@ + } + return ncpu; +} -+ ++ +uint64_t SysInfo::AmountOfPhysicalMemoryImpl() { + int pages, page_size, r = 0; size_t size = sizeof(pages); @@ -31,12 +31,11 @@ + + if (r == 0) + r = sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0); -+ if (r == 0) ++ if (r == 0) + r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); + + if (r == -1) { - NOTREACHED_IN_MIGRATION(); - return 0; + NOTREACHED(); } - return static_cast<int64_t>(pages) * page_size; + @@ -48,7 +47,7 @@ + unsigned int pgfree, pginact, pgcache; + size_t size = sizeof(page_size); + size_t szpg = sizeof(pgfree); -+ ++ + if (r == 0) + r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); + if (r == 0) @@ -93,10 +92,8 @@ size_t size = sizeof(limit); + if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) { - NOTREACHED_IN_MIGRATION(); - return 0; + NOTREACHED(); } -+ return static_cast<uint64_t>(limit); +} + diff --git a/www/chromium/files/patch-base_system_sys__info__openbsd.cc b/www/chromium/files/patch-base_system_sys__info__openbsd.cc index 6d5c06c8a7d0..59493578f7dd 100644 --- a/www/chromium/files/patch-base_system_sys__info__openbsd.cc +++ b/www/chromium/files/patch-base_system_sys__info__openbsd.cc @@ -1,14 +1,6 @@ ---- base/system/sys_info_openbsd.cc.orig 2024-06-17 12:56:06 UTC +--- base/system/sys_info_openbsd.cc.orig 2024-10-22 08:31:56 UTC +++ base/system/sys_info_openbsd.cc -@@ -3,7 +3,6 @@ - // found in the LICENSE file. - - #include "base/system/sys_info.h" -- - #include <stddef.h> - #include <stdint.h> - #include <sys/param.h> -@@ -12,6 +11,7 @@ +@@ -12,6 +12,7 @@ #include "base/notreached.h" #include "base/posix/sysctl.h" @@ -16,7 +8,7 @@ namespace { -@@ -27,9 +27,14 @@ uint64_t AmountOfMemory(int pages_name) { +@@ -27,9 +28,14 @@ uint64_t AmountOfMemory(int pages_name) { namespace base { @@ -32,7 +24,7 @@ int ncpu; size_t size = sizeof(ncpu); if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) { -@@ -41,10 +46,26 @@ int SysInfo::NumberOfProcessors() { +@@ -40,10 +46,26 @@ int SysInfo::NumberOfProcessors() { // static uint64_t SysInfo::AmountOfPhysicalMemoryImpl() { @@ -47,12 +39,12 @@ +std::string SysInfo::CPUModelName() { + int mib[] = {CTL_HW, HW_MODEL}; + size_t len = std::size(cpumodel); -+ ++ + if (cpumodel[0] == '\0') { + if (sysctl(mib, std::size(mib), cpumodel, &len, NULL, 0) < 0) + return std::string(); + } -+ ++ + return std::string(cpumodel, len - 1); +} + @@ -60,7 +52,7 @@ uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { // We should add inactive file-backed memory also but there is no such // information from OpenBSD unfortunately. -@@ -56,16 +77,28 @@ uint64_t SysInfo::MaxSharedMemorySize() { +@@ -55,15 +77,27 @@ uint64_t SysInfo::MaxSharedMemorySize() { int mib[] = {CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX}; size_t limit; size_t size = sizeof(limit); @@ -68,8 +60,7 @@ + if (shmmax) + goto out; if (sysctl(mib, std::size(mib), &limit, &size, NULL, 0) < 0) { - NOTREACHED_IN_MIGRATION(); - return 0; + NOTREACHED(); } - return static_cast<uint64_t>(limit); + shmmax = static_cast<uint64_t>(limit); diff --git a/www/chromium/files/patch-base_system_sys__info__posix.cc b/www/chromium/files/patch-base_system_sys__info__posix.cc index 377a5e6c709e..44a59d778157 100644 --- a/www/chromium/files/patch-base_system_sys__info__posix.cc +++ b/www/chromium/files/patch-base_system_sys__info__posix.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_posix.cc.orig 2024-03-22 08:19:40 UTC +--- base/system/sys_info_posix.cc.orig 2024-10-22 08:31:56 UTC +++ base/system/sys_info_posix.cc -@@ -118,7 +118,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, +@@ -117,7 +117,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, namespace base { @@ -9,7 +9,7 @@ // static int SysInfo::NumberOfProcessors() { #if BUILDFLAG(IS_MAC) -@@ -175,7 +175,7 @@ int SysInfo::NumberOfProcessors() { +@@ -173,7 +173,7 @@ int SysInfo::NumberOfProcessors() { return cached_num_cpus; } @@ -18,7 +18,7 @@ // static uint64_t SysInfo::AmountOfVirtualMemory() { -@@ -265,6 +265,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -256,6 +256,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; diff --git a/www/chromium/files/patch-base_threading_platform__thread__internal__posix.cc b/www/chromium/files/patch-base_threading_platform__thread__internal__posix.cc index 87a3c8373eb5..9bbcc26cc00c 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__internal__posix.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__internal__posix.cc @@ -1,6 +1,6 @@ ---- base/threading/platform_thread_internal_posix.cc.orig 2024-03-22 08:19:40 UTC +--- base/threading/platform_thread_internal_posix.cc.orig 2024-10-22 08:31:56 UTC +++ base/threading/platform_thread_internal_posix.cc -@@ -42,7 +42,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest +@@ -41,7 +41,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest } int GetCurrentThreadNiceValue() { diff --git a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc index abccd59835cb..fa6a63b35bef 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_unittest.cc.orig 2024-06-17 12:56:06 UTC +--- base/threading/platform_thread_unittest.cc.orig 2024-10-22 08:31:56 UTC +++ base/threading/platform_thread_unittest.cc @@ -38,7 +38,7 @@ #include "base/time/time.h" @@ -9,7 +9,7 @@ #include <pthread.h> #include <sys/syscall.h> #include <sys/types.h> -@@ -429,7 +429,7 @@ TEST(PlatformThreadTest, +@@ -362,7 +362,7 @@ TEST(PlatformThreadTest, // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this // proprerty changes for a given platform. TEST(PlatformThreadTest, CanChangeThreadType) { @@ -18,7 +18,7 @@ // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be // able to increase priority to any level unless we are root (euid == 0). bool kCanIncreasePriority = false; -@@ -713,12 +713,16 @@ INSTANTIATE_TEST_SUITE_P( +@@ -616,12 +616,16 @@ INSTANTIATE_TEST_SUITE_P( #endif // BUILDFLAG(IS_APPLE) diff --git a/www/chromium/files/patch-build_config_clang_BUILD.gn b/www/chromium/files/patch-build_config_clang_BUILD.gn index e6812b4e3d30..3ea9d91eeb03 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-09-30 07:45:04 UTC +--- build/config/clang/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ build/config/clang/BUILD.gn -@@ -237,7 +237,12 @@ template("clang_lib") { +@@ -236,7 +236,12 @@ 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 4b0f9a377e11..151d67f6b479 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-09-30 07:45:04 UTC +--- build/config/compiler/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ build/config/compiler/BUILD.gn @@ -199,7 +199,7 @@ declare_args() { # This greatly reduces the size of debug builds, at the cost of @@ -9,7 +9,7 @@ } declare_args() { -@@ -253,13 +253,16 @@ config("default_include_dirs") { +@@ -256,13 +256,16 @@ config("default_include_dirs") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. config("no_unresolved_symbols") { @@ -27,7 +27,7 @@ } # compiler --------------------------------------------------------------------- -@@ -505,6 +508,10 @@ config("compiler") { +@@ -508,6 +511,10 @@ config("compiler") { } } @@ -38,7 +38,7 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_icf && (!is_apple || use_lld)) { -@@ -558,7 +565,7 @@ config("compiler") { +@@ -561,7 +568,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -47,7 +47,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -1212,7 +1219,7 @@ config("compiler_cpu_abi") { +@@ -1217,7 +1224,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" ] -@@ -1227,7 +1234,7 @@ config("compiler_cpu_abi") { +@@ -1232,7 +1239,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" ] -@@ -1562,7 +1569,7 @@ config("compiler_deterministic") { +@@ -1567,7 +1574,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", -@@ -1620,7 +1627,7 @@ config("compiler_deterministic") { +@@ -1625,7 +1632,7 @@ config("compiler_deterministic") { } config("clang_revision") { @@ -83,7 +83,7 @@ current_os != "zos") { update_args = [ "--print-revision", -@@ -1950,9 +1957,6 @@ config("default_warnings") { +@@ -1955,9 +1962,6 @@ config("default_warnings") { # TODO(crbug.com/40286317): Evaluate and possibly enable. "-Wno-vla-extension", @@ -93,7 +93,7 @@ ] cflags_cc += [ -@@ -1960,17 +1964,11 @@ config("default_warnings") { +@@ -1965,17 +1969,11 @@ config("default_warnings") { "-Wenum-compare-conditional", ] @@ -112,7 +112,7 @@ } } -@@ -2699,7 +2697,7 @@ config("afdo_optimize_size") { +@@ -2709,7 +2707,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") { @@ -121,7 +121,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2726,7 +2724,7 @@ config("afdo") { +@@ -2736,7 +2734,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } @@ -130,8 +130,8 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2891,7 +2889,7 @@ config("symbols") { - configs += [ "//build/config:compress_debug_sections" ] +@@ -2913,7 +2911,7 @@ config("symbols") { + cflags += [ "-gomit-unreferenced-methods" ] } - if (is_clang && (!is_nacl || is_nacl_saigo)) { diff --git a/www/chromium/files/patch-build_config_rust.gni b/www/chromium/files/patch-build_config_rust.gni index 4e4f8639e37a..240ce7fe07d6 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-07-30 11:12:21 UTC +--- build/config/rust.gni.orig 2024-10-22 08:31:56 UTC +++ build/config/rust.gni -@@ -270,6 +270,10 @@ if (is_linux || is_chromeos) { +@@ -277,6 +277,10 @@ if (is_linux || is_chromeos) { } } diff --git a/www/chromium/files/patch-cc_base_features.cc b/www/chromium/files/patch-cc_base_features.cc index 5387ad9f7b5f..650b93c05d07 100644 --- a/www/chromium/files/patch-cc_base_features.cc +++ b/www/chromium/files/patch-cc_base_features.cc @@ -1,6 +1,6 @@ ---- cc/base/features.cc.orig 2024-08-26 12:06:38 UTC +--- cc/base/features.cc.orig 2024-10-22 08:31:56 UTC +++ cc/base/features.cc -@@ -85,7 +85,7 @@ const base::FeatureParam<int> kDeferImplInvalidationFr +@@ -78,7 +78,7 @@ const base::FeatureParam<int> kDeferImplInvalidationFr // be using a separate flag to control the launch on GL. BASE_FEATURE(kUseDMSAAForTiles, "UseDMSAAForTiles", diff --git a/www/chromium/files/patch-chrome_app_chrome__main.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc index a5b5d144369e..2101f0ad0ec1 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main.cc @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main.cc.orig 2024-08-26 12:06:38 UTC +--- chrome/app/chrome_main.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/app/chrome_main.cc @@ -30,11 +30,11 @@ #include "chrome/app/chrome_main_mac.h" @@ -23,7 +23,7 @@ #define ENABLE_OLD_HEADLESS #endif -@@ -119,7 +119,7 @@ int ChromeMain(int argc, const char** argv) { +@@ -120,7 +120,7 @@ int ChromeMain(int argc, const char** argv) { #error Unknown platform. #endif @@ -32,7 +32,7 @@ PossiblyDetermineFallbackChromeChannel(argv[0]); #endif -@@ -185,7 +185,7 @@ int ChromeMain(int argc, const char** argv) { +@@ -186,7 +186,7 @@ int ChromeMain(int argc, const char** argv) { SetUpBundleOverrides(); #endif 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 d62ef5e456c2..06d825f3d2c5 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -144,7 +144,7 @@ +@@ -145,7 +145,7 @@ #include "components/about_ui/credit_utils.h" #endif @@ -9,12 +9,12 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -188,21 +188,21 @@ +@@ -189,17 +189,17 @@ #include "v8/include/v8.h" #endif -#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_BSD) #include "base/environment.h" #endif @@ -24,18 +24,13 @@ #include "ui/linux/display_server_utils.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" - #endif - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -346,7 +346,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -343,7 +343,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -44,7 +39,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -431,7 +431,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -428,7 +428,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -53,7 +48,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) || -@@ -477,7 +477,7 @@ void SetCrashpadUploadConsentPostLogin() { +@@ -474,7 +474,7 @@ void SetCrashpadUploadConsentPostLogin() { } #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -62,7 +57,7 @@ void SIGTERMProfilingShutdown(int signal) { content::Profiling::Stop(); struct sigaction sigact; -@@ -559,7 +559,7 @@ std::optional<int> AcquireProcessSingleton( +@@ -556,7 +556,7 @@ std::optional<int> AcquireProcessSingleton( // process can be exited. ChromeProcessSingleton::CreateInstance(user_data_dir); @@ -71,7 +66,7 @@ // 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_ +@@ -640,7 +640,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -80,7 +75,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. -@@ -773,7 +773,7 @@ void RecordMainStartupMetrics(const StartupTimestamps& +@@ -770,7 +770,7 @@ void RecordMainStartupMetrics(const StartupTimestamps& #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -89,7 +84,7 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::GetCommon().RecordStartupProcessCreationTime( -@@ -967,7 +967,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia +@@ -964,7 +964,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia #if BUILDFLAG(IS_OZONE) // Initialize Ozone platform and add required feature flags as per platform's // properties. @@ -98,7 +93,7 @@ ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess()); #endif ui::OzonePlatform::PreEarlyInitialization(); -@@ -1165,7 +1165,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv +@@ -1168,7 +1168,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv const bool is_canary_dev = IsCanaryDev(); const bool emit_crashes = #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -107,7 +102,7 @@ is_canary_dev; #else false; -@@ -1320,7 +1320,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1318,7 +1318,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom // TODO(crbug.com/40118868): Revisit the macro expression once build flag // switch of lacros-chrome is complete. @@ -116,7 +111,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1350,7 +1350,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1348,7 +1348,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -125,7 +120,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1737,7 +1737,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1725,7 +1725,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -134,7 +129,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess && !command_line.HasSwitch(switches::kDisableCrashpadForTesting)) { -@@ -1833,13 +1833,13 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1821,13 +1821,13 @@ absl::variant<int, content::MainFunctionParams> Chrome #else #if BUILDFLAG(IS_MAC) || (BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && \ diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn index 4fbf3fceb7c3..9ef03462fac5 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-09-30 07:45:04 UTC +--- chrome/browser/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/BUILD.gn -@@ -6829,6 +6829,13 @@ static_library("browser") { +@@ -6905,6 +6905,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 3e664bd8433c..bb559dc11318 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/about_flags.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/about_flags.cc -@@ -245,7 +245,7 @@ +@@ -244,7 +244,7 @@ #include "ui/ui_features.h" #include "url/url_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -339,7 +339,7 @@ +@@ -337,7 +337,7 @@ #include "device/vr/public/cpp/features.h" #endif @@ -18,7 +18,7 @@ #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -348,7 +348,7 @@ +@@ -346,7 +346,7 @@ #include "chrome/browser/win/mica_titlebar.h" #endif @@ -27,7 +27,7 @@ #include "chrome/browser/enterprise/profile_management/profile_management_features.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -358,7 +358,7 @@ +@@ -356,7 +356,7 @@ #include "components/user_education/common/user_education_features.h" // nogncheck #endif @@ -36,7 +36,7 @@ #include "chrome/browser/ui/ui_features.h" #include "ui/base/ui_base_features.h" #endif -@@ -500,7 +500,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -498,7 +498,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -45,7 +45,7 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -783,6 +783,26 @@ const FeatureEntry::FeatureVariation +@@ -775,6 +775,26 @@ const FeatureEntry::FeatureVariation std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam), nullptr}}; @@ -72,7 +72,7 @@ const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = { {"UIClipboardMaximumAge", "60"}}; const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = { -@@ -1195,7 +1215,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot +@@ -1188,7 +1208,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -81,7 +81,7 @@ const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{ {"AtKeywordAcceleration", "true"}, }; -@@ -1239,7 +1259,7 @@ const FeatureEntry::FeatureVariation +@@ -1232,7 +1252,7 @@ const FeatureEntry::FeatureVariation }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -90,25 +90,25 @@ const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = { {"ShortcutBoostSearchScore", "0"}, {"ShortcutBoostNonTopHitThreshold", "0"}, -@@ -3719,7 +3739,7 @@ const flags_ui::FeatureEntry::FeatureVariation +@@ -3678,7 +3698,7 @@ const flags_ui::FeatureEntry::FeatureVariation }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const flags_ui::FeatureEntry::FeatureParam - kDesktopPWAsLinkCapturingDefaultOn[] = { - {"link_capturing_state", "on_by_default"}}; -@@ -4892,7 +4912,7 @@ const FeatureEntry kFeatureEntries[] = { + const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOn[] = + {{"link_capturing_state", "on_by_default"}}; + const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOff[] = +@@ -4920,7 +4940,7 @@ const FeatureEntry kFeatureEntries[] = { }, - #endif // BUILDFLAG(IS_ANDROID) + #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) { "fluent-overlay-scrollbars", flag_descriptions::kFluentOverlayScrollbarsName, -@@ -5303,7 +5323,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5332,7 +5352,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebAppUniversalInstallDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kWebAppUniversalInstall)}, #endif // !BUILDFLAG(IS_ANDROID) @@ -117,7 +117,7 @@ {"shortcuts-not-apps", flag_descriptions::kShortcutsNotAppsName, flag_descriptions::kShortcutsNotAppsDescription, kOsMac | kOsWin | kOsLinux, -@@ -5452,7 +5472,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5487,7 +5507,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -126,7 +126,7 @@ {"pulseaudio-loopback-for-cast", flag_descriptions::kPulseaudioLoopbackForCastName, flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux, -@@ -5479,9 +5499,18 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5514,9 +5534,18 @@ const FeatureEntry kFeatureEntries[] = { {"wayland-text-input-v3", flag_descriptions::kWaylandTextInputV3Name, flag_descriptions::kWaylandTextInputV3Description, kOsLinux, FEATURE_VALUE_TYPE(features::kWaylandTextInputV3)}, @@ -146,7 +146,7 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -6472,7 +6501,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6465,7 +6494,7 @@ const FeatureEntry kFeatureEntries[] = { "MlUrlScoring")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -155,7 +155,7 @@ {"omnibox-domain-suggestions", flag_descriptions::kOmniboxDomainSuggestionsName, flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, -@@ -6767,7 +6796,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6752,7 +6781,7 @@ const FeatureEntry kFeatureEntries[] = { "OrganicRepeatableQueries")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -164,7 +164,7 @@ {"history-embeddings", flag_descriptions::kHistoryEmbeddingsName, flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop, FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings, -@@ -7401,7 +7430,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7341,7 +7370,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -173,7 +173,7 @@ {"cups-ipp-printing-backend", flag_descriptions::kCupsIppPrintingBackendName, flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop, -@@ -8405,7 +8434,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8326,7 +8355,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCooperativeSchedulingDescription, kOsAll, FEATURE_VALUE_TYPE(features::kCooperativeScheduling)}, @@ -182,7 +182,7 @@ {"enable-network-service-sandbox", flag_descriptions::kEnableNetworkServiceSandboxName, flag_descriptions::kEnableNetworkServiceSandboxDescription, -@@ -8429,7 +8458,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8350,7 +8379,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(media::kV4L2FlatStatefulVideoDecoder)}, #endif @@ -191,7 +191,7 @@ {"enable-family-link-extensions-permissions", flag_descriptions:: kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName, -@@ -9267,7 +9296,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9184,7 +9213,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -200,7 +200,7 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -9306,7 +9335,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9217,7 +9246,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -209,17 +209,8 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9531,7 +9560,7 @@ const FeatureEntry kFeatureEntries[] = { - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - {"policy-indication-for-managed-default-search", - flag_descriptions::kPolicyIndicationForManagedDefaultSearchName, - flag_descriptions::kPolicyIndicationForManagedDefaultSearchDescription, -@@ -9869,7 +9898,7 @@ const FeatureEntry kFeatureEntries[] = { - #endif +@@ -9745,7 +9774,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(features::kRenderPassDrawnRect)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) @@ -227,7 +218,7 @@ {"media-session-enter-picture-in-picture", flag_descriptions::kMediaSessionEnterPictureInPictureName, flag_descriptions::kMediaSessionEnterPictureInPictureDescription, -@@ -10762,7 +10791,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10592,7 +10621,7 @@ const FeatureEntry kFeatureEntries[] = { kOsDesktop | kOsAndroid, FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, @@ -236,7 +227,7 @@ {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName, flag_descriptions::kCameraMicEffectsDescription, static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux), -@@ -10800,7 +10829,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10630,7 +10659,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -245,7 +236,7 @@ {"site-search-settings-policy", flag_descriptions::kSiteSearchSettingsPolicyName, flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll, -@@ -10929,7 +10958,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10759,7 +10788,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kHideIncognitoMediaMetadataDescription, kOsAll, FEATURE_VALUE_TYPE(media::kHideIncognitoMediaMetadata)}, @@ -254,25 +245,16 @@ {"third-party-profile-management", flag_descriptions::kThirdPartyProfileManagementName, flag_descriptions::kThirdPartyProfileManagementDescription, -@@ -10972,7 +11001,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10801,7 +10830,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - {"enable-user-link-capturing-pwa", - flag_descriptions::kDesktopPWAsUserLinkCapturingName, - flag_descriptions::kDesktopPWAsUserLinkCapturingDescription, -@@ -11262,7 +11291,7 @@ const FeatureEntry kFeatureEntries[] = { - trusted_vault::kTrustedVaultFrequentDegradedRecoverabilityPolling)}, - #endif - --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - {"restart-to-gain-access-to-keychain", - flag_descriptions::kRestartToGainAccessToKeychainName, - flag_descriptions::kRestartToGainAccessToKeychainDescription, -@@ -11925,7 +11954,7 @@ const FeatureEntry kFeatureEntries[] = { + {"enable-user-navigation-capturing-pwa", + flag_descriptions::kPwaNavigationCapturingName, + flag_descriptions::kPwaNavigationCapturingDescription, +@@ -11726,7 +11755,7 @@ const FeatureEntry kFeatureEntries[] = { kAuthenticateUsingUserConsentVerifierInteropApi)}, #endif @@ -281,8 +263,8 @@ {"sync-enable-bookmarks-in-transport-mode", flag_descriptions::kSyncEnableBookmarksInTransportModeName, flag_descriptions::kSyncEnableBookmarksInTransportModeDescription, -@@ -12001,7 +12030,7 @@ const FeatureEntry kFeatureEntries[] = { - #endif // BUILDFLAG(IS_WIN) +@@ -11816,7 +11845,7 @@ const FeatureEntry kFeatureEntries[] = { + #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_WIN) @@ -290,7 +272,7 @@ {"classify-url-on-process-response-event", flag_descriptions::kClassifyUrlOnProcessResponseEventName, flag_descriptions::kClassifyUrlOnProcessResponseEventDescription, -@@ -12010,7 +12039,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11825,7 +11854,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -299,7 +281,7 @@ {"tab-organization", flag_descriptions::kTabOrganizationName, flag_descriptions::kTabOrganizationDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kTabOrganization)}, -@@ -12049,7 +12078,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11864,7 +11893,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kLanguageDetectionAPIDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kLanguageDetectionAPI)}, diff --git a/www/chromium/files/patch-chrome_browser_browser__features.cc b/www/chromium/files/patch-chrome_browser_browser__features.cc index 672ec8bec3e9..5f6d2af16751 100644 --- a/www/chromium/files/patch-chrome_browser_browser__features.cc +++ b/www/chromium/files/patch-chrome_browser_browser__features.cc @@ -1,6 +1,15 @@ ---- chrome/browser/browser_features.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/browser_features.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/browser_features.cc -@@ -69,7 +69,7 @@ BASE_FEATURE(kClosedTabCache, +@@ -71,7 +71,7 @@ BASE_FEATURE(kClosedTabCache, + "ClosedTabCache", + base::FEATURE_DISABLED_BY_DEFAULT); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Enables usage of os_crypt_async::SecretPortalKeyProvider. Once + // `kSecretPortalKeyProviderUseForEncryption` is enabled, this flag cannot be + // disabled without losing data. +@@ -87,7 +87,7 @@ BASE_FEATURE(kDbusSecretPortal, BASE_FEATURE(kDestroyProfileOnBrowserClose, "DestroyProfileOnBrowserClose", #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -9,7 +18,16 @@ base::FEATURE_ENABLED_BY_DEFAULT); #else base::FEATURE_DISABLED_BY_DEFAULT); -@@ -328,7 +328,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, +@@ -347,7 +347,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, + "SandboxExternalProtocolBlockedWarning", + base::FEATURE_ENABLED_BY_DEFAULT); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // If true, encrypt new data with the key provided by SecretPortalKeyProvider. + // Otherwise, it will only decrypt existing data. + BASE_FEATURE(kSecretPortalKeyProviderUseForEncryption, +@@ -360,7 +360,7 @@ BASE_FEATURE(kSecretPortalKeyProviderUseForEncryption, BASE_FEATURE(kSupportSearchSuggestionForPrerender2, "SupportSearchSuggestionForPrerender2", #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/chromium/files/patch-chrome_browser_browser__features.h b/www/chromium/files/patch-chrome_browser_browser__features.h new file mode 100644 index 000000000000..6811aeecabc3 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_browser__features.h @@ -0,0 +1,20 @@ +--- chrome/browser/browser_features.h.orig 2024-10-22 08:31:56 UTC ++++ chrome/browser/browser_features.h +@@ -29,7 +29,7 @@ BASE_DECLARE_FEATURE(kCertificateTransparencyAskBefore + BASE_DECLARE_FEATURE(kCertVerificationNetworkTime); + BASE_DECLARE_FEATURE(kClosedTabCache); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_DECLARE_FEATURE(kDbusSecretPortal); + #endif + +@@ -143,7 +143,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed + BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlocked); + BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlockedWarning); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_DECLARE_FEATURE(kSecretPortalKeyProviderUseForEncryption); + #endif + diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc index 19616c76c8e3..98344e80f8de 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/browser_process_impl.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/browser_process_impl.cc -@@ -228,7 +228,7 @@ +@@ -235,7 +235,7 @@ #include "chrome/browser/ui/profiles/profile_picker.h" #endif @@ -9,7 +9,25 @@ #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck #endif -@@ -1277,7 +1277,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -256,7 +256,7 @@ + #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/browser_features.h" + #include "components/os_crypt/async/browser/secret_portal_key_provider.h" + #endif +@@ -1124,7 +1124,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim + GoogleUpdateSettings::GetCollectStatsConsent()); + registry->RegisterBooleanPref(prefs::kDevToolsRemoteDebuggingAllowed, true); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + os_crypt_async::SecretPortalKeyProvider::RegisterLocalPrefs(registry); + #endif + } +@@ -1307,7 +1307,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); @@ -18,7 +36,16 @@ ChromeJsErrorReportProcessor::Create(); #endif -@@ -1614,7 +1614,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1404,7 +1404,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { + } + #endif // BUILDFLAG(IS_WIN) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled(features::kDbusSecretPortal)) { + providers.emplace_back( + /*precedence=*/10u, +@@ -1655,7 +1655,7 @@ void BrowserProcessImpl::Unpin() { // Mac is currently not supported. // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.h b/www/chromium/files/patch-chrome_browser_browser__process__impl.h index ed3df940c3c0..c4a36d984ada 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.h +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.h @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.h.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/browser_process_impl.h.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/browser_process_impl.h -@@ -403,7 +403,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -405,7 +405,7 @@ class BrowserProcessImpl : public BrowserProcess, // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 899e955acbcc..25be38a27ec6 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-09-30 07:45:04 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -127,12 +127,12 @@ +@@ -128,12 +128,12 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -15,7 +15,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 -@@ -219,7 +219,7 @@ +@@ -221,7 +221,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -24,7 +24,7 @@ #include "chrome/browser/companion/visual_query/visual_query_suggestions_service_factory.h" #include "chrome/browser/screen_ai/screen_ai_service_router.h" #include "chrome/browser/screen_ai/screen_ai_service_router_factory.h" -@@ -232,7 +232,7 @@ +@@ -234,7 +234,7 @@ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) @@ -33,7 +33,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -846,7 +846,7 @@ void BindMediaFoundationPreferences( +@@ -859,7 +859,7 @@ void BindMediaFoundationPreferences( #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -42,7 +42,7 @@ void BindScreenAIAnnotator( content::RenderFrameHost* frame_host, mojo::PendingReceiver<screen_ai::mojom::ScreenAIAnnotator> receiver) { -@@ -1063,7 +1063,7 @@ void PopulateChromeFrameBinders( +@@ -1083,7 +1083,7 @@ void PopulateChromeFrameBinders( #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -51,7 +51,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 -@@ -1159,7 +1159,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1179,7 +1179,7 @@ void PopulateChromeWebUIFrameBinders( DataSharingInternalsUI>(map); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -60,7 +60,7 @@ RegisterWebUIControllerInterfaceBinder< connectors_internals::mojom::PageHandler, enterprise_connectors::ConnectorsInternalsUI>(map); -@@ -1170,7 +1170,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1190,7 +1190,7 @@ void PopulateChromeWebUIFrameBinders( policy::DlpInternalsUI>(map); #endif @@ -69,7 +69,7 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); #endif -@@ -1256,14 +1256,14 @@ void PopulateChromeWebUIFrameBinders( +@@ -1276,14 +1276,14 @@ void PopulateChromeWebUIFrameBinders( page_image_service::mojom::PageImageServiceHandler, HistoryUI, HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map); @@ -86,7 +86,7 @@ WhatsNewUI, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) NewTabPageUI>(map); -@@ -1750,7 +1750,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1779,7 +1779,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 134e1639533a..2083470a9110 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-09-30 07:45:04 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -247,15 +247,15 @@ +@@ -249,15 +249,15 @@ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -19,7 +19,7 @@ #include "base/nix/xdg_util.h" #endif -@@ -288,14 +288,14 @@ +@@ -290,14 +290,14 @@ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,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" -@@ -367,14 +367,14 @@ +@@ -369,14 +369,14 @@ #endif // BUILDFLAG(IS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER) #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -53,7 +53,7 @@ constexpr base::FilePath::CharType kMediaHistoryDatabaseName[] = FILE_PATH_LITERAL("Media History"); -@@ -539,7 +539,7 @@ void ProcessSingletonNotificationCallbackImpl( +@@ -541,7 +541,7 @@ void ProcessSingletonNotificationCallbackImpl( } #endif @@ -62,7 +62,7 @@ // 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. -@@ -1105,7 +1105,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1118,7 +1118,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -71,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 . -@@ -1153,7 +1153,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1166,7 +1166,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -80,7 +80,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( -@@ -1340,7 +1340,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1362,7 +1362,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -89,7 +89,7 @@ // Delete the media history database if it still exists. // TODO(crbug.com/40177301): Remove this. base::ThreadPool::PostTask( -@@ -1389,7 +1389,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1411,7 +1411,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* *UrlLanguageHistogramFactory::GetForBrowserContext(profile)); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -98,7 +98,7 @@ if (headless::IsHeadlessMode()) { headless::ReportHeadlessActionMetrics(); } -@@ -1501,7 +1501,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( +@@ -1523,7 +1523,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( // In headless mode provide alternate SelectFileDialog factory overriding // any platform specific SelectFileDialog implementation that may have been // set. @@ -107,7 +107,7 @@ if (headless::IsHeadlessMode()) { headless::HeadlessSelectFileDialogFactory::SetUp(); } -@@ -2050,7 +2050,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat +@@ -2072,7 +2072,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__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc index ec68e77c297e..ea8a54c3ec96 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc @@ -1,4 +1,4 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2024-08-26 12:06:38 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/chrome_browser_main_linux.cc @@ -25,7 +25,7 @@ #include "device/bluetooth/dbus/bluez_dbus_thread_manager.h" @@ -28,7 +28,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() { ChromeBrowserMainPartsPosix::PostMainMessageLoopRun(); ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun(); -@@ -169,7 +171,7 @@ void ChromeBrowserMainPartsLinux::CheckIfSanitizeCompl +@@ -170,7 +172,7 @@ void ChromeBrowserMainPartsLinux::CheckIfSanitizeCompl #endif // BUILDFLAG(IS_CHROMEOS_ASH) void ChromeBrowserMainPartsLinux::PostDestroyThreads() { 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 b2b4773763aa..2c5b0919c1e3 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-09-30 07:45:04 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -488,7 +488,7 @@ +@@ -491,7 +491,7 @@ #include "storage/browser/file_system/external_mount_points.h" // TODO(crbug.com/40118868): 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) -@@ -605,12 +605,12 @@ +@@ -608,12 +608,12 @@ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -24,7 +24,7 @@ #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -621,7 +621,7 @@ +@@ -624,7 +624,7 @@ #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h" #endif @@ -33,7 +33,7 @@ #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" -@@ -629,7 +629,7 @@ +@@ -632,7 +632,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -42,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) -@@ -644,7 +644,7 @@ +@@ -647,7 +647,7 @@ #include "chrome/browser/ui/views/lens/lens_side_panel_navigation_helper.h" #endif @@ -51,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" -@@ -1592,7 +1592,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre +@@ -1603,7 +1603,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre #if BUILDFLAG(IS_CHROMEOS) registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false); #endif // BUILDFLAG(IS_CHROMEOS) @@ -60,7 +60,7 @@ registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled, true); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) -@@ -1792,7 +1792,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1803,7 +1803,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( is_integration_test, &startup_data_); @@ -69,7 +69,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1826,7 +1826,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1837,7 +1837,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -78,7 +78,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1847,7 +1847,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1858,7 +1858,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); #endif @@ -87,7 +87,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1866,7 +1866,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1877,7 +1877,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -96,7 +96,7 @@ main_parts->AddParts( std::make_unique< enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2740,7 +2740,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial( +@@ -2749,7 +2749,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial( void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( base::CommandLine* command_line, int child_process_id) { @@ -106,7 +106,7 @@ #if BUILDFLAG(IS_MAC) std::unique_ptr<metrics::ClientInfo> client_info = GoogleUpdateSettings::LoadMetricsClientInfo(); -@@ -2749,7 +2751,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2758,7 +2760,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin client_info->client_id); } #elif BUILDFLAG(IS_POSIX) @@ -115,7 +115,7 @@ pid_t pid; if (crash_reporter::GetHandlerSocket(nullptr, &pid)) { command_line->AppendSwitchASCII( -@@ -3101,7 +3103,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -3117,7 +3119,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin } } @@ -124,7 +124,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4928,7 +4930,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4941,7 +4943,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -133,7 +133,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5524,7 +5526,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5530,7 +5532,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -142,7 +142,7 @@ MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -5538,7 +5540,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5544,7 +5546,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -151,7 +151,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -5577,7 +5579,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5583,7 +5585,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati handle)); } @@ -160,7 +160,7 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -7518,7 +7520,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -7543,7 +7545,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_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index a97916d190a6..72b2ec93bab0 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-09-30 07:45:04 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1763,7 +1763,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1796,7 +1796,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(); } -@@ -1911,7 +1911,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1942,7 +1942,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()) { -@@ -1989,7 +1989,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl +@@ -2020,7 +2020,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__commands.cc b/www/chromium/files/patch-chrome_browser_download_download__commands.cc index a77f446e340e..f95016d101d5 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_commands.cc.orig 2024-06-17 12:56:06 UTC +--- chrome/browser/download/download_commands.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/download/download_commands.cc @@ -26,7 +26,7 @@ #include "ui/base/clipboard/scoped_clipboard_writer.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" -@@ -167,7 +167,7 @@ void DownloadCommands::ExecuteCommand(Command command) +@@ -166,7 +166,7 @@ void DownloadCommands::ExecuteCommand(Command command) } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 b1b1359e418d..5c266f3ef8d1 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-08-26 12:06:38 UTC +--- chrome/browser/download/download_item_model.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/download/download_item_model.cc -@@ -814,7 +814,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -790,7 +790,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(); -@@ -862,7 +862,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -838,7 +838,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); -@@ -1260,7 +1260,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1227,7 +1227,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 34cfb60eb722..880452256c35 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-09-30 07:45:04 UTC +--- chrome/browser/download/download_prefs.cc.orig 2024-10-22 08:31: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" -@@ -64,6 +65,10 @@ +@@ -60,6 +61,10 @@ #include "chrome/browser/flags/android/chrome_feature_list.h" #endif @@ -19,7 +19,7 @@ using content::BrowserContext; using content::BrowserThread; using content::DownloadManager; -@@ -74,7 +79,7 @@ namespace { +@@ -70,7 +75,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; -@@ -180,7 +185,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi +@@ -176,7 +181,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 -@@ -304,7 +309,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -300,7 +305,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) -@@ -471,7 +476,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens +@@ -467,7 +472,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; -@@ -503,7 +508,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -493,7 +498,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(); -@@ -540,7 +545,7 @@ void DownloadPrefs::SaveAutoOpenState() { +@@ -530,7 +535,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; -@@ -692,7 +697,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa +@@ -682,7 +687,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_safe__browsing_cloud__content__scanning_deep__scanning__utils.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_common.cc index e0b39c186385..ac419799b579 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_deep__scanning__utils.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_common.cc @@ -1,15 +1,15 @@ ---- chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.cc.orig 2024-09-30 07:45:04 UTC -+++ chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.cc -@@ -16,7 +16,7 @@ - #include "components/crash/core/common/crash_key.h" - #include "components/signin/public/identity_manager/identity_manager.h" +--- chrome/browser/enterprise/connectors/common.cc.orig 2024-10-22 08:31:56 UTC ++++ chrome/browser/enterprise/connectors/common.cc +@@ -23,7 +23,7 @@ + #include "components/policy/core/common/policy_loader_lacros.h" + #endif -#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/enterprise/signin/enterprise_signin_prefs.h" #include "components/prefs/pref_service.h" #endif -@@ -419,7 +419,7 @@ std::string GetProfileEmail(Profile* profile) { +@@ -266,7 +266,7 @@ std::string GetProfileEmail(Profile* profile) { std::string email = GetProfileEmail(IdentityManagerFactory::GetForProfile(profile)); 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 0f651def03c8..de8f48e76dcf 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-09-30 07:45:04 UTC +--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/enterprise/connectors/connectors_service.cc -@@ -546,7 +546,7 @@ bool ConnectorsService::ConnectorsEnabled() const { +@@ -528,7 +528,7 @@ bool ConnectorsService::ConnectorsEnabled() const { Profile* profile = Profile::FromBrowserContext(context_); diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc index 60337dc2f9aa..341bf2cad072 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc -@@ -18,7 +18,7 @@ +@@ -19,7 +19,7 @@ #if BUILDFLAG(IS_WIN) #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.h" 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 288de9bb58c5..db30b262ec4c 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 2024-09-30 07:45:04 UTC +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc @@ -59,7 +59,7 @@ #include "base/strings/utf_string_conversions.h" @@ -36,9 +36,9 @@ Profile* profile = Profile::FromBrowserContext(context_); device_signals::SignalsAggregator* signals_aggregator = enterprise_signals::SignalsAggregatorFactory::GetForProfile(profile); -@@ -505,7 +505,7 @@ std::string RealtimeReportingClient::GetProfileUserNam - ? safe_browsing::GetProfileEmail(identity_manager_) - : std::string(); +@@ -504,7 +504,7 @@ std::string RealtimeReportingClient::GetProfileUserNam + std::string username = + identity_manager_ ? GetProfileEmail(identity_manager_) : std::string(); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index bb9188daaa2a..ec3ba722153f 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-09-30 07:45:04 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1535,6 +1535,10 @@ source_set("extensions") { +@@ -1499,6 +1499,10 @@ source_set("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } @@ -8,6 +8,6 @@ + sources -= [ "api/image_writer_private/removable_storage_provider_linux.cc" ] + } + - if (enable_service_discovery) { - sources += [ - "api/mdns/mdns_api.cc", + if (enable_pdf) { + deps += [ + "//chrome/browser/pdf", 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 be59ec50bbcb..46666c96794e 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,6 +1,6 @@ ---- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc -@@ -43,7 +43,7 @@ +@@ -41,7 +41,7 @@ #include "pdf/buildflags.h" #include "printing/buildflags/buildflags.h" @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h" #endif -@@ -119,7 +119,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt +@@ -117,7 +117,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt extensions::SettingsPrivateEventRouterFactory::GetInstance(); extensions::SettingsOverridesAPI::GetFactoryInstance(); extensions::SidePanelService::GetFactoryInstance(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc index d121b2b10f64..86bbc48a6f98 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc -@@ -38,7 +38,7 @@ +@@ -41,7 +41,7 @@ #include "components/reporting/util/statusor.h" #endif @@ -9,7 +9,7 @@ #include <optional> #include "base/strings/string_util.h" -@@ -155,7 +155,7 @@ api::enterprise_reporting_private::ContextInfo ToConte +@@ -158,7 +158,7 @@ api::enterprise_reporting_private::ContextInfo ToConte return info; } @@ -18,7 +18,7 @@ device_signals::SignalsAggregationRequest CreateAggregationRequest( device_signals::SignalName signal_name) { -@@ -217,7 +217,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: +@@ -220,7 +220,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: // getPersistentSecret @@ -27,7 +27,7 @@ EnterpriseReportingPrivateGetPersistentSecretFunction:: EnterpriseReportingPrivateGetPersistentSecretFunction() = default; -@@ -643,7 +643,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: +@@ -646,7 +646,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: } #endif 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 2e3b1942727d..1f5f9f3af370 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-08-26 12:06:38 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -630,7 +630,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem +@@ -636,7 +636,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 adfb7b271d0e..0265dcd482cb 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-07-30 11:12:21 UTC +--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc -@@ -284,7 +284,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor +@@ -288,7 +288,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 a179b068873a..334068713fe4 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,15 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -204,7 +204,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -193,7 +193,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist + (*s_allowlist)[autofill::prefs::kAutofillPaymentCardBenefits] = + settings_api::PrefType::kBoolean; + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + (*s_allowlist)[autofill::prefs::kAutofillPredictionImprovementsEnabled] = + settings_api::PrefType::kBoolean; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +@@ -211,7 +211,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[tab_groups::prefs::kAutoPinNewTabGroups] = settings_api::PrefType::kBoolean; @@ -9,7 +18,7 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::kBoolean; #endif -@@ -216,7 +216,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -223,7 +223,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString; (*s_allowlist)[::prefs::kPinnedActions] = settings_api::PrefType::kList; (*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 4c61e61f5a4d..b2f630be9b75 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-09-30 07:45:04 UTC +--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-10-26 13:10:01 UTC +++ chrome/browser/extensions/api/tabs/tabs_api.cc -@@ -891,7 +891,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio +@@ -886,7 +886,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio // minimized. // TODO(crbug.com/40254339): Remove this workaround when linux is fixed. // TODO(crbug.com/40254339): Find a fix for wayland as well. diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc index 09cb78ab198c..b6cbe5cd1310 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -834,7 +834,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -816,7 +816,7 @@ void ExternalProviderImpl::CreateExternalProviders( if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, base::MakeRefCounted<ExternalPrefLoader>( -@@ -862,7 +862,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -844,7 +844,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. 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 0754034a9f08..ff4050efbef7 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,11 +1,11 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -321,7 +321,7 @@ const struct { +@@ -324,7 +324,7 @@ const struct { FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"), kDontBlockChildren}, #endif --#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_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // On Linux also block access to devices via /dev. {kNoBasePathKey, FILE_PATH_LITERAL("/dev"), kBlockAllChildren}, // And security sensitive data in /proc and /sys. diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index 4d6bf4de53fe..c6c12ab5f20a 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-09-30 07:45:04 UTC +--- chrome/browser/flag_descriptions.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/flag_descriptions.cc -@@ -464,7 +464,7 @@ const char kIsolatedSandboxedIframesDescription[] = +@@ -458,7 +458,7 @@ const char kIsolatedSandboxedIframesDescription[] = "grouping when enabled is per-site."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const char kAutofillEnableAmountExtractionDesktopName[] = "Enable checkout amount extraction on Chrome desktop"; const char kAutofillEnableAmountExtractionDesktopDescription[] = -@@ -909,7 +909,7 @@ const char kDevicePostureDescription[] = +@@ -939,7 +939,7 @@ const char kDevicePostureDescription[] = "Enables Device Posture API (foldable devices)"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -18,16 +18,7 @@ const char kDocumentPictureInPictureAnimateResizeName[] = "Document Picture-in-Picture Animate Resize"; const char kDocumentPictureInPictureAnimateResizeDescription[] = -@@ -3130,7 +3130,7 @@ const char kCbdTimeframeRequiredDescription[] = - "value to the list."; - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - const char kPolicyIndicationForManagedDefaultSearchName[] = - "Enable policy indication for managed Default Search provider"; - const char kPolicyIndicationForManagedDefaultSearchDescription[] = -@@ -3472,7 +3472,7 @@ const char kShowAutofillTypePredictionsDescription[] = +@@ -3519,7 +3519,7 @@ const char kShowAutofillTypePredictionsDescription[] = "text."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +27,7 @@ const char kShowFeaturedEnterpriseSiteSearchName[] = "Show featured Enterprise site search engines in Omnibox"; const char kShowFeaturedEnterpriseSiteSearchDescription[] = -@@ -3509,7 +3509,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] +@@ -3551,7 +3551,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] "but in the same SiteInstanceGroup, and thus the same process."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -45,8 +36,8 @@ const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy"; const char kSiteSearchSettingsPolicyDescription[] = "Allow site search engines to be defined by the SiteSearchSettings policy."; -@@ -7950,7 +7950,7 @@ const char kLacrosMergeIcuDataFileDescription[] = - "Enables sharing common areas of icudtl.dat between Ash and Lacros."; +@@ -7912,7 +7912,7 @@ const char kBlinkExtensionDiagnosticsDescription[] = + "Enable the experimental Diagnostics Blink Extension."; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) @@ -54,7 +45,7 @@ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -8198,7 +8198,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] +@@ -8148,7 +8148,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] // Linux ----------------------------------------------------------------------- @@ -63,7 +54,7 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -8231,6 +8231,18 @@ const char kWaylandPerWindowScalingDescription[] = +@@ -8181,6 +8181,18 @@ const char kWaylandPerWindowScalingDescription[] = const char kWaylandTextInputV3Name[] = "Wayland text-input-v3"; const char kWaylandTextInputV3Description[] = "Enable Wayland's text-input-v3 experimental support."; @@ -82,7 +73,7 @@ #endif // BUILDFLAG(IS_LINUX) // All views-based platforms -------------------------------------------------- -@@ -8257,14 +8269,14 @@ const char kZeroCopyVideoCaptureDescription[] = +@@ -8207,7 +8219,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) || \ @@ -91,15 +82,16 @@ const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // BUILDFLAG(IS_CHROMEOS) +@@ -8220,7 +8232,7 @@ const char kTaskManagerDesktopRefreshDescription[] = + "Enables a refreshed design for the Task Manager on Desktop platforms."; + #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kEnableNetworkServiceSandboxName[] = "Enable the network service sandbox."; const char kEnableNetworkServiceSandboxDescription[] = -@@ -8296,7 +8308,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -8252,7 +8264,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -108,7 +100,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -8450,7 +8462,7 @@ const char kElementCaptureDescription[] = +@@ -8398,7 +8410,7 @@ const char kElementCaptureDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -117,7 +109,7 @@ const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -8524,7 +8536,7 @@ const char kAutofillCaretExtractionDescription[] = +@@ -8472,7 +8484,7 @@ const char kAutofillCaretExtractionDescription[] = "Enables passing caret position via Autofill"; #endif // BUILDFLAG(ENABLE_COMPOSE) @@ -126,7 +118,7 @@ const char kThirdPartyProfileManagementName[] = "Third party profile management"; const char kThirdPartyProfileManagementDescription[] = -@@ -8613,7 +8625,7 @@ const char kEnableCertManagementV2UIDescription[] = +@@ -8561,7 +8573,7 @@ const char kEnableCertManagementV2UIDescription[] = "chrome://settings/certificates"; #endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 2b081f1506e7..561c21c4cad1 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,7 +1,7 @@ ---- chrome/browser/flag_descriptions.h.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/flag_descriptions.h.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/flag_descriptions.h -@@ -299,7 +299,7 @@ extern const char kImageDescriptionsAlternateRoutingNa - extern const char kImageDescriptionsAlternateRoutingDescription[]; +@@ -297,7 +297,7 @@ extern const char kImprovedSigninUIOnDesktopName[]; + extern const char kImprovedSigninUIOnDesktopDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -9,7 +9,7 @@ extern const char kAutofillEnableAmountExtractionDesktopName[]; extern const char kAutofillEnableAmountExtractionDesktopDescription[]; #endif -@@ -694,7 +694,7 @@ extern const char kDevicePostureName[]; +@@ -715,7 +715,7 @@ extern const char kDevicePostureName[]; extern const char kDevicePostureDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -18,16 +18,7 @@ extern const char kDocumentPictureInPictureAnimateResizeName[]; extern const char kDocumentPictureInPictureAnimateResizeDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || -@@ -1805,7 +1805,7 @@ extern const char kCbdTimeframeRequiredName[]; - extern const char kCbdTimeframeRequiredDescription[]; - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - extern const char kPolicyIndicationForManagedDefaultSearchName[]; - extern const char kPolicyIndicationForManagedDefaultSearchDescription[]; - #endif -@@ -2003,7 +2003,7 @@ extern const char kShowAutofillTypePredictionsName[]; +@@ -2022,7 +2022,7 @@ extern const char kShowAutofillTypePredictionsName[]; extern const char kShowAutofillTypePredictionsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +27,7 @@ extern const char kShowFeaturedEnterpriseSiteSearchName[]; extern const char kShowFeaturedEnterpriseSiteSearchDescription[]; -@@ -2025,7 +2025,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] +@@ -2044,7 +2044,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] extern const char kSiteInstanceGroupsForDataUrlsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -45,8 +36,8 @@ extern const char kSiteSearchSettingsPolicyName[]; extern const char kSiteSearchSettingsPolicyDescription[]; -@@ -4604,7 +4604,7 @@ extern const char kLacrosMergeIcuDataFileName[]; - extern const char kLacrosMergeIcuDataFileDescription[]; +@@ -4576,7 +4576,7 @@ extern const char kBlinkExtensionDiagnosticsName[]; + extern const char kBlinkExtensionDiagnosticsDescription[]; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) @@ -54,7 +45,7 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4750,7 +4750,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip +@@ -4713,7 +4713,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip // Linux --------------------------------------------------------------------- @@ -63,7 +54,7 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4772,6 +4772,9 @@ extern const char kWaylandPerWindowScalingDescription[ +@@ -4735,6 +4735,9 @@ extern const char kWaylandPerWindowScalingDescription[ extern const char kWaylandTextInputV3Name[]; extern const char kWaylandTextInputV3Description[]; @@ -73,7 +64,7 @@ #endif // BUILDFLAG(IS_LINUX) // All views-based platforms -------------------------------------------------- -@@ -4801,7 +4804,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4764,7 +4767,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -82,7 +73,7 @@ extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -4820,13 +4823,13 @@ extern const char kScreenlockReauthPromoCardDescriptio +@@ -4780,7 +4783,7 @@ extern const char kScreenlockReauthPromoCardDescriptio #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -91,14 +82,16 @@ extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // BUILDFLAG(IS_CHROMEOS) +@@ -4791,7 +4794,7 @@ extern const char kTaskManagerDesktopRefreshName[]; + extern const char kTaskManagerDesktopRefreshDescription[]; + #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kEnableNetworkServiceSandboxName[]; extern const char kEnableNetworkServiceSandboxDescription[]; -@@ -4925,7 +4928,7 @@ extern const char kElementCaptureDescription[]; +@@ -4888,7 +4891,7 @@ extern const char kElementCaptureDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -107,7 +100,7 @@ extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; #endif -@@ -4979,7 +4982,7 @@ extern const char kAutofillCaretExtractionName[]; +@@ -4942,7 +4945,7 @@ extern const char kAutofillCaretExtractionName[]; extern const char kAutofillCaretExtractionDescription[]; #endif // BUILDFLAG(ENABLE_COMPOSE) @@ -116,7 +109,7 @@ extern const char kThirdPartyProfileManagementName[]; extern const char kThirdPartyProfileManagementDescription[]; -@@ -5035,7 +5038,7 @@ extern const char kEnableCertManagementV2UIName[]; +@@ -4998,7 +5001,7 @@ extern const char kEnableCertManagementV2UIName[]; extern const char kEnableCertManagementV2UIDescription[]; #endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) diff --git a/www/chromium/files/patch-chrome_browser_memory__details.cc b/www/chromium/files/patch-chrome_browser_memory__details.cc index c7ed75864c01..508f3c026fdd 100644 --- a/www/chromium/files/patch-chrome_browser_memory__details.cc +++ b/www/chromium/files/patch-chrome_browser_memory__details.cc @@ -1,4 +1,4 @@ ---- chrome/browser/memory_details.cc.orig 2024-06-17 12:56:06 UTC +--- chrome/browser/memory_details.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/memory_details.cc @@ -38,7 +38,7 @@ #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h" @@ -9,7 +9,7 @@ #include "content/public/browser/zygote_host/zygote_host_linux.h" #endif -@@ -334,7 +334,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { +@@ -335,7 +335,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { }); } 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 43838f2980ea..bc1975b75f1c 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-08-26 12:06:38 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -196,11 +196,11 @@ +@@ -195,11 +195,11 @@ #include "chrome/notification_helper/notification_helper_constants.h" #endif @@ -59,7 +59,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || -@@ -950,7 +950,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -951,7 +951,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -68,7 +68,7 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1137,7 +1137,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1138,7 +1138,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ @@ -77,7 +77,7 @@ // This creates the DesktopProfileSessionDurationsServices if it didn't exist // already. metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext( -@@ -1471,7 +1471,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri +@@ -1472,7 +1472,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri recorder = base::MakeRefCounted<metrics::structured::AshStructuredMetricsRecorder>( cros_system_profile_provider_.get()); diff --git a/www/chromium/files/patch-chrome_browser_net_profile__network__context__service.cc b/www/chromium/files/patch-chrome_browser_net_profile__network__context__service.cc index fa621ee8d692..8a011460e340 100644 --- a/www/chromium/files/patch-chrome_browser_net_profile__network__context__service.cc +++ b/www/chromium/files/patch-chrome_browser_net_profile__network__context__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/profile_network_context_service.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/net/profile_network_context_service.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/net/profile_network_context_service.cc -@@ -138,7 +138,7 @@ +@@ -140,7 +140,7 @@ #include "chromeos/startup/browser_params_proxy.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h" #include "components/enterprise/client_certificates/core/client_certificates_service.h" -@@ -258,7 +258,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet +@@ -260,7 +260,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet }); } @@ -18,7 +18,7 @@ std::unique_ptr<net::ClientCertStore> GetWrappedCertStore( Profile* profile, std::unique_ptr<net::ClientCertStore> platform_store) { -@@ -975,7 +975,7 @@ ProfileNetworkContextService::CreateClientCertStore() +@@ -986,7 +986,7 @@ ProfileNetworkContextService::CreateClientCertStore() store = std::make_unique<ClientCertStoreLacros>( std::move(certificate_provider), cert_db_initializer, std::move(store)); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) 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 4b9a6883be4d..82bbec961129 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,6 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -101,7 +101,7 @@ +@@ -102,7 +102,7 @@ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ #include "chrome/common/chrome_paths_internal.h" #include "chrome/grit/branded_strings.h" #include "ui/base/l10n/l10n_util.h" -@@ -145,7 +145,7 @@ SystemNetworkContextManager* g_system_network_context_ +@@ -146,7 +146,7 @@ SystemNetworkContextManager* g_system_network_context_ // received a failed launch for a sandboxed network service. bool g_previously_failed_to_launch_sandboxed_service = false; @@ -18,7 +18,7 @@ // Whether kerberos library loading will work in the network service due to the // sandbox. bool g_network_service_will_allow_gssapi_library_load = false; -@@ -153,7 +153,7 @@ bool g_network_service_will_allow_gssapi_library_load +@@ -154,7 +154,7 @@ bool g_network_service_will_allow_gssapi_library_load const char* kGssapiDesiredPref = #if BUILDFLAG(IS_CHROMEOS) prefs::kKerberosEnabled; @@ -27,7 +27,7 @@ prefs::kReceivedHttpAuthNegotiateHeader; #endif #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -199,7 +199,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -200,7 +200,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -36,7 +36,7 @@ auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -214,7 +214,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -215,7 +215,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut local_state->GetString(prefs::kAuthAndroidNegotiateAccountType); #endif // BUILDFLAG(IS_ANDROID) @@ -45,7 +45,7 @@ auth_dynamic_params->allow_gssapi_library_load = local_state->GetBoolean(kGssapiDesiredPref); #endif // BUILDFLAG(IS_CHROMEOS) -@@ -224,7 +224,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -225,7 +225,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut void OnNewHttpAuthDynamicParams( network::mojom::HttpAuthDynamicParamsPtr& params) { @@ -54,7 +54,7 @@ // The kerberos library is incompatible with the network service sandbox, so // if library loading is now enabled, the network service needs to be // restarted. It will be restarted unsandboxed because is -@@ -266,11 +266,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -267,11 +267,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() if (g_previously_failed_to_launch_sandboxed_service) { return NetworkSandboxState::kDisabledBecauseOfFailedLaunch; } @@ -68,7 +68,7 @@ // The network service sandbox and the kerberos library are incompatible. // If kerberos is enabled by policy, disable the network service sandbox. if (g_network_service_will_allow_gssapi_library_load || -@@ -286,7 +286,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -287,7 +287,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() } #endif // BUILDFLAG(IS_WIN) @@ -77,7 +77,7 @@ if (local_state && local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) { return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled) -@@ -516,7 +516,7 @@ void SystemNetworkContextManager::DeleteInstance() { +@@ -517,7 +517,7 @@ void SystemNetworkContextManager::DeleteInstance() { g_system_network_context_manager = nullptr; } @@ -86,7 +86,7 @@ SystemNetworkContextManager::GssapiLibraryLoadObserver:: GssapiLibraryLoadObserver(SystemNetworkContextManager* owner) : owner_(owner) {} -@@ -574,7 +574,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -575,7 +575,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -95,7 +95,7 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -588,7 +588,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -589,7 +589,7 @@ SystemNetworkContextManager::SystemNetworkContextManag auth_pref_callback); #endif // BUILDFLAG(IS_ANDROID) @@ -104,7 +104,7 @@ pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -658,7 +658,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -660,7 +660,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -113,7 +113,7 @@ registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -683,11 +683,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -685,11 +685,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts); @@ -127,7 +127,7 @@ registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false); #endif // BUILDFLAG(IS_LINUX) -@@ -740,7 +740,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -742,7 +742,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea OnNewHttpAuthDynamicParams(http_auth_dynamic_params); network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params)); @@ -136,7 +136,7 @@ gssapi_library_loader_observer_.Install(network_service); #endif // BUILDFLAG(IS_LINUX) -@@ -955,7 +955,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab +@@ -969,7 +969,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab break; } 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 160365aa556c..58d1b2cf4328 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-08-26 12:06:38 UTC +--- chrome/browser/net/system_network_context_manager.h.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/net/system_network_context_manager.h -@@ -197,7 +197,7 @@ class SystemNetworkContextManager { +@@ -198,7 +198,7 @@ class SystemNetworkContextManager { class URLLoaderFactoryForSystem; class NetworkProcessLaunchWatcher; @@ -9,7 +9,7 @@ class GssapiLibraryLoadObserver : public network::mojom::GssapiLibraryLoadObserver { public: -@@ -278,7 +278,7 @@ class SystemNetworkContextManager { +@@ -279,7 +279,7 @@ class SystemNetworkContextManager { std::unique_ptr<NetworkAnnotationMonitor> network_annotation_monitor_; #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc b/www/chromium/files/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc index c131229a2cec..4dfcc2a53c13 100644 --- a/www/chromium/files/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc +++ b/www/chromium/files/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc.orig 2024-05-21 18:07:39 UTC +--- chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc -@@ -32,7 +32,7 @@ +@@ -34,7 +34,7 @@ #include "services/network/public/cpp/resource_request.h" namespace { diff --git a/www/chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc b/www/chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc index 54e23342a15a..48644913ca0d 100644 --- a/www/chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc +++ b/www/chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/new_tab_page/new_tab_page_util.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/new_tab_page/new_tab_page_util.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/new_tab_page/new_tab_page_util.cc -@@ -24,7 +24,7 @@ bool IsOsSupportedForCart() { +@@ -25,7 +25,7 @@ bool IsOsSupportedForCart() { } bool IsOsSupportedForDrive() { 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 da92fce1b572..bdcec2a9c38e 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,15 +1,15 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -557,7 +557,7 @@ void ChromePasswordManagerClient:: - +@@ -590,7 +590,7 @@ void ChromePasswordManagerClient:: bool ChromePasswordManagerClient::IsReauthBeforeFillingRequired( 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 BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) { return false; } -@@ -795,7 +795,7 @@ void ChromePasswordManagerClient::NotifyUserCredential +@@ -828,7 +828,7 @@ void ChromePasswordManagerClient::NotifyUserCredential } void ChromePasswordManagerClient::NotifyKeychainError() { 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 e88c1b8b49dd..829796fd3fe0 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-09-30 07:45:04 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -245,19 +245,19 @@ +@@ -247,19 +247,19 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -23,7 +23,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_ANDROID) -@@ -271,13 +271,13 @@ +@@ -273,13 +273,13 @@ #endif // BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,10 +36,10 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "components/search_engines/site_search_policy_handler.h" + #include "components/search_engines/enterprise/site_search_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) -@@ -554,7 +554,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -559,7 +559,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { key::kDefaultDirectSocketsSetting, prefs::kManagedDefaultDirectSocketsSetting, base::Value::Type::INTEGER }, @@ -48,7 +48,7 @@ { key::kDeletingUndecryptablePasswordsEnabled, password_manager::prefs::kDeletingUndecryptablePasswordsEnabled, base::Value::Type::BOOLEAN }, -@@ -896,7 +896,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -901,7 +901,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -57,7 +57,7 @@ { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, -@@ -905,7 +905,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -910,7 +910,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -66,8 +66,8 @@ { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1730,7 +1730,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::LIST }, +@@ -1738,7 +1738,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::INTEGER}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) @@ -75,7 +75,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1787,7 +1787,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1797,7 +1797,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -84,7 +84,7 @@ { key::kNetworkServiceSandboxEnabled, prefs::kNetworkServiceSandboxEnabled, base::Value::Type::BOOLEAN }, -@@ -1813,12 +1813,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1823,12 +1823,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -99,7 +99,7 @@ { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, -@@ -1826,7 +1826,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1836,7 +1836,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kProfileSeparationDomainExceptionList, base::Value::Type::LIST }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -108,7 +108,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1838,7 +1838,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1848,7 +1848,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ @@ -117,7 +117,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1939,7 +1939,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1949,7 +1949,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -126,7 +126,7 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -2053,7 +2053,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2066,7 +2066,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::LIST }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -135,7 +135,7 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -2132,7 +2132,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2145,7 +2145,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -144,7 +144,7 @@ { key::kTabDiscardingExceptions, performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions, base::Value::Type::LIST }, -@@ -2161,7 +2161,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2174,7 +2174,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kUiAutomationProviderEnabled, base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -153,7 +153,7 @@ { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -2204,7 +2204,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2217,7 +2217,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::INTEGER }, #endif #if BUILDFLAG(ENABLE_EXTENSIONS) @@ -162,7 +162,7 @@ { key::kExtensionInstallTypeBlocklist, extensions::pref_names::kExtensionInstallTypeBlocklist, base::Value::Type::LIST}, -@@ -2227,7 +2227,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2240,7 +2240,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { key::kTabCompareSettings, optimization_guide::prefs::kProductSpecificationsEnterprisePolicyAllowed, base::Value::Type::INTEGER}, @@ -171,7 +171,7 @@ { key::kChromeForTestingAllowed, prefs::kChromeForTestingAllowed, base::Value::Type::BOOLEAN }, -@@ -2365,7 +2365,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2378,7 +2378,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // Policies for all platforms - End #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -180,7 +180,7 @@ handlers->AddHandler(std::make_unique<IntRangePolicyHandler>( key::kMemorySaverModeSavings, performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness, -@@ -2381,7 +2381,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2394,7 +2394,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -189,7 +189,7 @@ handlers->AddHandler( std::make_unique<SiteSearchPolicyHandler>(chrome_schema)); -@@ -2594,7 +2594,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2607,7 +2607,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -198,7 +198,7 @@ handlers->AddHandler( std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); handlers->AddHandler( -@@ -2647,7 +2647,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2660,7 +2660,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -207,7 +207,7 @@ handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); handlers->AddHandler( -@@ -2732,7 +2732,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2745,7 +2745,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) || \ @@ -216,7 +216,7 @@ signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>( key::kForceBrowserSignin, prefs::kForceBrowserSignin, base::Value::Type::BOOLEAN)); -@@ -3101,7 +3101,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3116,7 +3116,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -225,7 +225,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -3109,7 +3109,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3124,7 +3124,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -234,7 +234,7 @@ handlers->AddHandler(std::make_unique<SimplePolicyHandler>( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -3127,7 +3127,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3142,7 +3142,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH first_party_sets::FirstPartySetsOverridesPolicyHandler>( key::kRelatedWebsiteSetsOverrides, chrome_schema))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -243,7 +243,7 @@ handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -@@ -3150,7 +3150,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3165,7 +3165,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH base::Value::Type::BOOLEAN))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -252,3 +252,12 @@ handlers->AddHandler(std::make_unique<BatterySaverPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -3189,7 +3189,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + std::vector<GenAiDefaultSettingsPolicyHandler::GenAiPolicyDetails> + gen_ai_default_policies; + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + gen_ai_default_policies.emplace_back( + key::kHelpMeWriteSettings, + optimization_guide::prefs::kComposeEnterprisePolicyAllowed); 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 ba0513c03414..dd780031463c 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-09-30 07:45:04 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -308,7 +308,7 @@ +@@ -313,7 +313,7 @@ #include "components/user_notes/user_notes_prefs.h" #endif // BUILDFLAG(IS_ANDROID) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" #endif -@@ -488,18 +488,18 @@ +@@ -491,18 +491,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -31,7 +31,7 @@ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -534,7 +534,7 @@ +@@ -537,7 +537,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -40,8 +40,8 @@ #include "ui/color/system_theme.h" #endif -@@ -1595,7 +1595,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) - registry->RegisterIntegerPref(prefs::kLastWhatsNewVersion, 0); +@@ -1678,7 +1678,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) + on_device_translation::RegisterLocalStatePrefs(registry); #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -49,7 +49,7 @@ WhatsNewUI::RegisterLocalStatePrefs(registry); #endif -@@ -1772,7 +1772,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1854,7 +1854,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // BUILDFLAG(ENABLE_PDF) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -58,7 +58,7 @@ registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true); #endif -@@ -2129,12 +2129,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -2213,12 +2213,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 41f9f22c5b07..065ab481f40e 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-09-30 07:45:04 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -196,7 +196,7 @@ const char* const kPersistentPrefNames[] = { +@@ -198,7 +198,7 @@ const char* const kPersistentPrefNames[] = { prefs::kShowFullscreenToolbar, #endif 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 c93a17202a61..13102dc5b58f 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-09-30 07:45:04 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -341,7 +341,7 @@ +@@ -347,7 +347,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 -@@ -427,18 +427,18 @@ +@@ -440,18 +440,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -31,7 +31,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h" #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" #include "chrome/browser/enterprise/client_certificates/certificate_store_factory.h" -@@ -679,7 +679,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -706,7 +706,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(); -@@ -814,7 +814,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -839,7 +839,7 @@ void ChromeBrowserMainExtraPartsProfiles:: enterprise_connectors::ConnectorsServiceFactory::GetInstance(); #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -49,7 +49,7 @@ enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance(); enterprise_connectors::DeviceTrustServiceFactory::GetInstance(); #endif -@@ -822,25 +822,25 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -847,25 +847,25 @@ void ChromeBrowserMainExtraPartsProfiles:: enterprise_connectors::ExtensionInstallEventRouterFactory::GetInstance(); enterprise_connectors::ExtensionTelemetryEventRouterFactory::GetInstance(); #endif @@ -80,7 +80,7 @@ enterprise_signin::EnterpriseSigninServiceFactory::GetInstance(); #endif #if BUILDFLAG(ENABLE_SESSION_SERVICE) -@@ -972,7 +972,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -995,7 +995,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -89,7 +89,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif -@@ -1077,7 +1077,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1100,7 +1100,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_CHROMEOS) policy::PolicyCertServiceFactory::GetInstance(); #endif @@ -98,7 +98,7 @@ policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); policy::UserPolicyOidcSigninServiceFactory::GetInstance(); #endif -@@ -1122,7 +1122,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1149,7 +1149,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID) ProfileStatisticsFactory::GetInstance(); #endif @@ -107,7 +107,7 @@ ProfileTokenWebSigninInterceptorFactory::GetInstance(); OidcAuthenticationSigninInterceptorFactory::GetInstance(); #endif -@@ -1138,7 +1138,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1168,7 +1168,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 013be33f51c1..826b9afe98e6 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_impl.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -266,6 +266,10 @@ +@@ -267,6 +267,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #endif @@ -11,7 +11,7 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -600,7 +604,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async +@@ -603,7 +607,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() -@@ -903,7 +907,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -908,7 +912,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { 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 index 7243adb755b7..67fa1a37a16a 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/screen_ai/screen_ai_service_router.cc -@@ -297,7 +297,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { +@@ -324,7 +324,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}; @@ -9,7 +9,7 @@ std::vector<std::string> extra_switches = { base::StringPrintf("--%s=%s", screen_ai::GetBinaryPathSwitch(), binary_path.MaybeAsASCII().c_str())}; -@@ -311,7 +311,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { +@@ -338,7 +338,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { .WithPreloadedLibraries( preload_libraries, content::ServiceProcessHostPreloadLibraries::GetPassKey()) diff --git a/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc b/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc index 4dd261f58f03..a575213189ed 100644 --- a/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc +++ b/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sessions/session_restore.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/sessions/session_restore.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/sessions/session_restore.cc -@@ -99,7 +99,7 @@ +@@ -103,7 +103,7 @@ #include "chrome/browser/web_applications/web_app_registrar.h" #endif // BUILDFLAG(IS_CHROMEOS) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -1051,7 +1051,7 @@ class SessionRestoreImpl : public BrowserListObserver +@@ -1076,7 +1076,7 @@ class SessionRestoreImpl : public BrowserListObserver bool is_first_tab = true; for (const auto& startup_tab : startup_tabs) { const GURL& url = startup_tab.url; diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc index 2296abe76f59..b93dcb83d0bd 100644 --- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc +++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_browser_utils.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/supervised_user/supervised_user_browser_utils.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/supervised_user/supervised_user_browser_utils.cc -@@ -40,7 +40,7 @@ +@@ -42,7 +42,7 @@ #include "components/user_manager/user_type.h" #elif BUILDFLAG(IS_CHROMEOS_LACROS) #include "chromeos/startup/browser_params_proxy.h" @@ -9,8 +9,8 @@ #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h" #include "chrome/browser/supervised_user/supervised_user_verification_page.h" #endif -@@ -178,7 +178,7 @@ bool IsAuthenticatedSupervisedProfile(Profile* profile - supervised_user::ChildAccountService::AuthState::AUTHENTICATED; +@@ -165,7 +165,7 @@ void AssertChildStatusOfTheUser(Profile* profile, bool + #endif } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h index 60c6cfec4960..f7c24935bb1a 100644 --- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h +++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h @@ -1,4 +1,4 @@ ---- chrome/browser/supervised_user/supervised_user_browser_utils.h.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/supervised_user/supervised_user_browser_utils.h.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/supervised_user/supervised_user_browser_utils.h @@ -11,7 +11,7 @@ #include "content/public/browser/web_contents.h" @@ -9,9 +9,9 @@ #include "chrome/browser/supervised_user/supervised_user_verification_page.h" #endif -@@ -59,7 +59,7 @@ void AssertChildStatusOfTheUser(Profile* profile, bool - // content area. - bool IsAuthenticatedSupervisedProfile(Profile* profile); +@@ -55,7 +55,7 @@ std::string GetAccountGivenName(Profile& profile); + // of the user. + void AssertChildStatusOfTheUser(Profile* profile, bool is_child); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc index 9b28b6d7059f..f5c3c67451a1 100644 --- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc +++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc -@@ -26,7 +26,7 @@ +@@ -29,7 +29,7 @@ #if BUILDFLAG(IS_ANDROID) #include "chrome/browser/supervised_user/child_accounts/child_account_service_android.h" @@ -9,7 +9,7 @@ #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h" #include "chrome/browser/supervised_user/supervised_user_verification_page.h" #endif -@@ -140,7 +140,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc +@@ -145,7 +145,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc return content::NavigationThrottle::DEFER; } diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc index 7fcacdd999e9..29c21184297c 100644 --- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc +++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc @@ -1,11 +1,20 @@ ---- chrome/browser/supervised_user/supervised_user_navigation_throttle.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/supervised_user/supervised_user_navigation_throttle.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/supervised_user/supervised_user_navigation_throttle.cc -@@ -212,7 +212,7 @@ void SupervisedUserNavigationThrottle::OnInterstitialR +@@ -201,7 +201,7 @@ void SupervisedUserNavigationThrottle::OnCheckDone( + } + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + SupervisedUserVerificationPage::VerificationPurpose + GetVerificationPurposeFromFilteringReason( + supervised_user::FilteringBehaviorReason reason) { +@@ -235,7 +235,7 @@ void SupervisedUserNavigationThrottle::OnInterstitialR Profile* profile = Profile::FromBrowserContext( navigation_handle()->GetWebContents()->GetBrowserContext()); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + supervised_user::ChildAccountService* child_account_service = + ChildAccountServiceFactory::GetForProfile(profile); if (base::FeatureList::IsEnabled( - supervised_user:: - kForceSupervisedUserReauthenticationForBlockedSites) && 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 deleted file mode 100644 index a5d585033772..000000000000 --- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ /dev/null @@ -1,47 +0,0 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2024-09-30 07:45:04 UTC -+++ chrome/browser/sync/chrome_sync_client.cc -@@ -119,7 +119,7 @@ - #endif // BUILDFLAG(ENABLE_SPELLCHECK) - - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - #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" - #elif BUILDFLAG(IS_ANDROID) -@@ -233,7 +233,7 @@ bool ShouldSyncAppsTypesInTransportMode() { - syncer::DataTypeControllerDelegate* GetSavedTabGroupControllerDelegate( - Profile* profile) { - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - auto* keyed_service = - tab_groups::SavedTabGroupServiceFactory::GetForProfile(profile); - CHECK(keyed_service); -@@ -251,7 +251,7 @@ syncer::DataTypeControllerDelegate* GetSavedTabGroupCo - syncer::DataTypeControllerDelegate* GetSharedTabGroupControllerDelegate( - Profile* profile) { - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - tab_groups::SavedTabGroupKeyedService* keyed_service = - tab_groups::SavedTabGroupServiceFactory::GetForProfile(profile); - CHECK(keyed_service); -@@ -544,7 +544,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy - // platforms. - bool enable_tab_group_sync = false; - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - enable_tab_group_sync = true; - #elif BUILDFLAG(IS_ANDROID) - enable_tab_group_sync = -@@ -585,7 +585,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. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // Dictionary sync is enabled by default. - if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { - controllers.push_back( diff --git a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__controller__builder.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__controller__builder.cc new file mode 100644 index 000000000000..f76f3c85a3d0 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__controller__builder.cc @@ -0,0 +1,11 @@ +--- chrome/browser/sync/chrome_sync_controller_builder.cc.orig 2024-10-22 08:31:56 UTC ++++ chrome/browser/sync/chrome_sync_controller_builder.cc +@@ -324,7 +324,7 @@ ChromeSyncControllerBuilder::Build(syncer::SyncService + #if BUILDFLAG(ENABLE_SPELLCHECK) + // Chrome prefers OS provided spell checkers where they exist. So only sync + // the custom dictionary on platforms that typically don't provide one. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // Dictionary sync is enabled by default. + if (spellcheck_service_.value()) { + controllers.push_back( 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 dc0af312d760..f2df83cee4b9 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,24 +1,33 @@ ---- chrome/browser/sync/sync_service_factory.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/sync/sync_service_factory.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/sync/sync_service_factory.cc -@@ -85,7 +85,7 @@ +@@ -105,7 +105,7 @@ #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #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" - #elif BUILDFLAG(IS_ANDROID) - #include "chrome/browser/tab_group_sync/tab_group_sync_service_factory.h" -@@ -134,7 +134,7 @@ std::unique_ptr<KeyedService> BuildSyncService( - // TODO(crbug.com/40118868): Reassess whether the following block needs to be - // included in lacros-chrome once build flag switch of lacros-chrome is - // complete. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h" +@@ -153,7 +153,7 @@ syncer::DataTypeSet GetDisabledCommonDataTypes() { + tab_groups::TabGroupSyncService* GetTabGroupSyncService(Profile* profile) { + CHECK(profile); + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + tab_groups::TabGroupSyncService* service = + tab_groups::SavedTabGroupUtils::GetServiceForProfile(profile); + CHECK(service); +@@ -381,7 +381,7 @@ std::unique_ptr<KeyedService> BuildSyncService( + // included in lacros-chrome once build flag switch of lacros-chrome is + // complete. + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) syncer::SyncPrefs prefs(profile->GetPrefs()); local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); -@@ -276,7 +276,7 @@ SyncServiceFactory::SyncServiceFactory() + base::UmaHistogramBoolean("Sync.Local.Enabled2", local_sync_backend_enabled); +@@ -517,7 +517,7 @@ SyncServiceFactory::SyncServiceFactory() DependsOn(ProfilePasswordStoreFactory::GetInstance()); DependsOn(PowerBookmarkServiceFactory::GetInstance()); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc b/www/chromium/files/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc index 17190b1be351..a939a693bb69 100644 --- a/www/chromium/files/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc @@ -1,11 +1,20 @@ ---- chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc.orig 2024-08-26 12:06:38 UTC +--- chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc +@@ -30,7 +30,7 @@ + #include "components/sync_device_info/device_info_sync_service.h" + + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/tabs/saved_tab_groups/tab_group_sync_delegate_desktop.h" + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || + // BUILDFLAG(IS_WIN) @@ -110,7 +110,7 @@ TabGroupSyncServiceFactory::BuildServiceInstanceForBro std::unique_ptr<TabGroupSyncDelegate> delegate; #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - delegate = - std::make_unique<TabGroupSyncDelegateDesktop>(service.get(), profile); - #else + if (tab_groups::IsTabGroupSyncServiceDesktopMigrationEnabled()) { + delegate = + std::make_unique<TabGroupSyncDelegateDesktop>(service.get(), profile); diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__service.cc b/www/chromium/files/patch-chrome_browser_themes_theme__service.cc index 2526330316ba..231b53cf9c8f 100644 --- a/www/chromium/files/patch-chrome_browser_themes_theme__service.cc +++ b/www/chromium/files/patch-chrome_browser_themes_theme__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/themes/theme_service.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/themes/theme_service.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/themes/theme_service.cc @@ -70,7 +70,7 @@ #include "extensions/browser/extension_registry_observer.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #include "ui/ozone/public/ozone_platform.h" // nogncheck #endif -@@ -327,7 +327,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() +@@ -328,7 +328,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() } bool ThemeService::ShouldUseCustomFrame() const { 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 ed7050fa5eb5..e9c3f3d9759d 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-09-30 07:45:04 UTC +--- chrome/browser/ui/actions/chrome_action_id.h.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/actions/chrome_action_id.h -@@ -512,7 +512,7 @@ +@@ -511,7 +511,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 index 9899230c696b..d8b40c1169c7 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc -@@ -46,7 +46,7 @@ gfx::Rect GetPopupSizeForVcn3ds() { +@@ -48,7 +48,7 @@ gfx::Rect GetPopupSizeForVcn3ds() { DesktopPaymentsWindowManager::DesktopPaymentsWindowManager( ContentAutofillClient* client) : client_(CHECK_DEREF(client)) { @@ -9,7 +9,7 @@ scoped_observation_.Observe(BrowserList::GetInstance()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) } -@@ -106,7 +106,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye +@@ -108,7 +108,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye } } diff --git a/www/chromium/files/patch-chrome_browser_ui_browser.h b/www/chromium/files/patch-chrome_browser_ui_browser.h index caecf8a1e3d5..5fad31246aa2 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser.h +++ b/www/chromium/files/patch-chrome_browser_ui_browser.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser.h.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/browser.h.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/browser.h -@@ -297,7 +297,7 @@ class Browser : public TabStripModelObserver, +@@ -299,7 +299,7 @@ class Browser : public TabStripModelObserver, std::optional<int64_t> display_id; #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index 2edcbae69fad..480db67e2275 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -130,7 +130,7 @@ +@@ -129,7 +129,7 @@ #include "components/user_manager/user_manager.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/text_input_flags.h" #include "ui/linux/linux_ui.h" #endif -@@ -139,7 +139,7 @@ +@@ -138,7 +138,7 @@ #include "ui/ozone/public/ozone_platform.h" #endif @@ -18,7 +18,7 @@ #include "chrome/browser/ui/shortcuts/desktop_shortcuts_utils.h" #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -@@ -316,7 +316,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -319,7 +319,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } @@ -27,7 +27,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. auto* linux_ui = ui::LinuxUi::instance(); -@@ -571,7 +571,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -574,7 +574,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +36,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -583,7 +583,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -586,7 +586,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -45,7 +45,7 @@ case IDC_USE_SYSTEM_TITLE_BAR: { PrefService* prefs = profile()->GetPrefs(); prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -777,7 +777,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -787,7 +787,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; case IDC_CREATE_SHORTCUT: base::RecordAction(base::UserMetricsAction("CreateShortcut")); @@ -54,7 +54,7 @@ if (base::FeatureList::IsEnabled(features::kShortcutsNotApps)) { chrome::CreateDesktopShortcutForActiveWebContents(browser_); } else { -@@ -1280,12 +1280,12 @@ void BrowserCommandController::InitCommandState() { +@@ -1265,12 +1265,12 @@ void BrowserCommandController::InitCommandState() { #endif // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -69,7 +69,7 @@ bool use_system_title_bar = true; #if BUILDFLAG(IS_OZONE) use_system_title_bar = ui::OzonePlatform::GetInstance() -@@ -1600,7 +1600,7 @@ void BrowserCommandController::UpdateCommandsForTabSta +@@ -1601,7 +1601,7 @@ void BrowserCommandController::UpdateCommandsForTabSta bool can_create_web_app = web_app::CanCreateWebApp(browser_); command_updater_.UpdateCommandEnabled(IDC_INSTALL_PWA, can_create_web_app); diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc b/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc index 216910399e61..f047cf3d1c12 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_commands.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/browser_commands.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/browser_commands.cc -@@ -2023,7 +2023,7 @@ void OpenUpdateChromeDialog(Browser* browser) { +@@ -2036,7 +2036,7 @@ void OpenUpdateChromeDialog(Browser* browser) { } else if (UpgradeDetector::GetInstance()->is_outdated_install_no_au()) { UpgradeDetector::GetInstance()->NotifyOutdatedInstallNoAutoUpdate(); } else { diff --git a/www/chromium/files/patch-chrome_browser_ui_managed__ui.cc b/www/chromium/files/patch-chrome_browser_ui_managed__ui.cc index 4b9f2d6ede3c..4bc1e0f7642b 100644 --- a/www/chromium/files/patch-chrome_browser_ui_managed__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_managed__ui.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/managed_ui.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/managed_ui.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/managed_ui.cc @@ -435,7 +435,7 @@ std::optional<std::string> GetDeviceManagerIdentity() g_browser_process->platform_part()->browser_policy_connector_ash(); @@ -7,9 +7,9 @@ -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::string custom_management_label = - g_browser_process->local_state()->GetString( - prefs::kEnterpriseCustomLabel); -@@ -467,7 +467,7 @@ std::optional<std::string> GetAccountManagerIdentity(P + g_browser_process->local_state() + ? g_browser_process->local_state()->GetString( +@@ -469,7 +469,7 @@ std::optional<std::string> GetAccountManagerIdentity(P policy::EnterpriseManagementAuthority::CLOUD)) return std::nullopt; 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 b3f6dee0b814..593b127d3af5 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,6 +1,6 @@ ---- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc -@@ -100,7 +100,7 @@ namespace { +@@ -93,7 +93,7 @@ namespace { using Logger = autofill::SavePasswordProgressLogger; @@ -9,7 +9,7 @@ // Should be kept in sync with constant declared in // bubble_controllers/relaunch_chrome_bubble_controller.cc. constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3; -@@ -528,7 +528,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor +@@ -513,7 +513,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor } void ManagePasswordsUIController::OnKeychainError() { 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 8c230ef81ba3..d17350fe59ce 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-09-30 07:45:04 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc @@ -138,7 +138,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" -@@ -967,7 +967,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -963,7 +963,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())) { -@@ -1084,7 +1084,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1080,7 +1080,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) && -@@ -1303,7 +1303,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1295,7 +1295,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_startup_startup__browser__creator__impl.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc index 38429e348b9a..cc00106956ff 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -86,7 +86,7 @@ +@@ -85,7 +85,7 @@ #include "chromeos/startup/browser_params_proxy.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -237,7 +237,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( +@@ -225,7 +225,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( // at the state of the MessageLoop. Browser::CreateParams params = Browser::CreateParams(profile_, false); params.creation_source = Browser::CreationSource::kStartupCreator; @@ -18,7 +18,7 @@ params.startup_id = command_line_->GetSwitchValueASCII("desktop-startup-id"); #endif -@@ -267,7 +267,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( +@@ -255,7 +255,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( continue; } 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 77a8a4d90cb6..b62a8a1e38fc 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-09-30 07:45:04 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -240,7 +240,7 @@ +@@ -241,7 +241,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" -@@ -712,12 +712,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -719,12 +719,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con // TODO(crbug.com/40118868): 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 1b711a90af66..297042af3529 100644 --- a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc +++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/ui_features.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/ui_features.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/ui_features.cc @@ -103,7 +103,7 @@ BASE_FEATURE(kAccessCodeCastUI, base::FEATURE_ENABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ // Enables the feature to remove the last confirmation dialog when relaunching // to update Chrome. BASE_FEATURE(kFewerUpdateConfirmations, -@@ -391,7 +391,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, +@@ -395,7 +395,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, "TopChromeWebUIUsesSpareRenderer", base::FEATURE_ENABLED_BY_DEFAULT); @@ -18,7 +18,7 @@ // Enables alternate update-related text to be displayed in browser app menu // button, menu item and confirmation dialog. BASE_FEATURE(kUpdateTextOptions, -@@ -469,7 +469,7 @@ BASE_FEATURE(kStopLoadingAnimationForHiddenWindow, +@@ -467,7 +467,7 @@ BASE_FEATURE(kStopLoadingAnimationForHiddenWindow, "StopLoadingAnimationForHiddenWindow", 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 7f5db7c0c1fd..cd34096201e1 100644 --- a/www/chromium/files/patch-chrome_browser_ui_ui__features.h +++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/ui_features.h.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/ui_features.h.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/ui_features.h @@ -78,7 +78,7 @@ bool IsExtensionMenuInRootAppMenu(); BASE_DECLARE_FEATURE(kAccessCodeCastUI); @@ -9,7 +9,7 @@ BASE_DECLARE_FEATURE(kFewerUpdateConfirmations); #endif -@@ -256,7 +256,7 @@ bool IsToolbarPinningEnabled(); +@@ -258,7 +258,7 @@ bool IsToolbarPinningEnabled(); BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc index f25c607967a0..5b632b9b72e1 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc -@@ -38,7 +38,7 @@ +@@ -39,7 +39,7 @@ #include "ui/wm/core/wm_state.h" #endif // defined(USE_AURA) @@ -9,7 +9,7 @@ #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -@@ -131,7 +131,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -132,7 +132,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( return controller; })); 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 bb78f32d9353..4176e0a0e463 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-09-30 07:45:04 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2317,7 +2317,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2346,7 +2346,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra // CrOS cleanup is done. // TODO(crbug.com/40118868): 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 7cdb1f417eb5..81c2e1ba9710 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-09-30 07:45:04 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc @@ -61,7 +61,7 @@ #include "ui/aura/window.h" @@ -54,7 +54,7 @@ gfx::Insets PictureInPictureBrowserFrameView::RestoredMirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -1188,7 +1188,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre +@@ -1189,7 +1189,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_) { -@@ -1343,7 +1343,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -1344,7 +1344,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(); -@@ -1361,7 +1361,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor +@@ -1362,7 +1362,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor } gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const { @@ -81,7 +81,7 @@ return FrameBorderInsets(); #elif !BUILDFLAG(IS_CHROMEOS_ASH) return gfx::Insets(kResizeBorder); -@@ -1382,7 +1382,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie +@@ -1383,7 +1383,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie top_height + border_thickness.bottom()); } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc index 77915f3a294b..1314b3633772 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/views/frame/tab_strip_region_view.cc -@@ -204,7 +204,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr +@@ -205,7 +205,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr // TODO(crbug.com/40118868): Revisit the macro expression once build flag // switch of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc index b4cc27369f2c..0e22326d0f7a 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/views/hung_renderer_view.cc -@@ -407,7 +407,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() +@@ -408,7 +408,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() content::RenderProcessHost* rph = hung_pages_table_model_->GetRenderWidgetHost()->GetProcess(); if (rph) { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc index 7f407da90f27..f32d0dbf71de 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/views/omnibox/omnibox_view_views.cc -@@ -1973,7 +1973,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( +@@ -1992,7 +1992,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( } void OmniboxViewViews::OnPopupOpened() { 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 43e98ba76b50..d55e2e3ae9cd 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-09-30 07:45:04 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -693,7 +693,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -674,7 +674,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc index 9155c7fb5c03..331d53318fa5 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/profile_picker_view.cc.orig 2024-08-26 12:06:38 UTC +--- chrome/browser/ui/views/profiles/profile_picker_view.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/views/profiles/profile_picker_view.cc -@@ -87,7 +87,7 @@ +@@ -88,7 +88,7 @@ #include "chrome/browser/ui/views/profiles/first_run_flow_controller_lacros.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/shell_integration_linux.h" #endif -@@ -117,7 +117,7 @@ class ProfilePickerWidget : public views::Widget { +@@ -118,7 +118,7 @@ class ProfilePickerWidget : public views::Widget { views::Widget::InitParams params( views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET); params.delegate = profile_picker_view_; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc index 0b7e0a3dad19..8d8c8f868d08 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc -@@ -56,7 +56,7 @@ namespace { +@@ -57,7 +57,7 @@ namespace { const int kModalDialogWidth = 448; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -8,8 +8,8 @@ + BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) const int kManagedUserNoticeConfirmationDialogWidth = 512; const int kManagedUserNoticeConfirmationDialogHeight = 576; - const int kManagedUserNoticeConfirmationUpdatedDialogWidth = 900; -@@ -174,7 +174,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom + const int kManagedUserNoticeConfirmationUpdatedDialogWidth = 780; +@@ -175,7 +175,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,8 +18,8 @@ // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateManagedUserNoticeConfirmationWebView( -@@ -336,7 +336,7 @@ SigninViewControllerDelegateViews::SigninViewControlle - SetButtons(ui::DIALOG_BUTTON_NONE); +@@ -338,7 +338,7 @@ SigninViewControllerDelegateViews::SigninViewControlle + SetButtons(static_cast<int>(ui::mojom::DialogButton::kNone)); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) @@ -27,7 +27,7 @@ // On the local profile creation dialog, cancelling the dialog (for instance // through the VKEY_ESCAPE accelerator) should delete the profile. if (delete_profile_on_cancel) { -@@ -425,7 +425,7 @@ void SigninViewControllerDelegateViews::DisplayModal() +@@ -427,7 +427,7 @@ void SigninViewControllerDelegateViews::DisplayModal() } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ void SigninViewControllerDelegateViews::DeleteProfileOnCancel() { ProfileAttributesEntry* entry = g_browser_process->profile_manager() -@@ -500,7 +500,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati +@@ -502,7 +502,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h index 559ae2682493..d2d854dd1925 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h @@ -76,7 +76,7 @@ class SigninViewControllerDelegateViews #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) @@ -9,7 +9,7 @@ static std::unique_ptr<views::WebView> CreateManagedUserNoticeConfirmationWebView( Browser* browser, -@@ -142,7 +142,7 @@ class SigninViewControllerDelegateViews +@@ -143,7 +143,7 @@ class SigninViewControllerDelegateViews InitializeSigninWebDialogUI initialize_signin_web_dialog_ui); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 a03045d5c3f0..9a9bcc5134cb 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,15 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -98,7 +98,7 @@ - #include "components/remote_cocoa/browser/window.h" - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/aura/client/drag_drop_client.h" - #endif - -@@ -218,7 +218,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { +@@ -214,7 +214,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { void UpdateSystemDnDDragImage(TabDragContext* attached_context, const gfx::ImageSkia& image) { @@ -18,7 +9,7 @@ aura::Window* root_window = attached_context->GetWidget()->GetNativeWindow()->GetRootWindow(); if (aura::client::GetDragDropClient(root_window)) { -@@ -416,7 +416,7 @@ TabDragController::Liveness TabDragController::Init( +@@ -414,7 +414,7 @@ TabDragController::Liveness TabDragController::Init( // synchronous on desktop Linux, so use that. // - ChromeOS Ash // Releasing capture on Ash cancels gestures so avoid it. @@ -27,7 +18,7 @@ ref->can_release_capture_ = false; #endif ref->start_point_in_screen_ = -@@ -1034,7 +1034,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -1020,7 +1020,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +27,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. -@@ -2064,7 +2064,7 @@ void TabDragController::CompleteDrag() { +@@ -2084,7 +2084,7 @@ void TabDragController::CompleteDrag() { } // If source window was maximized - maximize the new window as well. @@ -45,7 +36,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 -@@ -2510,7 +2510,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2530,7 +2530,7 @@ TabDragController::Liveness TabDragController::GetLoca } // TODO(crbug.com/40118868): 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 fe2a45c3bde8..2d28deb4ab15 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-07-30 11:12:21 UTC +--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc -@@ -374,7 +374,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta +@@ -375,7 +375,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_user__education_browser__user__education__service.cc b/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc index 8b1374134432..dea0b1050cbf 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,15 @@ ---- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/views/user_education/browser_user_education_service.cc -@@ -957,7 +957,7 @@ void MaybeRegisterChromeFeaturePromos( +@@ -777,7 +777,7 @@ void MaybeRegisterChromeFeaturePromos( + "defaulted to saved for the first time."))); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // kIPHSupervisedUserProfileSigninFeature + registry.RegisterFeature(std::move( + FeaturePromoSpecification::CreateForCustomAction( +@@ -1003,7 +1003,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 db8d80bc8164..608aeb73d3e8 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-09-30 07:45:04 UTC +--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc -@@ -515,7 +515,7 @@ std::string GetFileExtension(FileExtension file_extens +@@ -516,7 +516,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; -@@ -2100,7 +2100,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( -@@ -3427,7 +3427,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna +@@ -3428,7 +3428,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 -@@ -3442,7 +3442,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3443,7 +3443,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 -@@ -3452,7 +3452,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3453,7 +3453,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis void WebAppIntegrationTestDriver::CheckSiteHandlesFile( Site site, FileExtension file_extension) { @@ -45,7 +45,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3468,7 +3468,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile +@@ -3469,7 +3469,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile( Site site, FileExtension file_extension) { @@ -54,7 +54,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -4285,7 +4285,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu +@@ -4286,7 +4286,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 -@@ -4485,7 +4485,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre +@@ -4486,7 +4486,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); -@@ -4529,7 +4529,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr +@@ -4530,7 +4530,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__ui__manager__impl.cc b/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc index 42ce3743e010..ca1a1d515bf2 100644 --- a/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc +++ b/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc @@ -573,7 +573,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun - content::WebContents* web_contents, + Browser* browser, Profile* profile, const std::string& app_id) { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc index 9ee825c589ba..a1151cd3b5fc 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc.orig 2024-08-26 12:06:38 UTC +--- chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc -@@ -147,7 +147,7 @@ CertificateManagerPageHandler::GetCertSource( +@@ -154,7 +154,7 @@ CertificateManagerPageHandler::GetCertSource( "distrusted_certs", cert_verifier::mojom::CertificateTrust::kDistrusted); break; diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc index a374a6f62c2c..636f4efcc1ce 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc -@@ -36,7 +36,7 @@ +@@ -43,7 +43,7 @@ #include "net/ssl/client_cert_store_mac.h" #endif // BUILDFLAG(IS_MAC) @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h" #include "components/enterprise/client_certificates/core/client_certificates_service.h" -@@ -98,7 +98,7 @@ std::unique_ptr<ClientCertStoreLoader> CreatePlatformC +@@ -191,7 +191,7 @@ std::unique_ptr<ClientCertStoreLoader> CreatePlatformC #endif } @@ -18,7 +18,7 @@ // ClientCertStore implementation that always returns an empty list. The // CertificateProvisioningService implementation expects to wrap a platform // cert store, but here we only want to get results from the provisioning -@@ -393,7 +393,7 @@ CreatePlatformClientCertSource( +@@ -673,7 +673,7 @@ CreatePlatformClientCertSource( #endif } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h index 1dad844a9744..cbb70e10223f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h +++ b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h @@ -1,8 +1,8 @@ ---- chrome/browser/ui/webui/certificate_manager/client_cert_sources.h.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.h.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.h -@@ -17,7 +17,7 @@ CreatePlatformClientCertSource( - mojo::Remote<certificate_manager_v2::mojom::CertificateManagerPage>* - remote_client); +@@ -18,7 +18,7 @@ CreatePlatformClientCertSource( + remote_client, + 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) diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc index 527308dc792a..1c6829abf7a2 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc @@ -1,7 +1,16 @@ ---- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/webui/chrome_web_ui_configs.cc -@@ -110,10 +110,10 @@ void RegisterChromeWebUIConfigs() { - map.AddWebUIConfig(std::make_unique<TermsUIConfig>()); +@@ -77,7 +77,7 @@ + #include "chrome/browser/ui/webui/certificate_manager/certificate_manager_ui.h" + #endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) + +-#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/webui/whats_new/whats_new_ui.h" + #endif + +@@ -148,10 +148,10 @@ void RegisterChromeWebUIConfigs() { + map.AddWebUIConfig(std::make_unique<WebuiGalleryUIConfig>()); #endif // !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) @@ -13,3 +22,12 @@ #if BUILDFLAG(ENABLE_EXTENSIONS) map.AddWebUIConfig(std::make_unique<extensions::ExtensionsUIConfig>()); +@@ -165,7 +165,7 @@ void RegisterChromeWebUIConfigs() { + map.AddWebUIConfig(std::make_unique<CertificateManagerUIConfig>()); + #endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + map.AddWebUIConfig(std::make_unique<WhatsNewUIConfig>()); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + 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 0b2779cd936b..562b925014be 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-09-30 07:45:04 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -189,7 +189,7 @@ +@@ -176,7 +176,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 -@@ -214,22 +214,22 @@ +@@ -201,22 +201,22 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -34,9 +34,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/ui/webui/whats_new/whats_new_ui.h" - #include "chrome/browser/ui/webui/whats_new/whats_new_util.h" #endif -@@ -550,7 +550,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we + +@@ -506,7 +506,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUIMobileSetupHost) return &NewWebUI<ash::cellular_setup::MobileSetupUI>; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -45,7 +45,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -602,7 +602,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -558,7 +558,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -54,16 +54,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -633,7 +633,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we - if (url.host_piece() == chrome::kChromeUIWebuiGalleryHost) { - return &NewWebUI<WebuiGalleryUI>; - } --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (url.host_piece() == chrome::kChromeUIWhatsNewHost && - whats_new::IsEnabled()) { - return &NewWebUI<WhatsNewUI>; -@@ -652,26 +652,26 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -599,26 +599,26 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -95,7 +86,7 @@ if (url.host_piece() == chrome::kChromeUIWebAppSettingsHost) return &NewWebUI<WebAppSettingsUI>; #endif -@@ -907,7 +907,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: +@@ -854,7 +854,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: if (page_url.host_piece() == chrome::kChromeUINewTabPageHost) return NewTabPageUI::GetFaviconResourceBytes(scale_factor); @@ -104,7 +95,7 @@ if (page_url.host_piece() == chrome::kChromeUIWhatsNewHost) return WhatsNewUI::GetFaviconResourceBytes(scale_factor); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -935,7 +935,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: +@@ -882,7 +882,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: return ManagementUI::GetFaviconResourceBytes(scale_factor); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc index 9cc8b7185ea1..db8a73007fc9 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/webui/interstitials/interstitial_ui.cc @@ -71,7 +71,7 @@ #include "components/security_interstitials/content/captive_portal_blocking_page.h" @@ -16,14 +16,14 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) std::unique_ptr<SupervisedUserVerificationPage> - CreateSupervisedUserVerificationPage(content::WebContents* web_contents) { - const GURL kRequestUrl("https://supervised-user-verification.example.net"); -@@ -590,7 +590,7 @@ void InterstitialHTMLSource::StartDataRequest( + CreateSupervisedUserVerificationPage(content::WebContents* web_contents, + bool is_main_frame) { +@@ -594,7 +594,7 @@ void InterstitialHTMLSource::StartDataRequest( interstitial_delegate = CreateInsecureFormPage(web_contents); } else if (path_without_query == "/https_only") { interstitial_delegate = CreateHttpsOnlyModePage(web_contents); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) } else if (path_without_query == "/supervised-user-verify") { - interstitial_delegate = CreateSupervisedUserVerificationPage(web_contents); - } else if (path_without_query == "/supervised-user-verify-blocked-site") { + interstitial_delegate = CreateSupervisedUserVerificationPage( + web_contents, /*is_main_frame=*/true); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc index 060472dc5f3e..3da625653899 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc @@ -1,8 +1,8 @@ ---- chrome/browser/ui/webui/management/management_ui.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/webui/management/management_ui.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/webui/management/management_ui.cc -@@ -105,11 +105,11 @@ content::WebUIDataSource* CreateAndAddManagementUIHtml - {kManagementOnFileTransferVisibleData, +@@ -108,11 +108,11 @@ content::WebUIDataSource* CreateAndAddManagementUIHtml IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA}, + {kManagementReportFileEvents, IDS_MANAGEMENT_REPORT_FILE_EVENTS}, #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc index 30fbbf9754b0..c1fd6b6c3d64 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/management/management_ui_constants.cc.orig 2024-08-26 12:06:38 UTC +--- chrome/browser/ui/webui/management/management_ui_constants.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/webui/management/management_ui_constants.cc -@@ -82,12 +82,12 @@ const char kProfileReportingBrowser[] = "profileReport +@@ -88,12 +88,12 @@ const char kProfileReportingBrowser[] = "profileReport const char kProfileReportingExtension[] = "profileReportingExtension"; const char kProfileReportingPolicy[] = "profileReportingPolicy"; diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc index b0ca0d9b969b..6e360158bb00 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2024-08-26 12:06:38 UTC +--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/webui/management/management_ui_handler.cc @@ -58,7 +58,7 @@ #include "ui/base/l10n/l10n_util.h" @@ -18,7 +18,7 @@ // Insert the device signals consent disclosure at the end of browser // reporting section. auto* user_permission_service = GetUserPermissionService(); -@@ -543,7 +543,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS +@@ -557,7 +557,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS ->policy_service(); } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc index 0cca9130d104..4c14e1f77700 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/webui/searchbox/searchbox_handler.cc @@ -108,7 +108,7 @@ const char* kMacShareIconResourceName = #elif BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ kLinuxShareIconResourceName = "//resources/cr_components/searchbox/icons/share_cr23.svg"; #else -@@ -674,7 +674,7 @@ std::string SearchboxHandler::ActionVectorIconToResour +@@ -645,7 +645,7 @@ std::string SearchboxHandler::ActionVectorIconToResour icon.name == omnibox::kShareWinChromeRefreshIcon.name) { return kWinShareIconResourceName; } 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 5f420527c98c..5e54f12d9d51 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,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -143,7 +143,7 @@ +@@ -144,7 +144,7 @@ #include "chrome/browser/ui/chrome_pages.h" #endif @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -162,7 +162,7 @@ +@@ -163,7 +163,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -18,7 +18,7 @@ #include "ui/linux/linux_ui_factory.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -282,7 +282,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou +@@ -287,7 +287,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou {"focusHighlightLabel", IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION}, #endif @@ -27,7 +27,7 @@ {"overscrollHistoryNavigationTitle", IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE}, {"overscrollHistoryNavigationSubtitle", -@@ -407,7 +407,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -412,7 +412,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"uiFeatureAlignLeft", IDS_SETTINGS_UI_FEATURE_ALIGN_LEFT}, {"uiFeatureAlignRight", IDS_SETTINGS_UI_FEATURE_ALIGN_RIGHT}, {"resetToDefault", IDS_SETTINGS_RESET_TO_DEFAULT}, @@ -36,7 +36,7 @@ {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -415,7 +415,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -420,7 +420,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, {"useClassicTheme", IDS_SETTINGS_USE_CLASSIC_THEME}, #endif @@ -45,7 +45,7 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -443,7 +443,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -448,7 +448,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc index 137406dd2e2c..97451b90d79d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/ui/webui/signin/profile_picker_handler.cc -@@ -205,7 +205,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr +@@ -209,7 +209,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr if (AccountInfo::IsManaged(entry->GetHostedDomain())) { profile_entry.Set("avatarBadge", "cr:domain"); @@ -9,7 +9,7 @@ } else if (base::FeatureList::IsEnabled( supervised_user::kShowKiteForSupervisedUsers) && entry->IsSupervised()) { -@@ -1208,7 +1208,7 @@ void ProfilePickerHandler::BeginFirstWebContentsProfil +@@ -1224,7 +1224,7 @@ void ProfilePickerHandler::BeginFirstWebContentsProfil } void ProfilePickerHandler::MaybeUpdateGuestMode() { diff --git a/www/chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc b/www/chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc index 27aa5d49abcb..9c949d8e633d 100644 --- a/www/chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc -@@ -42,7 +42,7 @@ +@@ -44,7 +44,7 @@ #include "components/visited_url_ranking/public/visited_url_ranking_service.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/visited_url_ranking/desktop_tab_model_url_visit_data_fetcher.h" #elif BUILDFLAG(IS_ANDROID) #include "chrome/browser/visited_url_ranking/android_tab_model_url_visit_data_fetcher.h" -@@ -115,7 +115,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF +@@ -118,7 +118,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF std::map<Fetcher, std::unique_ptr<URLVisitDataFetcher>> data_fetchers; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc index 87b9b39a68a5..2c738d46c7b5 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut.cc @@ -71,7 +71,7 @@ namespace { @@ -9,7 +9,7 @@ // Linux supports icons of any size. FreeDesktop Icon Theme Specification states // that "Minimally you should install a 48x48 icon in the hicolor theme." const int kDesiredIconSizesForShortcut[] = {16, 32, 48, 128, 256, 512}; -@@ -259,7 +259,7 @@ std::unique_ptr<ShortcutInfo> BuildShortcutInfoWithout +@@ -251,7 +251,7 @@ std::unique_ptr<ShortcutInfo> BuildShortcutInfoWithout // TODO(crbug.com/40257107): Implement tests on Linux for using shortcuts_menu // actions. diff --git a/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc b/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc index ca3bc40ec775..678adbc601b2 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig 2024-08-26 12:06:38 UTC +--- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/web_applications/test/os_integration_test_override_impl.cc -@@ -46,7 +46,7 @@ +@@ -45,7 +45,7 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #endif -@@ -131,7 +131,7 @@ std::vector<std::wstring> GetFileExtensionsForProgId( +@@ -130,7 +130,7 @@ std::vector<std::wstring> GetFileExtensionsForProgId( } #endif @@ -18,7 +18,7 @@ // Performs a blocking read of app icons from the disk. SkColor IconManagerReadIconTopLeftColorForSize(WebAppIconManager& icon_manager, const webapps::AppId& app_id, -@@ -266,7 +266,7 @@ bool OsIntegrationTestOverrideImpl::SimulateDeleteShor +@@ -265,7 +265,7 @@ bool OsIntegrationTestOverrideImpl::SimulateDeleteShor GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name); CHECK(base::PathExists(app_folder_shortcut_path)); return base::DeletePathRecursively(app_folder_shortcut_path); @@ -27,7 +27,7 @@ base::FilePath desktop_shortcut_path = GetShortcutPath(profile, desktop(), app_id, app_name); LOG(INFO) << desktop_shortcut_path; -@@ -314,7 +314,7 @@ bool OsIntegrationTestOverrideImpl::DeleteApplicationM +@@ -313,7 +313,7 @@ bool OsIntegrationTestOverrideImpl::DeleteApplicationM } #endif // BUILDFLAG(IS_WIN) @@ -36,7 +36,7 @@ bool OsIntegrationTestOverrideImpl::DeleteDesktopDirOnLinux() { if (desktop_.IsValid()) { return desktop_.Delete(); -@@ -328,7 +328,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab +@@ -327,7 +327,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab Profile* profile, const webapps::AppId& app_id, const std::string& app_name) { @@ -45,7 +45,7 @@ std::string shortcut_filename = "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop"; return base::PathExists(startup().Append(shortcut_filename)); -@@ -384,7 +384,7 @@ bool OsIntegrationTestOverrideImpl::IsFileExtensionHan +@@ -383,7 +383,7 @@ bool OsIntegrationTestOverrideImpl::IsFileExtensionHan is_file_handled = shell_integration::CanApplicationHandleURL(app_path, test_file_url); base::DeleteFile(test_file_path); @@ -54,7 +54,7 @@ base::FilePath user_applications_dir = applications(); bool database_update_called = false; for (const LinuxFileRegistration& command : linux_file_registration_) { -@@ -427,7 +427,7 @@ OsIntegrationTestOverrideImpl::GetShortcutIconTopLeftC +@@ -426,7 +426,7 @@ OsIntegrationTestOverrideImpl::GetShortcutIconTopLeftC return std::nullopt; } return GetIconTopLeftColorFromShortcutFile(shortcut_path); @@ -63,7 +63,7 @@ WebAppProvider* provider = WebAppProvider::GetForLocalAppsUnchecked(profile); if (!provider) { return std::nullopt; -@@ -477,7 +477,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort +@@ -476,7 +476,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort app_installed_profiles.end()) { return shortcut_path; } @@ -72,7 +72,7 @@ std::string shortcut_filename = "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop"; base::FilePath shortcut_path = shortcut_dir.Append(shortcut_filename); -@@ -502,7 +502,7 @@ bool OsIntegrationTestOverrideImpl::IsShortcutCreated( +@@ -501,7 +501,7 @@ bool OsIntegrationTestOverrideImpl::IsShortcutCreated( base::FilePath app_shortcut_path = GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name); return base::PathExists(app_shortcut_path); @@ -81,7 +81,7 @@ base::FilePath desktop_shortcut_path = GetShortcutPath(profile, desktop(), app_id, app_name); return base::PathExists(desktop_shortcut_path); -@@ -690,7 +690,7 @@ void OsIntegrationTestOverrideImpl::EnableOrDisablePat +@@ -694,7 +694,7 @@ void OsIntegrationTestOverrideImpl::EnableOrDisablePat } #endif // BUILDFLAG(IS_MAC) @@ -90,7 +90,7 @@ base::FilePath OsIntegrationTestOverrideImpl::desktop() { return desktop_.GetPath(); } -@@ -741,7 +741,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri +@@ -745,7 +745,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri success = chrome_apps_folder_.CreateUniqueTempDirUnderPath( outer_temp_dir_.GetPath()); CHECK(success); @@ -99,7 +99,7 @@ success = desktop_.CreateUniqueTempDirUnderPath(outer_temp_dir_.GetPath()); CHECK(success); success = startup_.CreateUniqueTempDirUnderPath(outer_temp_dir_.GetPath()); -@@ -754,7 +754,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri +@@ -758,7 +758,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri CHECK(success); #endif @@ -108,7 +108,7 @@ auto callback = base::BindRepeating([](base::FilePath filename_in, std::string xdg_command, std::string file_contents) { -@@ -826,7 +826,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr +@@ -830,7 +830,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr EXPECT_TRUE(!startup_.IsValid() || startup_.Delete()); #elif BUILDFLAG(IS_MAC) EXPECT_TRUE(!chrome_apps_folder_.IsValid() || DeleteChromeAppsDir()); diff --git a/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h b/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h index 6f5bdfc7fad7..d16724906775 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h +++ b/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/test/os_integration_test_override_impl.h.orig 2024-06-17 12:56:06 UTC +--- chrome/browser/web_applications/test/os_integration_test_override_impl.h.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/web_applications/test/os_integration_test_override_impl.h @@ -40,7 +40,7 @@ class ShellLinkItem; @@ -18,7 +18,7 @@ bool DeleteDesktopDirOnLinux(); #endif // BUILDFLAG(IS_LINUX) -@@ -242,7 +242,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra +@@ -241,7 +241,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra base::FilePath chrome_apps_folder() override; void EnableOrDisablePathOnLogin(const base::FilePath& file_path, bool enable_on_login) override; @@ -27,7 +27,7 @@ base::FilePath desktop(); base::FilePath startup(); base::FilePath applications(); -@@ -322,7 +322,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra +@@ -321,7 +321,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra base::ScopedTempDir chrome_apps_folder_; std::map<base::FilePath, bool> startup_enabled_; 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 c02243269d65..44adc82505fb 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-09-30 07:45:04 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -1167,7 +1167,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc +@@ -1143,7 +1143,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc g_observer->ConfiguringCable(request_type); } diff --git a/www/chromium/files/patch-chrome_common_channel__info__posix.cc b/www/chromium/files/patch-chrome_common_channel__info__posix.cc index ae8708082323..3de87959e99f 100644 --- a/www/chromium/files/patch-chrome_common_channel__info__posix.cc +++ b/www/chromium/files/patch-chrome_common_channel__info__posix.cc @@ -1,6 +1,6 @@ ---- chrome/common/channel_info_posix.cc.orig 2024-06-17 12:56:06 UTC +--- chrome/common/channel_info_posix.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/common/channel_info_posix.cc -@@ -93,7 +93,7 @@ std::string GetChannelSuffixForDataDir() { +@@ -95,7 +95,7 @@ std::string GetChannelSuffixForDataDir() { } } @@ -9,7 +9,7 @@ std::string GetChannelSuffixForExtraFlagsEnvVarName() { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) const auto channel_state = GetChannelImpl(); -@@ -121,7 +121,7 @@ std::string GetChannelSuffixForExtraFlagsEnvVarName() +@@ -123,7 +123,7 @@ std::string GetChannelSuffixForExtraFlagsEnvVarName() // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index 5c12375a2566..20ee1d8e317b 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/chromium/files/patch-chrome_common_chrome__features.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/common/chrome_features.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/common/chrome_features.cc -@@ -75,7 +75,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims, +@@ -82,7 +82,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims, #endif // BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // Enables or disables the Autofill survey triggered by opening a prompt to // save address info. BASE_FEATURE(kAutofillAddressSurvey, -@@ -93,7 +93,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, +@@ -100,7 +100,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, base::FEATURE_DISABLED_BY_DEFAULT); #endif @@ -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. -@@ -256,7 +256,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, +@@ -267,7 +267,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, 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 -@@ -305,7 +305,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, +@@ -299,7 +299,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, "DesktopPWAsTabStripSettings", base::FEATURE_DISABLED_BY_DEFAULT); @@ -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. -@@ -883,7 +883,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, +@@ -871,7 +871,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, "KAnonymityServiceStorage", base::FEATURE_ENABLED_BY_DEFAULT); @@ -45,7 +45,7 @@ BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -896,7 +896,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -884,7 +884,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 4223bef1e8c2..658933262e81 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.h +++ b/www/chromium/files/patch-chrome_common_chrome__features.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.h.orig 2024-09-30 07:45:04 UTC +--- chrome/common/chrome_features.h.orig 2024-10-22 08:31:56 UTC +++ chrome/common/chrome_features.h -@@ -55,13 +55,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims); +@@ -60,13 +60,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims); #endif // BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -16,7 +16,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -190,7 +190,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose); +@@ -179,7 +179,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); @@ -25,7 +25,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kShortcutsNotApps); -@@ -530,7 +530,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); +@@ -512,7 +512,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kKAnonymityServiceStorage); @@ -34,7 +34,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor); COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel; -@@ -538,7 +538,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -520,7 +520,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_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index c9ccff2087dc..38a36eab051d 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-09-30 07:45:04 UTC +--- chrome/common/pref_names.h.orig 2024-10-22 08:31:56 UTC +++ chrome/common/pref_names.h -@@ -1375,7 +1375,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u +@@ -1379,7 +1379,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u // TODO(crbug.com/40118868): 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 -@@ -1536,7 +1536,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = +@@ -1552,7 +1552,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"; -@@ -2143,7 +2143,7 @@ inline constexpr char kDownloadDefaultDirectory[] = +@@ -2159,7 +2159,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 -@@ -2586,14 +2586,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s +@@ -2602,14 +2602,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"; -@@ -2671,7 +2671,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM +@@ -2687,7 +2687,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[] = -@@ -3213,7 +3213,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] +@@ -3228,7 +3228,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -62,7 +62,7 @@ // Defines administrator-set availability of Chrome for Testing. inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed"; #endif -@@ -3809,7 +3809,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes +@@ -3824,7 +3824,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[] = -@@ -4079,7 +4079,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] = +@@ -4094,7 +4094,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] = "policy.lens_desktop_ntp_search_enabled"; #endif @@ -80,7 +80,7 @@ // A dict mapping the edition name with the major version it was shown. inline constexpr char kWhatsNewEditionUsed[] = "browser.whats_new.edition_used"; // A list containing the features of each module in order of when they -@@ -4173,7 +4173,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ +@@ -4188,7 +4188,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ "printing.oauth2_authorization_servers"; #endif diff --git a/www/chromium/files/patch-chrome_common_url__constants.h b/www/chromium/files/patch-chrome_common_url__constants.h index 40b40603eebb..6be570d58c5f 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-08-26 12:06:38 UTC +--- chrome/common/url_constants.h.orig 2024-10-22 08:31:56 UTC +++ chrome/common/url_constants.h -@@ -927,7 +927,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = +@@ -929,7 +929,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = inline constexpr char kPhoneHubPermissionLearnMoreURL[] = "https://support.google.com/chromebook?p=multidevice"; 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 3cabcbf84cef..793bf92ee831 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-09-30 07:45:04 UTC +--- chrome/common/webui_url_constants.h.orig 2024-10-22 08:31:56 UTC +++ chrome/common/webui_url_constants.h -@@ -566,24 +566,24 @@ inline constexpr char16_t kOsUISystemURL[] = u"os://sy +@@ -581,24 +581,24 @@ inline constexpr char16_t kOsUISystemURL[] = u"os://sy inline constexpr char kOsUIVersionURL[] = "os://version"; #endif @@ -29,7 +29,7 @@ inline constexpr char kChromeUIWebAppSettingsHost[] = "app-settings"; inline constexpr char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; inline constexpr char kChromeUIWhatsNewHost[] = "whats-new"; -@@ -595,13 +595,13 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] +@@ -610,13 +610,13 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -45,7 +45,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) inline constexpr char kChromeUIBrowserSwitchHost[] = "browser-switch"; inline constexpr char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; -@@ -623,7 +623,7 @@ inline constexpr char kChromeUIProfilePickerStartupQue +@@ -638,7 +638,7 @@ inline constexpr char kChromeUIProfilePickerStartupQue inline constexpr char kChromeUIProfilePickerUrl[] = "chrome://profile-picker/"; #endif diff --git a/www/chromium/files/patch-chrome_test_supervised__user_google__auth__state__waiter__mixin.cc b/www/chromium/files/patch-chrome_test_supervised__user_google__auth__state__waiter__mixin.cc new file mode 100644 index 000000000000..759cce42ba71 --- /dev/null +++ b/www/chromium/files/patch-chrome_test_supervised__user_google__auth__state__waiter__mixin.cc @@ -0,0 +1,11 @@ +--- chrome/test/supervised_user/google_auth_state_waiter_mixin.cc.orig 2024-10-22 08:31:56 UTC ++++ chrome/test/supervised_user/google_auth_state_waiter_mixin.cc +@@ -24,7 +24,7 @@ GoogleAuthStateWaiterMixin::GoogleAuthStateWaiterMixin + GoogleAuthStateWaiterMixin::~GoogleAuthStateWaiterMixin() = default; + + void GoogleAuthStateWaiterMixin::SetUpOnMainThread() { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + ChildAccountService* child_account_service = + ChildAccountServiceFactory::GetForProfile( + test_base_->browser()->profile()); diff --git a/www/chromium/files/patch-chrome_updater_app_app__uninstall.cc b/www/chromium/files/patch-chrome_updater_app_app__uninstall.cc new file mode 100644 index 000000000000..21ad7f755cef --- /dev/null +++ b/www/chromium/files/patch-chrome_updater_app_app__uninstall.cc @@ -0,0 +1,11 @@ +--- chrome/updater/app/app_uninstall.cc.orig 2024-10-22 08:31:56 UTC ++++ chrome/updater/app/app_uninstall.cc +@@ -161,7 +161,7 @@ void UninstallInThreadPool(UpdaterScope scope, + } + if (int result = UninstallOtherVersions(scope); + result != kErrorOk) { +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + // TODO(crbug.com/366249606): Ignores the errors when uninstalls + // the other versions, because currently older Linux updater on + // CIPD exits with error `kErrorFailedToDeleteFolder`. diff --git a/www/chromium/files/patch-chrome_updater_configurator.cc b/www/chromium/files/patch-chrome_updater_configurator.cc index 4832e36163ac..83d7d22fc698 100644 --- a/www/chromium/files/patch-chrome_updater_configurator.cc +++ b/www/chromium/files/patch-chrome_updater_configurator.cc @@ -1,6 +1,6 @@ ---- chrome/updater/configurator.cc.orig 2024-02-23 21:04:38 UTC +--- chrome/updater/configurator.cc.orig 2024-10-22 08:31:56 UTC +++ chrome/updater/configurator.cc -@@ -67,7 +67,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs> +@@ -69,7 +69,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs> return std::nullopt; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) }()) { diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc index 860d180f0ca1..5a62aa88b2a0 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2024-05-21 18:07:39 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2024-10-22 08:31:56 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -431,7 +431,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -429,7 +429,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { diff --git a/www/chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc index 80498526139c..c3acb38f6873 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/payments_data_manager.cc.orig 2024-09-30 07:45:04 UTC +--- components/autofill/core/browser/payments_data_manager.cc.orig 2024-10-22 08:31:56 UTC +++ components/autofill/core/browser/payments_data_manager.cc -@@ -1057,7 +1057,7 @@ bool PaymentsDataManager::ShouldShowCardsFromAccountOp +@@ -1054,7 +1054,7 @@ bool PaymentsDataManager::ShouldShowCardsFromAccountOp // The feature is only for Linux, Windows, Mac, and Fuchsia. // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 b2f77755b183..273679b309c7 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,4 +1,4 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2024-09-30 07:45:04 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2024-10-22 08:31:56 UTC +++ components/autofill/core/common/autofill_payments_features.cc @@ -8,7 +8,7 @@ @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) // When enabled, Chrome will extract the checkout amount from the checkout page // of the allowlisted merchant websites. -@@ -292,7 +292,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts, +@@ -320,7 +320,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts, bool ShouldShowImprovedUserConsentForCreditCardSave() { // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.cc new file mode 100644 index 000000000000..8f2c5cf4332a --- /dev/null +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.cc @@ -0,0 +1,11 @@ +--- components/autofill/core/common/autofill_prefs.cc.orig 2024-10-22 08:31:56 UTC ++++ components/autofill/core/common/autofill_prefs.cc +@@ -118,7 +118,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + registry->RegisterBooleanPref(prefs::kAutofillPredictionImprovementsEnabled, + false); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.h b/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.h new file mode 100644 index 000000000000..1adbd7e43204 --- /dev/null +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__prefs.h @@ -0,0 +1,11 @@ +--- components/autofill/core/common/autofill_prefs.h.orig 2024-10-22 08:31:56 UTC ++++ components/autofill/core/common/autofill_prefs.h +@@ -73,7 +73,7 @@ inline constexpr char kAutofillPaymentCvcStorage[] = + inline constexpr char kAutofillPaymentCardBenefits[] = + "autofill.payment_card_benefits"; + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Boolean that controls improved autofill filling predictions. When enabled, + // the autofill functionality is enhanced with adopting user data to + // the form being filled in, which is triggered by the user via an extra diff --git a/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc b/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc index 08293f2c085f..f70422eb9597 100644 --- a/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc +++ b/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc @@ -1,4 +1,4 @@ ---- components/commerce/core/commerce_feature_list.cc.orig 2024-09-30 07:45:04 UTC +--- components/commerce/core/commerce_feature_list.cc.orig 2024-10-22 08:31:56 UTC +++ components/commerce/core/commerce_feature_list.cc @@ -168,7 +168,7 @@ BASE_FEATURE(kPriceInsights, "PriceInsights", @@ -9,7 +9,16 @@ BASE_FEATURE(kPriceInsightsRegionLaunched, "PriceInsightsRegionLaunched", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -272,7 +272,7 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl +@@ -246,7 +246,7 @@ const base::FeatureParam<bool> kDiscountOnShoppyPage{ + &kEnableDiscountInfoApi, kDiscountOnShoppyPageParam, false}; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kEnableDiscountInfoApiRegionLaunched, + "EnableDiscountInfoApiRegionLaunched", + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -281,7 +281,7 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-components_constrained__window_constrained__window__views.cc b/www/chromium/files/patch-components_constrained__window_constrained__window__views.cc index fc67f901d020..08c0d32f5bdb 100644 --- a/www/chromium/files/patch-components_constrained__window_constrained__window__views.cc +++ b/www/chromium/files/patch-components_constrained__window_constrained__window__views.cc @@ -1,6 +1,6 @@ ---- components/constrained_window/constrained_window_views.cc.orig 2024-09-30 07:45:04 UTC +--- components/constrained_window/constrained_window_views.cc.orig 2024-10-22 08:31:56 UTC +++ components/constrained_window/constrained_window_views.cc -@@ -371,7 +371,7 @@ bool SupportsGlobalScreenCoordinates() { +@@ -372,7 +372,7 @@ bool SupportsGlobalScreenCoordinates() { } bool PlatformClipsChildrenToViewport() { diff --git a/www/chromium/files/patch-components_crash_core_app_BUILD.gn b/www/chromium/files/patch-components_crash_core_app_BUILD.gn index b3d99337265f..41cc75f25038 100644 --- a/www/chromium/files/patch-components_crash_core_app_BUILD.gn +++ b/www/chromium/files/patch-components_crash_core_app_BUILD.gn @@ -1,6 +1,6 @@ ---- components/crash/core/app/BUILD.gn.orig 2024-06-17 12:56:06 UTC +--- components/crash/core/app/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ components/crash/core/app/BUILD.gn -@@ -82,6 +82,10 @@ static_library("app") { +@@ -70,6 +70,10 @@ static_library("app") { ] } @@ -11,7 +11,7 @@ defines = [ "CRASH_IMPLEMENTATION" ] public_deps = [ ":lib" ] -@@ -95,7 +99,7 @@ static_library("app") { +@@ -83,7 +87,7 @@ static_library("app") { "//third_party/crashpad/crashpad/util", ] @@ -20,7 +20,7 @@ sources += [ "crashpad_linux.cc" ] data_deps = [ ":chrome_crashpad_handler" ] } -@@ -115,7 +119,7 @@ static_library("app") { +@@ -103,7 +107,7 @@ static_library("app") { libs = [ "log" ] } @@ -29,7 +29,7 @@ deps += [ "//base:base_static", "//components/crash/core/common", -@@ -245,11 +249,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { +@@ -233,11 +237,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { # define custom UserStreamDataSources. executable("chrome_crashpad_handler") { sources = [ "chrome_crashpad_handler.cc" ] @@ -39,5 +39,5 @@ - "//third_party/crashpad/crashpad/handler", - ] - if (is_mac && (is_component_build || is_asan)) { + if (is_mac && (is_component_build || is_asan || is_ubsan_any)) { ldflags = [ diff --git a/www/chromium/files/patch-components_enterprise_watermarking_watermark.cc b/www/chromium/files/patch-components_enterprise_watermarking_watermark.cc index 03e670c4ca78..32df3236d38d 100644 --- a/www/chromium/files/patch-components_enterprise_watermarking_watermark.cc +++ b/www/chromium/files/patch-components_enterprise_watermarking_watermark.cc @@ -1,6 +1,6 @@ ---- components/enterprise/watermarking/watermark.cc.orig 2024-07-30 11:12:21 UTC +--- components/enterprise/watermarking/watermark.cc.orig 2024-10-22 08:31:56 UTC +++ components/enterprise/watermarking/watermark.cc -@@ -23,7 +23,7 @@ gfx::Font WatermarkFont() { +@@ -34,7 +34,7 @@ gfx::Font WatermarkFont() { "Segoe UI", #elif BUILDFLAG(IS_MAC) "SF Pro Text", @@ -9,7 +9,7 @@ "Ubuntu", #elif BUILDFLAG(IS_CHROMEOS) "Google Sans", -@@ -34,7 +34,7 @@ gfx::Font WatermarkFont() { +@@ -45,7 +45,7 @@ gfx::Font WatermarkFont() { } gfx::Font::Weight WatermarkFontWeight() { 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 e07e7bfd63a8..9ed19e85c7d3 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-09-30 07:45:04 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2024-10-22 08:31:56 UTC +++ components/feature_engagement/public/feature_configurations.cc -@@ -94,7 +94,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro +@@ -95,7 +95,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 -@@ -113,7 +113,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi +@@ -114,7 +114,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 (kIPHPasswordsManagementBubbleAfterSaveFeature.name == feature->name) { std::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -1643,7 +1643,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi +@@ -1641,7 +1641,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ 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 735c668ca09d..a16f4ec731a2 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-09-30 07:45:04 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2024-10-22 08:31: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 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) BASE_FEATURE(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo", -@@ -630,7 +630,8 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, +@@ -639,7 +639,8 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,7 +19,7 @@ BASE_FEATURE(kIPHAutofillCreditCardBenefitFeature, "IPH_AutofillCreditCardBenefit", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -767,7 +768,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, +@@ -776,7 +777,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 d8ed16ca545c..bcac552a4d1c 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-09-30 07:45:04 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2024-10-22 08:31: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 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) BASE_DECLARE_FEATURE(kEsbDownloadRowPromoFeature); #endif -@@ -255,7 +255,8 @@ BASE_DECLARE_FEATURE(kDefaultBrowserTriggerCriteriaExp +@@ -258,7 +258,8 @@ BASE_DECLARE_FEATURE(kDefaultBrowserTriggerCriteriaExp #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,7 +19,7 @@ BASE_DECLARE_FEATURE(kIPHAutofillCreditCardBenefitFeature); BASE_DECLARE_FEATURE(kIPHAutofillDisabledVirtualCardSuggestionFeature); BASE_DECLARE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature); -@@ -306,7 +307,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea +@@ -309,7 +310,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 90bf3cde7188..c741213e074d 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-09-30 07:45:04 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2024-10-22 08:31:56 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -162,7 +162,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHHomeCustomizationMenuFeature, +@@ -165,7 +165,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHiOSLensOverlayEntrypointTipFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -9,7 +9,7 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) &kEsbDownloadRowPromoFeature, #endif -@@ -227,7 +227,8 @@ const base::Feature* const kAllFeatures[] = { +@@ -230,7 +230,8 @@ const base::Feature* const kAllFeatures[] = { // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,7 +19,7 @@ &kIPHAutofillCreditCardBenefitFeature, &kIPHAutofillDisabledVirtualCardSuggestionFeature, &kIPHAutofillExternalAccountProfileSuggestionFeature, -@@ -278,7 +279,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -281,7 +282,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 dcabdf231dcb..aefecd3be49a 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-09-30 07:45:04 UTC +--- components/feature_engagement/public/feature_list.h.orig 2024-10-22 08:31:56 UTC +++ components/feature_engagement/public/feature_list.h -@@ -282,7 +282,7 @@ DEFINE_VARIATION_PARAM(kIPHHomeCustomizationMenuFeatur +@@ -288,7 +288,7 @@ DEFINE_VARIATION_PARAM(kIPHHomeCustomizationMenuFeatur #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) DEFINE_VARIATION_PARAM(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo"); #endif -@@ -383,7 +383,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSaveV2CloseGroupFe +@@ -389,7 +389,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSaveV2CloseGroupFe // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,7 +19,7 @@ DEFINE_VARIATION_PARAM(kIPHAutofillCreditCardBenefitFeature, "IPH_AutofillCreditCardBenefit"); -@@ -475,7 +476,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF +@@ -481,7 +482,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming"); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -28,16 +28,16 @@ DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch, "IPH_DesktopPWAsLinkCapturingLaunch"); DEFINE_VARIATION_PARAM(kIPHToolbarManagementButtonFeature, -@@ -637,7 +638,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHiOSContextualPanelPriceInsightsFeature), +@@ -646,7 +647,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHHomeCustomizationMenuFeature), + VARIATION_ENTRY(kIPHiOSLensOverlayEntrypointTipFeature), #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), -@@ -692,7 +693,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -701,7 +702,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -47,7 +47,7 @@ VARIATION_ENTRY(kIPHAutofillCreditCardBenefitFeature), VARIATION_ENTRY(kIPHAutofillDisabledVirtualCardSuggestionFeature), VARIATION_ENTRY(kIPHAutofillExternalAccountProfileSuggestionFeature), -@@ -744,7 +746,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -753,7 +755,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHScalableIphGamingFeature), #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/chromium/files/patch-components_live__caption_caption__util.cc b/www/chromium/files/patch-components_live__caption_caption__util.cc index 1b4eacfc4ef4..d1b2004ae595 100644 --- a/www/chromium/files/patch-components_live__caption_caption__util.cc +++ b/www/chromium/files/patch-components_live__caption_caption__util.cc @@ -1,6 +1,6 @@ ---- components/live_caption/caption_util.cc.orig 2024-05-21 18:07:39 UTC +--- components/live_caption/caption_util.cc.orig 2024-10-22 08:31:56 UTC +++ components/live_caption/caption_util.cc -@@ -144,7 +144,7 @@ std::string GetCaptionSettingsUrl() { +@@ -139,7 +139,7 @@ std::string GetCaptionSettingsUrl() { return "chrome://os-settings/audioAndCaptions"; #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-components_media__router_common_providers_cast_channel_enum__table.h b/www/chromium/files/patch-components_media__router_common_providers_cast_channel_enum__table.h new file mode 100644 index 000000000000..c6b8c0a27f13 --- /dev/null +++ b/www/chromium/files/patch-components_media__router_common_providers_cast_channel_enum__table.h @@ -0,0 +1,16 @@ +--- components/media_router/common/providers/cast/channel/enum_table.h.orig 2024-10-22 08:31:56 UTC ++++ components/media_router/common/providers/cast/channel/enum_table.h +@@ -368,7 +368,12 @@ class EnumTable { + + private: + #ifdef ARCH_CPU_64_BITS +- alignas(std::hardware_destructive_interference_size) ++#ifdef __cpp_lib_hardware_interference_size ++ using std::hardware_destructive_interference_size; ++#else ++ static constexpr std::size_t hardware_destructive_interference_size = 64; ++#endif ++ alignas(hardware_destructive_interference_size) + #endif + std::initializer_list<Entry> data_; + bool is_sorted_; diff --git a/www/chromium/files/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc b/www/chromium/files/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc index d588c07870e1..1d494b113ce9 100644 --- a/www/chromium/files/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc +++ b/www/chromium/files/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc @@ -1,6 +1,6 @@ ---- components/named_mojo_ipc_server/named_mojo_ipc_server_client_util.cc.orig 2023-02-08 09:03:45 UTC +--- components/named_mojo_ipc_server/named_mojo_ipc_server_client_util.cc.orig 2024-10-22 08:31:56 UTC +++ components/named_mojo_ipc_server/named_mojo_ipc_server_client_util.cc -@@ -22,7 +22,7 @@ namespace named_mojo_ipc_server { +@@ -23,7 +23,7 @@ namespace named_mojo_ipc_server { // static mojo::PlatformChannelEndpoint ConnectToServer( const mojo::NamedPlatformChannel::ServerName& server_name) { 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 5288ef5c78a1..ca60cd2dcd40 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-09-30 07:45:04 UTC +--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2024-10-22 08:31:56 UTC +++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -839,7 +839,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -849,7 +849,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 60266525cdf2..878e509e7640 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-09-30 07:45:04 UTC +--- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2024-10-22 08:31:56 UTC +++ components/network_session_configurator/browser/network_session_configurator_unittest.cc -@@ -828,7 +828,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) { +@@ -855,7 +855,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_os__crypt_async_browser_secret__portal__key__provider.cc b/www/chromium/files/patch-components_os__crypt_async_browser_secret__portal__key__provider.cc new file mode 100644 index 000000000000..22691d376adb --- /dev/null +++ b/www/chromium/files/patch-components_os__crypt_async_browser_secret__portal__key__provider.cc @@ -0,0 +1,12 @@ +--- components/os_crypt/async/browser/secret_portal_key_provider.cc.orig 2024-10-22 08:31:56 UTC ++++ components/os_crypt/async/browser/secret_portal_key_provider.cc +@@ -5,7 +5,9 @@ + #include "components/os_crypt/async/browser/secret_portal_key_provider.h" + + #include <fcntl.h> ++#if BUILDFLAG(IS_LINUX) + #include <linux/limits.h> ++#endif + + #include <array> + #include <utility> diff --git a/www/chromium/files/patch-components_os__crypt_async_common_encryptor.cc b/www/chromium/files/patch-components_os__crypt_async_common_encryptor.cc new file mode 100644 index 000000000000..6b2db4f22792 --- /dev/null +++ b/www/chromium/files/patch-components_os__crypt_async_common_encryptor.cc @@ -0,0 +1,11 @@ +--- components/os_crypt/async/common/encryptor.cc.orig 2024-10-22 08:31:56 UTC ++++ components/os_crypt/async/common/encryptor.cc +@@ -277,7 +277,7 @@ std::optional<std::string> Encryptor::DecryptData( + // or not encryption worked or not, and certainly not advisable to recommend + // a re-encryption of this potentially invalid data. + // TODO(crbug.com/365712505): Remove this fallback. +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && \ ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) && \ + !(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || \ + BUILDFLAG(IS_FUCHSIA) + if (plaintext == string_data) { diff --git a/www/chromium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc b/www/chromium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc index 73647e015c94..1e6502041dea 100644 --- a/www/chromium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc +++ b/www/chromium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc @@ -1,6 +1,6 @@ ---- components/os_crypt/sync/libsecret_util_linux.cc.orig 2024-08-29 09:43:01 UTC +--- components/os_crypt/sync/libsecret_util_linux.cc.orig 2024-10-22 08:31:56 UTC +++ components/os_crypt/sync/libsecret_util_linux.cc -@@ -176,16 +176,22 @@ bool LibsecretLoader::EnsureLibsecretLoaded() { +@@ -185,16 +185,22 @@ bool LibsecretLoader::EnsureLibsecretLoaded() { // static bool LibsecretLoader::LoadLibsecret() { diff --git a/www/chromium/files/patch-components_os__crypt_sync_os__crypt.h b/www/chromium/files/patch-components_os__crypt_sync_os__crypt.h index 604d877954a1..7f7500ae2da4 100644 --- a/www/chromium/files/patch-components_os__crypt_sync_os__crypt.h +++ b/www/chromium/files/patch-components_os__crypt_sync_os__crypt.h @@ -1,4 +1,4 @@ ---- components/os_crypt/sync/os_crypt.h.orig 2024-09-30 07:45:04 UTC +--- components/os_crypt/sync/os_crypt.h.orig 2024-10-22 08:31:56 UTC +++ components/os_crypt/sync/os_crypt.h @@ -14,7 +14,7 @@ #include "build/build_config.h" @@ -67,6 +67,6 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Create the KeyStorage. Will be null if no service is found. A Config must - // be set before every call to this method. - std::unique_ptr<KeyStorageLinux> CreateKeyStorage(); + // Returns a cached string of "peanuts". Is thread-safe. + crypto::SymmetricKey* GetPasswordV10(); + diff --git a/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc b/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc index 38bdbeb90465..067b2bf8cc83 100644 --- a/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc +++ b/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc @@ -1,6 +1,6 @@ ---- components/paint_preview/browser/paint_preview_client.cc.orig 2024-01-30 07:53:34 UTC +--- components/paint_preview/browser/paint_preview_client.cc.orig 2024-10-22 08:31:56 UTC +++ components/paint_preview/browser/paint_preview_client.cc -@@ -313,8 +313,8 @@ void PaintPreviewClient::CapturePaintPreview( +@@ -326,8 +326,8 @@ void PaintPreviewClient::CapturePaintPreview( metadata->set_version(kPaintPreviewVersion); auto* chromeVersion = metadata->mutable_chrome_version(); const auto& current_chrome_version = version_info::GetVersion(); 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 f04769b79cbf..ac43a422645a 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,4 +1,4 @@ ---- components/password_manager/core/browser/features/password_features.cc.orig 2024-08-26 12:06:38 UTC +--- components/password_manager/core/browser/features/password_features.cc.orig 2024-10-22 08:31:56 UTC +++ components/password_manager/core/browser/features/password_features.cc @@ -41,7 +41,7 @@ BASE_FEATURE(kClearUndecryptablePasswords, BASE_FEATURE(kClearUndecryptablePasswordsOnSync, @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -90,7 +90,7 @@ BASE_FEATURE(kPasswordManualFallbackAvailable, +@@ -92,7 +92,7 @@ BASE_FEATURE(kPasswordManualFallbackAvailable, "PasswordManualFallbackAvailable", base::FEATURE_DISABLED_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 6c87ef2f7422..6dfee4f65d4c 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,6 +1,6 @@ ---- components/password_manager/core/browser/features/password_features.h.orig 2024-08-26 12:06:38 UTC +--- components/password_manager/core/browser/features/password_features.h.orig 2024-10-22 08:31:56 UTC +++ components/password_manager/core/browser/features/password_features.h -@@ -90,7 +90,7 @@ BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal); +@@ -93,7 +93,7 @@ BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal); // Enables triggering password suggestions through the context menu. BASE_DECLARE_FEATURE(kPasswordManualFallbackAvailable); 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 79bd3b68dc72..39127f3f2d80 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,6 +1,6 @@ ---- components/password_manager/core/browser/password_form_manager.cc.orig 2024-08-26 12:06:38 UTC +--- components/password_manager/core/browser/password_form_manager.cc.orig 2024-10-22 08:31:56 UTC +++ components/password_manager/core/browser/password_form_manager.cc -@@ -58,7 +58,7 @@ +@@ -61,7 +61,7 @@ #include "components/webauthn/android/webauthn_cred_man_delegate.h" #endif // BUILDFLAG(IS_ANDROID) @@ -9,7 +9,7 @@ #include "components/os_crypt/sync/os_crypt.h" #endif -@@ -228,7 +228,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest +@@ -231,7 +231,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest return false; } @@ -18,7 +18,7 @@ bool ShouldShowKeychainErrorBubble( std::optional<PasswordStoreBackendError> backend_error) { if (!backend_error.has_value()) { -@@ -885,7 +885,7 @@ void PasswordFormManager::OnFetchCompleted() { +@@ -888,7 +888,7 @@ void PasswordFormManager::OnFetchCompleted() { error.value().type); } diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__manager__client.h b/www/chromium/files/patch-components_password__manager_core_browser_password__manager__client.h index 2cdfac9a12cd..8610a7ba5307 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_password__manager__client.h +++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manager__client.h @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/password_manager_client.h.orig 2024-09-30 07:45:04 UTC +--- components/password_manager/core/browser/password_manager_client.h.orig 2024-10-22 08:31:56 UTC +++ components/password_manager/core/browser/password_manager_client.h @@ -30,7 +30,7 @@ #include "net/cert/cert_status_flags.h" @@ -9,8 +9,8 @@ #include "base/i18n/rtl.h" #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h" #include "ui/gfx/geometry/rect_f.h" -@@ -520,7 +520,7 @@ class PasswordManagerClient { - virtual void RefreshPasswordManagerSettingsIfNeeded() const; +@@ -545,7 +545,7 @@ class PasswordManagerClient { + CredentialsCallback callback); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc index aee6b0949fc2..cf5bb1a9ef66 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2024-09-30 07:45:04 UTC +--- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2024-10-22 08:31:56 UTC +++ components/password_manager/core/browser/password_manual_fallback_flow.cc -@@ -41,7 +41,7 @@ std::u16string GetUsernameFromLabel(const std::u16stri +@@ -43,7 +43,7 @@ std::u16string GetUsernameFromLabel(const std::u16stri } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,21 +9,21 @@ // Returns the password form corresponding to the `payload` data. In most // cases there is only one such form stored, but having more than one or no // forms is also possible. If there is more than one form, showing any of them -@@ -251,7 +251,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( - payload.password)); - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (payload.is_cross_domain) { - cross_domain_confirmation_popup_controller_ = - password_client_->ShowCrossDomainConfirmationPopup( -@@ -268,7 +268,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( +@@ -281,7 +281,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( } case autofill::SuggestionType::kViewPasswordDetails: { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - std::optional<password_manager::PasswordForm> form = + std::optional<password_manager::PasswordForm> credentials = GetCorrespondingPasswordForm( suggestion.GetPayload<Suggestion::PasswordSuggestionDetails>(), +@@ -413,7 +413,7 @@ void PasswordManualFallbackFlow::EnsureCrossDomainPass + const Suggestion::PasswordSuggestionDetails& payload, + base::OnceClosure on_allowed) { + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (payload.is_cross_domain) { + cross_domain_confirmation_popup_controller_ = + password_client_->ShowCrossDomainConfirmationPopup( diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h b/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h index 07ee77598b9d..65376b3935fc 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h +++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/password_manual_fallback_flow.h.orig 2024-08-26 12:06:38 UTC +--- components/password_manager/core/browser/password_manual_fallback_flow.h.orig 2024-10-22 08:31:56 UTC +++ components/password_manager/core/browser/password_manual_fallback_flow.h @@ -17,7 +17,7 @@ #include "components/password_manager/core/browser/ui/saved_passwords_presenter.h" @@ -9,7 +9,7 @@ #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || // BUILDFLAG(IS_CHROMEOS) -@@ -161,7 +161,7 @@ class PasswordManualFallbackFlow : public autofill::Au +@@ -178,7 +178,7 @@ class PasswordManualFallbackFlow : public autofill::Au std::unique_ptr<device_reauth::DeviceAuthenticator> authenticator_; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__store__factory__util.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__store__factory__util.cc index 3de7e968a5d1..3e535601d642 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_password__store__factory__util.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_password__store__factory__util.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_store_factory_util.cc.orig 2024-09-30 07:45:04 UTC +--- components/password_manager/core/browser/password_store_factory_util.cc.orig 2024-10-22 08:31:56 UTC +++ components/password_manager/core/browser/password_store_factory_util.cc -@@ -28,7 +28,7 @@ namespace { +@@ -29,7 +29,7 @@ namespace { LoginDatabase::DeletingUndecryptablePasswordsEnabled GetPolicyFromPrefs( PrefService* prefs) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc index ddaad9f4be55..a5b5a858ed4d 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_store/login_database.cc.orig 2024-09-30 07:45:04 UTC +--- components/password_manager/core/browser/password_store/login_database.cc.orig 2024-10-22 08:31:56 UTC +++ components/password_manager/core/browser/password_store/login_database.cc -@@ -1029,7 +1029,7 @@ bool ShouldDeleteUndecryptablePasswords( +@@ -1030,7 +1030,7 @@ bool ShouldDeleteUndecryptablePasswords( bool is_user_data_dir_policy_set, bool is_enabled_by_policy, IsAccountStore is_account_store) { @@ -9,7 +9,7 @@ std::string user_data_dir_string; std::unique_ptr<base::Environment> environment(base::Environment::Create()); // On Linux user data directory ca be specified using an env variable. If it -@@ -1048,7 +1048,7 @@ bool ShouldDeleteUndecryptablePasswords( +@@ -1049,7 +1049,7 @@ bool ShouldDeleteUndecryptablePasswords( return false; } diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc index 0fd29d495bba..cc705fade00b 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig 2024-09-30 07:45:04 UTC +--- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig 2024-10-22 08:31:56 UTC +++ components/password_manager/core/browser/password_store/login_database_unittest.cc -@@ -2228,7 +2228,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent, +@@ -2253,7 +2253,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent, testing::Bool())); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || \ diff --git a/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc b/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc index db84aaa73152..b78b8a31d10f 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/stub_password_manager_client.cc.orig 2024-09-30 07:45:04 UTC +--- components/password_manager/core/browser/stub_password_manager_client.cc.orig 2024-10-22 08:31:56 UTC +++ components/password_manager/core/browser/stub_password_manager_client.cc -@@ -180,7 +180,7 @@ version_info::Channel StubPasswordManagerClient::GetCh +@@ -187,7 +187,7 @@ version_info::Channel StubPasswordManagerClient::GetCh } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ 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 8d461873d90f..2106c6a793b6 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,4 +1,4 @@ ---- components/password_manager/core/common/password_manager_pref_names.h.orig 2024-09-30 07:45:04 UTC +--- components/password_manager/core/common/password_manager_pref_names.h.orig 2024-10-22 08:31:56 UTC +++ components/password_manager/core/common/password_manager_pref_names.h @@ -41,7 +41,7 @@ inline constexpr char kCredentialProviderEnabledOnStar #endif @@ -9,7 +9,7 @@ // Boolean pref controlled by the DeletingUndecryptablePasswordsEnabled policy. // If set to false it blocks deleting undecryptable passwords, otherwise the // deletion can happen. -@@ -333,7 +333,7 @@ inline constexpr char kAutofillableCredentialsAccountS +@@ -334,7 +334,7 @@ inline constexpr char kAutofillableCredentialsAccountS inline constexpr char kPasswordSharingEnabled[] = "password_manager.password_sharing_enabled"; 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 ca58c5e89cb0..f6d626ae9731 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-09-30 07:45:04 UTC +--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2024-10-22 08:31:56 UTC +++ components/policy/core/common/cloud/cloud_policy_client.cc -@@ -668,7 +668,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason +@@ -703,7 +703,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason fetch_request->set_invalidation_payload(invalidation_payload_); } } diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc new file mode 100644 index 000000000000..ebb61849368b --- /dev/null +++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__refresh__scheduler.cc @@ -0,0 +1,20 @@ +--- components/policy/core/common/cloud/cloud_policy_refresh_scheduler.cc.orig 2024-10-22 08:31:56 UTC ++++ components/policy/core/common/cloud/cloud_policy_refresh_scheduler.cc +@@ -25,7 +25,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) + BASE_FEATURE(kRetryWithKeyReset, + "RetryWithKeyReset", + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -220,7 +220,7 @@ void CloudPolicyRefreshScheduler::OnStoreError(CloudPo + // continue using the stale information. Thus, no specific response to a store + // error is required. NB: Changes to is_managed fire OnStoreLoaded(). + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Client is registered means we have successfully get policy key once. However, + // a following policy fetch request is failed because we can't verified + // signature. Delete the policy key so that we can get it again with next diff --git a/www/chromium/files/patch-components_policy_core_common_policy__utils.cc b/www/chromium/files/patch-components_policy_core_common_policy__utils.cc index 016b93fdd378..0bc46b9bd931 100644 --- a/www/chromium/files/patch-components_policy_core_common_policy__utils.cc +++ b/www/chromium/files/patch-components_policy_core_common_policy__utils.cc @@ -1,11 +1,11 @@ ---- components/policy/core/common/policy_utils.cc.orig 2024-09-30 07:45:04 UTC +--- components/policy/core/common/policy_utils.cc.orig 2024-10-22 08:31:56 UTC +++ components/policy/core/common/policy_utils.cc @@ -22,7 +22,7 @@ bool IsPolicyTestingEnabled(PrefService* pref_service, return true; } --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) if (channel == version_info::Channel::DEV) { return true; } diff --git a/www/chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc b/www/chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc index 56b61fba871f..a2dec309ea1a 100644 --- a/www/chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc +++ b/www/chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc @@ -1,6 +1,6 @@ ---- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig 2024-08-26 12:06:38 UTC +--- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig 2024-10-22 08:31:56 UTC +++ components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc -@@ -107,7 +107,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() { +@@ -110,7 +110,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() { return RTLookupRequest::OS_TYPE_CHROME_OS; #elif BUILDFLAG(IS_IOS) return RTLookupRequest::OS_TYPE_IOS; 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 index 01e32b9a0560..150c858666e8 100644 --- a/www/chromium/files/patch-components_safe__browsing_core_common_features.cc +++ b/www/chromium/files/patch-components_safe__browsing_core_common_features.cc @@ -1,6 +1,6 @@ ---- components/safe_browsing/core/common/features.cc.orig 2024-09-30 07:45:04 UTC +--- components/safe_browsing/core/common/features.cc.orig 2024-10-22 08:31:56 UTC +++ components/safe_browsing/core/common/features.cc -@@ -240,7 +240,7 @@ BASE_FEATURE(kRippleForEnhancedProtection, +@@ -237,7 +237,7 @@ BASE_FEATURE(kRippleForEnhancedProtection, BASE_FEATURE(kSafeBrowsingAsyncRealTimeCheck, "SafeBrowsingAsyncRealTimeCheck", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 1cfad1a9dcac..ec0be06ae29d 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-08-26 12:06:38 UTC +--- components/search_engines/search_engine_choice/search_engine_choice_service.cc.orig 2024-10-22 08:31:56 UTC +++ components/search_engines/search_engine_choice/search_engine_choice_service.cc -@@ -610,7 +610,7 @@ void SearchEngineChoiceService::ProcessPendingChoiceSc +@@ -594,7 +594,7 @@ void SearchEngineChoiceService::RegisterLocalStatePref 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 84285f80a757..8e9b5efbf323 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-09-30 07:45:04 UTC +--- components/search_engines/template_url_service.cc.orig 2024-10-22 08:31:56 UTC +++ components/search_engines/template_url_service.cc -@@ -3077,7 +3077,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( +@@ -3060,7 +3060,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_supervised__user_core_browser_supervised__user__service.cc b/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc index 78723238e333..def59d04e4d4 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,6 +1,6 @@ ---- components/supervised_user/core/browser/supervised_user_service.cc.orig 2024-09-30 07:45:04 UTC +--- components/supervised_user/core/browser/supervised_user_service.cc.orig 2024-10-22 08:31:56 UTC +++ components/supervised_user/core/browser/supervised_user_service.cc -@@ -173,7 +173,7 @@ FirstTimeInterstitialBannerState SupervisedUserService +@@ -152,7 +152,7 @@ FirstTimeInterstitialBannerState SupervisedUserService const FirstTimeInterstitialBannerState original_state) { FirstTimeInterstitialBannerState target_state = original_state; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 ed4f30d21f29..cd5634d0d346 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,4 +1,4 @@ ---- components/supervised_user/core/common/features.cc.orig 2024-08-26 12:06:38 UTC +--- components/supervised_user/core/common/features.cc.orig 2024-10-22 08:31:56 UTC +++ components/supervised_user/core/common/features.cc @@ -66,7 +66,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt "UpdatedSupervisedUserExtensionApprovalStrings", @@ -18,8 +18,8 @@ bool skipParentApprovalEnabled = base::FeatureList::IsEnabled( kEnableSupervisedUserSkipParentApprovalToInstallExtensions); bool permissionExtensionsForSupervisedUsersEnabled = -@@ -106,13 +106,13 @@ BASE_FEATURE(kCustomWebSignInInterceptForSupervisedUse - "CustomWebSignInInterceptForSupervisedUsersUi", +@@ -106,13 +106,13 @@ BASE_FEATURE(kSupervisedUserProfileSigninIPH, + "SupervisedUserProfileSigninIPH", base::FEATURE_DISABLED_BY_DEFAULT); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) 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 8ab1b6e8cd23..6cf0745000d2 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,4 +1,4 @@ ---- components/supervised_user/core/common/features.h.orig 2024-08-26 12:06:38 UTC +--- components/supervised_user/core/common/features.h.orig 2024-10-22 08:31:56 UTC +++ components/supervised_user/core/common/features.h @@ -25,7 +25,7 @@ BASE_DECLARE_FEATURE( // Applies new informative strings during the parental extension approval flow. @@ -9,7 +9,7 @@ BASE_DECLARE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop); #endif -@@ -62,11 +62,11 @@ BASE_DECLARE_FEATURE(kCustomWebSignInInterceptForSuper +@@ -59,11 +59,11 @@ BASE_DECLARE_FEATURE(kSupervisedUserProfileSigninIPH); // Displays a Family Link kite badge on the supervised user avatar in various // surfaces. @@ -23,7 +23,7 @@ // This hides the following guest mode entry points for supervised users: // // * In the Profile menu for supervised profiles -@@ -78,7 +78,7 @@ BASE_DECLARE_FEATURE(kHideGuestModeForSupervisedUsers) +@@ -75,7 +75,7 @@ BASE_DECLARE_FEATURE(kHideGuestModeForSupervisedUsers) // unauthenticated (e.g. signed out of the content area) account. BASE_DECLARE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers); diff --git a/www/chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc b/www/chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc index 312462812ef6..1456bed34486 100644 --- a/www/chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc +++ b/www/chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc @@ -1,6 +1,6 @@ ---- components/trusted_vault/trusted_vault_connection_impl.cc.orig 2024-08-26 12:06:38 UTC +--- components/trusted_vault/trusted_vault_connection_impl.cc.orig 2024-10-22 08:31:56 UTC +++ components/trusted_vault/trusted_vault_connection_impl.cc -@@ -101,7 +101,7 @@ GetLocalPhysicalDeviceType() { +@@ -102,7 +102,7 @@ GetLocalPhysicalDeviceType() { // currently used or even built on all platforms. #if BUILDFLAG(IS_CHROMEOS) return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_CHROMEOS; diff --git a/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc b/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc index df37ad89d85f..1cfda550005e 100644 --- a/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc +++ b/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc @@ -1,6 +1,6 @@ ---- components/user_education/views/help_bubble_view.cc.orig 2024-08-26 12:06:38 UTC +--- components/user_education/views/help_bubble_view.cc.orig 2024-10-22 08:31:56 UTC +++ components/user_education/views/help_bubble_view.cc -@@ -856,7 +856,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { +@@ -852,7 +852,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params, views::Widget* widget) const { BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget); diff --git a/www/chromium/files/patch-components_variations_service_variations__service.cc b/www/chromium/files/patch-components_variations_service_variations__service.cc index dfd5486e70d8..1173e10c582f 100644 --- a/www/chromium/files/patch-components_variations_service_variations__service.cc +++ b/www/chromium/files/patch-components_variations_service_variations__service.cc @@ -1,6 +1,6 @@ ---- components/variations/service/variations_service.cc.orig 2024-07-30 11:12:21 UTC +--- components/variations/service/variations_service.cc.orig 2024-10-22 08:31:56 UTC +++ components/variations/service/variations_service.cc -@@ -101,7 +101,7 @@ std::string GetPlatformString() { +@@ -102,7 +102,7 @@ std::string GetPlatformString() { return "android"; #elif BUILDFLAG(IS_FUCHSIA) return "fuchsia"; diff --git a/www/chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc b/www/chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc index 12695a039ea0..640f5b1879fd 100644 --- a/www/chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc +++ b/www/chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc @@ -1,6 +1,6 @@ ---- components/visited_url_ranking/public/url_visit_util.cc.orig 2024-08-26 12:06:38 UTC +--- components/visited_url_ranking/public/url_visit_util.cc.orig 2024-10-22 08:31:56 UTC +++ components/visited_url_ranking/public/url_visit_util.cc -@@ -62,7 +62,7 @@ PlatformType GetPlatformInput() { +@@ -66,7 +66,7 @@ PlatformType GetPlatformInput() { return PlatformType::kWindows; #elif BUILDFLAG(IS_MAC) return PlatformType::kMac; 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 a223a4a7d8a4..672cce559eca 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-09-30 07:45:04 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2024-10-22 08:31:56 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1575,7 +1575,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1498,7 +1498,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, vk_format, si_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 110ffd4bd0c4..7c918ed9c215 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-09-30 07:45:04 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2024-10-22 08:31:56 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1449,7 +1449,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1363,7 +1363,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 9f1d3ce3ac1a..2f0a0f07e57d 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,4 +1,4 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2024-09-30 07:45:04 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2024-10-22 08:31:56 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc @@ -113,7 +113,7 @@ RootCompositorFrameSinkImpl::Create( output_surface->SetNeedsSwapSizeNotifications( @@ -9,7 +9,7 @@ // 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); -@@ -789,7 +789,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -793,7 +793,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw if (display_client_ && enable_swap_completion_callback_) { display_client_->DidCompleteSwapWithSize(pixel_size); } diff --git a/www/chromium/files/patch-content_app_content__main.cc b/www/chromium/files/patch-content_app_content__main.cc index 8749dfb9d050..401975e5cb45 100644 --- a/www/chromium/files/patch-content_app_content__main.cc +++ b/www/chromium/files/patch-content_app_content__main.cc @@ -1,6 +1,6 @@ ---- content/app/content_main.cc.orig 2024-09-30 07:45:04 UTC +--- content/app/content_main.cc.orig 2024-10-22 08:31:56 UTC +++ content/app/content_main.cc -@@ -205,7 +205,7 @@ RunContentProcess(ContentMainParams params, +@@ -227,7 +227,7 @@ NO_STACK_PROTECTOR int RunContentProcess( base::EnableTerminationOnOutOfMemory(); logging::RegisterAbslAbortHook(); @@ -9,7 +9,7 @@ // The various desktop environments set this environment variable that // allows the dbus client library to connect directly to the bus. When this // variable is not set (test environments like xvfb-run), the dbus client -@@ -291,7 +291,7 @@ RunContentProcess(ContentMainParams params, +@@ -313,7 +313,7 @@ NO_STACK_PROTECTOR int RunContentProcess( command_line->AppendSwitch(switches::kUseMobileUserAgent); #endif diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc index 732193ecbe72..c5d0ac7169e7 100644 --- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc @@ -1,4 +1,4 @@ ---- content/app/content_main_runner_impl.cc.orig 2024-09-30 07:45:04 UTC +--- content/app/content_main_runner_impl.cc.orig 2024-10-22 08:31:56 UTC +++ content/app/content_main_runner_impl.cc @@ -147,18 +147,20 @@ #include "content/browser/posix_file_descriptor_info_impl.h" @@ -71,7 +71,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -764,7 +780,7 @@ RunOtherNamedProcessTypeMain(const std::string& proces +@@ -764,7 +780,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain( unregister_thread_closure = base::HangWatcher::RegisterThread( base::HangWatcher::ThreadType::kMainThread); bool start_hang_watcher_now; @@ -94,7 +94,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1055,8 +1070,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1059,8 +1074,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } @@ -115,7 +115,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1153,6 +1180,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1157,6 +1184,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn index 5835ce265d44..f883f47f0a8b 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-09-30 07:45:04 UTC +--- content/browser/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ content/browser/BUILD.gn -@@ -2427,6 +2427,14 @@ source_set("browser") { +@@ -2432,6 +2432,14 @@ source_set("browser") { ] } @@ -15,7 +15,7 @@ if (is_linux || is_chromeos) { sources += [ "child_process_launcher_helper_linux.cc", -@@ -2467,6 +2475,15 @@ source_set("browser") { +@@ -2475,6 +2483,15 @@ source_set("browser") { if (allow_oop_video_decoder) { sources += [ "media/stable_video_decoder_factory.cc" ] deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] 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 34ef7a808c95..aa1999312cbb 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,4 +1,4 @@ ---- content/browser/browser_main_loop.cc.orig 2024-09-30 07:45:04 UTC +--- content/browser/browser_main_loop.cc.orig 2024-10-22 08:31:56 UTC +++ content/browser/browser_main_loop.cc @@ -250,6 +250,12 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" @@ -26,8 +26,8 @@ #endif // GLib's spawning of new processes is buggy, so it's important that at this -@@ -582,7 +594,7 @@ int BrowserMainLoop::EarlyInitialization() { - base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing); +@@ -583,7 +595,7 @@ int BrowserMainLoop::EarlyInitialization() { + base::ThreadType::kDisplayCritical); #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID) diff --git a/www/chromium/files/patch-content_browser_child__thread__type__switcher__linux.cc b/www/chromium/files/patch-content_browser_child__thread__type__switcher__linux.cc index 80f012e6e411..b6d4bac5c477 100644 --- a/www/chromium/files/patch-content_browser_child__thread__type__switcher__linux.cc +++ b/www/chromium/files/patch-content_browser_child__thread__type__switcher__linux.cc @@ -1,4 +1,4 @@ ---- content/browser/child_thread_type_switcher_linux.cc.orig 2024-05-21 18:07:39 UTC +--- content/browser/child_thread_type_switcher_linux.cc.orig 2024-10-22 08:31:56 UTC +++ content/browser/child_thread_type_switcher_linux.cc @@ -20,6 +20,9 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee base::ThreadType thread_type) { @@ -10,7 +10,7 @@ bool ns_pid_supported = false; pid_t peer_tid = base::FindThreadID(peer_pid, ns_tid, &ns_pid_supported); if (peer_tid == -1) { -@@ -38,6 +41,7 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee +@@ -39,6 +42,7 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee base::PlatformThread::SetThreadType(peer_pid, peer_tid, thread_type, base::IsViaIPC(true)); 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 4f527fd65e01..ce993ceadd12 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-08-26 12:06:38 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2024-10-22 08:31:56 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1685,7 +1685,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1661,7 +1661,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode); } diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc b/www/chromium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc index 02b9cbae7b8f..9b70735a3835 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_memory_buffer_manager_singleton.cc.orig 2024-02-23 21:04:38 UTC +--- content/browser/gpu/gpu_memory_buffer_manager_singleton.cc.orig 2024-10-22 08:31:56 UTC +++ content/browser/gpu/gpu_memory_buffer_manager_singleton.cc -@@ -54,7 +54,7 @@ scoped_refptr<base::SingleThreadTaskRunner> GetTaskRun +@@ -46,7 +46,7 @@ scoped_refptr<base::SingleThreadTaskRunner> GetTaskRun #endif } @@ -9,10 +9,10 @@ bool IsGpuMemoryBufferNV12Supported() { static bool is_computed = false; static bool supported = false; -@@ -117,7 +117,7 @@ void GpuMemoryBufferManagerSingleton::OnGpuExtraInfoUp - SetNativeConfigurations(std::move(configs)); - } - #endif // BUILDFLAG(IS_OZONE_X11) +@@ -98,7 +98,7 @@ GpuMemoryBufferManagerSingleton::GetInstance() { + } + + void GpuMemoryBufferManagerSingleton::OnGpuExtraInfoUpdate() { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Dynamic check whether the NV12 format is supported as it may be 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 d6b52ec8026c..09d9736bd80c 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,6 +1,6 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2024-07-30 11:12:21 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2024-10-22 08:31:56 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -273,6 +273,7 @@ static const char* const kSwitchNames[] = { +@@ -275,6 +275,7 @@ static const char* const kSwitchNames[] = { switches::kEnableLowEndDeviceMode, switches::kDisableSkiaGraphite, switches::kDisableLowEndDeviceMode, @@ -8,7 +8,7 @@ switches::kProfilingAtStart, switches::kProfilingFile, switches::kProfilingFlush, -@@ -300,7 +301,7 @@ static const char* const kSwitchNames[] = { +@@ -302,7 +303,7 @@ static const char* const kSwitchNames[] = { switches::kOzoneDumpFile, switches::kEnableNativeGpuMemoryBuffers, #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 8f0c451babe2..8282da8edfd9 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-09-30 07:45:04 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2024-10-22 08:31:56 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -219,7 +219,7 @@ +@@ -220,7 +220,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 -@@ -1027,7 +1027,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1082,7 +1082,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; -@@ -1200,7 +1200,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost +@@ -1263,7 +1263,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost void RenderProcessHostImpl::IOThreadHostImpl::SetPid( base::ProcessId child_pid) { @@ -27,7 +27,7 @@ child_thread_type_switcher_.SetPid(child_pid); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -3232,7 +3232,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( +@@ -3286,7 +3286,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( base::TimeTicks::UnixEpoch().since_origin().InMicroseconds())); } @@ -36,7 +36,7 @@ // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support // for NV12 GPU memory buffer. if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() && -@@ -3288,6 +3288,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3342,6 +3342,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, @@ -44,7 +44,7 @@ switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, switches::kDisableWebGLImageChromium, -@@ -5060,7 +5061,7 @@ uint64_t RenderProcessHostImpl::GetPrivateMemoryFootpr +@@ -5112,7 +5113,7 @@ uint64_t RenderProcessHostImpl::GetPrivateMemoryFootpr // - Win: https://crbug.com/707022 . uint64_t total_size = 0; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h index ff26d4ae3bf8..4172bb8f7536 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2024-09-30 07:45:04 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2024-10-22 08:31:56 UTC +++ content/browser/renderer_host/render_process_host_impl.h @@ -102,7 +102,7 @@ #include "media/fuchsia_media_codec_provider_impl.h" @@ -9,7 +9,7 @@ #include "content/browser/child_thread_type_switcher_linux.h" #include "media/mojo/mojom/video_encode_accelerator.mojom.h" #endif -@@ -611,7 +611,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -612,7 +612,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); @@ -18,7 +18,7 @@ // Launch the zygote early in the browser startup. static void EarlyZygoteLaunch(); #endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC) -@@ -976,7 +976,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -977,7 +977,7 @@ class CONTENT_EXPORT RenderProcessHostImpl std::unique_ptr<service_manager::BinderRegistry> binders_; mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; 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 df089d80a556..2e7c8683a2bb 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-08-26 12:06:38 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2024-10-22 08:31:56 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -274,7 +274,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -275,7 +275,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 262bce0a4b47..0c472ef1acc8 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,24 +1,24 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2024-09-30 07:45:04 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2024-10-22 08:31:56 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -120,7 +120,7 @@ +@@ -121,7 +121,7 @@ #include "ui/gfx/gdi_util.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "content/browser/accessibility/browser_accessibility_auralinux.h" + #include "ui/accessibility/platform/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/text_input_flags.h" -@@ -483,7 +483,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -484,7 +484,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - BrowserAccessibilityManager* manager = + ui::BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1744,7 +1744,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1745,7 +1745,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return host() && host()->delegate() && host()->delegate()->ShouldDoLearning(); } @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2588,7 +2588,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2654,7 +2654,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2772,7 +2772,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2838,7 +2838,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 89810b967104..ff228e807536 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-09-30 07:45:04 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2024-10-22 08:31:56 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.h -@@ -261,7 +261,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -267,7 +267,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 090de06896e1..06521a91466e 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-09-30 07:45:04 UTC +--- content/browser/utility_process_host.cc.orig 2024-10-22 08:31:56 UTC +++ content/browser/utility_process_host.cc @@ -62,7 +62,7 @@ #include "content/browser/v8_snapshot_files.h" @@ -45,7 +45,7 @@ allowed_gpu_ = true; #endif } -@@ -408,7 +408,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -406,7 +406,7 @@ bool UtilityProcessHost::StartProcess() { file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload(*cmd_line)); #endif // BUILDFLAG(IS_POSIX) @@ -54,7 +54,7 @@ // The network service should have access to the parent directories // necessary for its usage. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { -@@ -419,13 +419,13 @@ bool UtilityProcessHost::StartProcess() { +@@ -417,13 +417,13 @@ bool UtilityProcessHost::StartProcess() { } #endif // BUILDFLAG(IS_LINUX) diff --git a/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc b/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc index 7b0bb7c8dcfc..e08b42921339 100644 --- a/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc +++ b/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc @@ -1,4 +1,4 @@ ---- content/browser/utility_sandbox_delegate.cc.orig 2024-08-26 12:06:38 UTC +--- content/browser/utility_sandbox_delegate.cc.orig 2024-10-22 08:31:56 UTC +++ content/browser/utility_sandbox_delegate.cc @@ -76,10 +76,10 @@ UtilitySandboxedProcessLauncherDelegate:: #if BUILDFLAG(IS_FUCHSIA) @@ -13,7 +13,7 @@ sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -136,10 +136,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe +@@ -137,10 +137,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe // process upon startup. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork || sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceModelExecution || diff --git a/www/chromium/files/patch-content_common_features.cc b/www/chromium/files/patch-content_common_features.cc index 16d434f0ccb9..601722243491 100644 --- a/www/chromium/files/patch-content_common_features.cc +++ b/www/chromium/files/patch-content_common_features.cc @@ -1,4 +1,4 @@ ---- content/common/features.cc.orig 2024-09-30 07:45:04 UTC +--- content/common/features.cc.orig 2024-10-22 08:31:56 UTC +++ content/common/features.cc @@ -143,7 +143,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe base::FEATURE_ENABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ BASE_FEATURE(kEnableDevToolsJsErrorReporting, "EnableDevToolsJsErrorReporting", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -293,7 +293,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin, +@@ -299,7 +299,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 c7448b823110..74d24b9f07c5 100644 --- a/www/chromium/files/patch-content_common_features.h +++ b/www/chromium/files/patch-content_common_features.h @@ -1,4 +1,4 @@ ---- content/common/features.h.orig 2024-09-30 07:45:04 UTC +--- content/common/features.h.orig 2024-10-22 08:31:56 UTC +++ content/common/features.h @@ -34,7 +34,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableBackForwardCacheForScreenReader); @@ -9,7 +9,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableDevToolsJsErrorReporting); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) CONTENT_EXPORT BASE_DECLARE_FEATURE(kEmbeddingRequiresOptIn); -@@ -75,7 +75,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> +@@ -76,7 +76,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_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index a9fd37ea1a84..52846da0be3a 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,4 +1,4 @@ ---- content/gpu/gpu_main.cc.orig 2024-09-30 07:45:04 UTC +--- content/gpu/gpu_main.cc.orig 2024-10-22 08:31:56 UTC +++ content/gpu/gpu_main.cc @@ -95,10 +95,14 @@ #include "sandbox/win/src/sandbox.h" @@ -53,7 +53,7 @@ // Thread type delegate of the process should be registered before // thread type change below for the main thread and for thread pool in // ChildProcess constructor. -@@ -438,7 +443,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -439,7 +444,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { @@ -62,7 +62,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -478,7 +483,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -479,7 +484,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 c732d8b36942..8e600106e754 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-09-30 07:45:04 UTC +--- content/public/browser/content_browser_client.cc.orig 2024-10-22 08:31:56 UTC +++ content/public/browser/content_browser_client.cc -@@ -1331,7 +1331,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem +@@ -1330,7 +1330,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_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc index 2a550760bddc..4fdacd312524 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,4 +1,4 @@ ---- content/public/common/content_features.cc.orig 2024-09-30 07:45:04 UTC +--- content/public/common/content_features.cc.orig 2024-10-22 08:31:56 UTC +++ content/public/common/content_features.cc @@ -65,7 +65,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, // TODO(crbug.com/40118868): Remove !IS_CHROMEOS_LACROS once lacros starts being @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1174,9 +1174,9 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1206,9 +1206,9 @@ BASE_FEATURE(kWebAssemblyTiering, BASE_FEATURE(kWebAssemblyTrapHandler, "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -21,7 +21,7 @@ defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -1213,7 +1213,11 @@ BASE_FEATURE(kWebUICodeCache, +@@ -1245,7 +1245,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 5d41acf95e1f..a206f6021364 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.cc +++ b/www/chromium/files/patch-content_public_common_content__switches.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.cc.orig 2024-09-30 07:45:04 UTC +--- content/public/common/content_switches.cc.orig 2024-10-22 08:31:56 UTC +++ content/public/common/content_switches.cc -@@ -349,6 +349,8 @@ const char kEnableIsolatedWebAppsInRenderer[] = +@@ -350,6 +350,8 @@ const char kEnableIsolatedWebAppsInRenderer[] = // builds. const char kEnableLogging[] = "enable-logging"; @@ -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. -@@ -983,7 +985,7 @@ const char kPreventResizingContentsForTesting[] = +@@ -976,7 +978,7 @@ const char kPreventResizingContentsForTesting[] = // TODO(crbug.com/40118868): 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 0c49a622d706..ef1af9970a7c 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,4 +1,4 @@ ---- content/public/common/content_switches.h.orig 2024-09-30 07:45:04 UTC +--- content/public/common/content_switches.h.orig 2024-10-22 08:31:56 UTC +++ content/public/common/content_switches.h @@ -110,6 +110,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[]; @@ -8,7 +8,7 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -267,7 +268,7 @@ CONTENT_EXPORT extern const char kPreventResizingConte +@@ -266,7 +267,7 @@ CONTENT_EXPORT extern const char kPreventResizingConte // TODO(crbug.com/40118868): 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 60ec66fe749f..deafe1af536d 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-09-30 07:45:04 UTC +--- content/renderer/render_thread_impl.cc.orig 2024-10-22 08:31:56 UTC +++ content/renderer/render_thread_impl.cc @@ -215,6 +215,8 @@ @@ -27,7 +27,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) && -@@ -1817,7 +1819,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create +@@ -1815,7 +1817,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_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc index 4b25b9b47a45..14f6fd09cc64 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2024-09-30 07:45:04 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2024-10-22 08:31:56 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -129,7 +129,7 @@ +@@ -127,7 +127,7 @@ #if BUILDFLAG(IS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -199,13 +199,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -197,13 +197,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( is_locked_to_site_(false), main_thread_scheduler_(main_thread_scheduler), next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) { @@ -25,7 +25,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -225,7 +225,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -223,7 +223,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -34,7 +34,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -286,7 +286,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -284,7 +284,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl #endif blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index 9980c3e8a6ed..521415dca991 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2024-09-30 07:45:04 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2024-10-22 08:31:56 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -257,7 +257,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -255,7 +255,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) const; diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index 08b8f5b3e0e7..7299106814f4 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-09-30 07:45:04 UTC +--- content/shell/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ content/shell/BUILD.gn -@@ -1082,7 +1082,7 @@ group("content_shell_crash_test") { +@@ -1084,7 +1084,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_utility_services.cc b/www/chromium/files/patch-content_utility_services.cc index ada9a944100b..e5d042c751aa 100644 --- a/www/chromium/files/patch-content_utility_services.cc +++ b/www/chromium/files/patch-content_utility_services.cc @@ -1,4 +1,4 @@ ---- content/utility/services.cc.orig 2024-09-30 07:45:04 UTC +--- content/utility/services.cc.orig 2024-10-22 08:31:56 UTC +++ content/utility/services.cc @@ -74,7 +74,7 @@ extern sandbox::TargetServices* g_utility_target_services; @@ -52,7 +52,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) { #else -@@ -396,7 +396,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( +@@ -395,7 +395,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -61,7 +61,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) auto RunStableVideoDecoderFactoryProcessService( mojo::PendingReceiver< -@@ -407,7 +407,7 @@ auto RunStableVideoDecoderFactoryProcessService( +@@ -406,7 +406,7 @@ auto RunStableVideoDecoderFactoryProcessService( #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) @@ -70,7 +70,7 @@ auto RunVideoEncodeAcceleratorProviderFactory( mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory> receiver) { -@@ -430,7 +430,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se +@@ -429,7 +429,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se // loop of type IO that can get notified when pipes have data. services.Add(RunNetworkService); @@ -79,7 +79,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) if (base::FeatureList::IsEnabled( features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) { -@@ -486,7 +486,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -485,7 +485,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -88,7 +88,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) if (!base::FeatureList::IsEnabled( features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) { -@@ -495,7 +495,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -494,7 +494,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_utility__main.cc b/www/chromium/files/patch-content_utility_utility__main.cc index f1cc2fde53e8..70de06b3e8f0 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-08-26 12:06:38 UTC +--- content/utility/utility_main.cc.orig 2024-10-22 08:31:56 UTC +++ content/utility/utility_main.cc @@ -36,17 +36,21 @@ #include "services/screen_ai/buildflags/buildflags.h" @@ -97,16 +97,16 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -292,7 +304,7 @@ int UtilityMain(MainFunctionParams parameters) { - screen_ai::GetBinaryPathSwitch())); - break; - #endif +@@ -295,7 +307,7 @@ int UtilityMain(MainFunctionParams parameters) { + case sandbox::mojom::Sandbox::kVideoEffects: + // TODO(crbug.com/361128453): Implement this. + NOTREACHED() << "kVideoEffects sandbox not implemented."; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) case sandbox::mojom::Sandbox::kHardwareVideoDecoding: pre_sandbox_hook = base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); -@@ -319,6 +331,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -322,6 +334,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -114,7 +114,7 @@ if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { sandbox_options.use_amd_specific_policies = -@@ -326,6 +339,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -329,6 +342,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_browser_api_api__browser__context__keyed__service__factories.cc b/www/chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc index eb693bb66ab9..416d8125faa8 100644 --- a/www/chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2024-09-30 07:45:04 UTC +--- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2024-10-22 08:31:56 UTC +++ extensions/browser/api/api_browser_context_keyed_service_factories.cc -@@ -111,7 +111,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt +@@ -114,7 +114,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt #endif MessageService::GetFactoryInstance(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ diff --git a/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc b/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc index 80e3d05fea23..e3d0e4445047 100644 --- a/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc +++ b/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc @@ -1,6 +1,6 @@ ---- extensions/renderer/bindings/api_binding_util.cc.orig 2022-02-28 16:54:41 UTC +--- extensions/renderer/bindings/api_binding_util.cc.orig 2024-10-22 08:31:56 UTC +++ extensions/renderer/bindings/api_binding_util.cc -@@ -132,7 +132,7 @@ std::string GetPlatformString() { +@@ -133,7 +133,7 @@ std::string GetPlatformString() { return "lacros"; #elif BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_CHROMEOS_LACROS) return "chromeos"; diff --git a/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc b/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc index bc82da76db4d..9d5efdec427a 100644 --- a/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc +++ b/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc @@ -1,6 +1,6 @@ ---- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2023-05-31 08:12:17 UTC +--- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2024-10-22 08:31:56 UTC +++ extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc -@@ -44,7 +44,7 @@ void ShellRuntimeAPIDelegate::OpenURL(const GURL& unin +@@ -45,7 +45,7 @@ void ShellRuntimeAPIDelegate::OpenURL(const GURL& unin bool ShellRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) { #if BUILDFLAG(IS_CHROMEOS_ASH) info->os = api::runtime::PlatformOs::kCros; 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 e64231af962c..90b798d5a10d 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-09-30 07:45:04 UTC +--- gpu/command_buffer/service/dawn_context_provider.cc.orig 2024-10-22 08:31:56 UTC +++ gpu/command_buffer/service/dawn_context_provider.cc -@@ -170,7 +170,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke +@@ -307,7 +307,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_shared__context__state.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__context__state.cc new file mode 100644 index 000000000000..3234d027675b --- /dev/null +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__context__state.cc @@ -0,0 +1,29 @@ +--- gpu/command_buffer/service/shared_context_state.cc.orig 2024-10-22 08:31:56 UTC ++++ gpu/command_buffer/service/shared_context_state.cc +@@ -56,7 +56,7 @@ + #include "gpu/vulkan/vulkan_implementation.h" + #include "gpu/vulkan/vulkan_util.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "gpu/command_buffer/service/external_semaphore_pool.h" + #endif + +@@ -287,7 +287,7 @@ SharedContextState::SharedContextState( + if (gr_context_type_ == GrContextType::kVulkan) { + if (vk_context_provider_) { + #if BUILDFLAG(ENABLE_VULKAN) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) + external_semaphore_pool_ = std::make_unique<ExternalSemaphorePool>(this); + #endif + use_virtualized_gl_contexts_ = false; +@@ -320,7 +320,7 @@ SharedContextState::~SharedContextState() { + transfer_cache_.reset(); + + #if BUILDFLAG(ENABLE_VULKAN) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) + external_semaphore_pool_.reset(); + #endif + diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__context__state.h b/www/chromium/files/patch-gpu_command__buffer_service_shared__context__state.h new file mode 100644 index 000000000000..24740c9e72c3 --- /dev/null +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__context__state.h @@ -0,0 +1,20 @@ +--- gpu/command_buffer/service/shared_context_state.h.orig 2024-10-22 08:31:56 UTC ++++ gpu/command_buffer/service/shared_context_state.h +@@ -222,7 +222,7 @@ class GPU_GLES2_EXPORT SharedContextState + return &memory_type_tracker_; + } + #if BUILDFLAG(ENABLE_VULKAN) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) + ExternalSemaphorePool* external_semaphore_pool() { + return external_semaphore_pool_.get(); + } +@@ -429,7 +429,7 @@ class GPU_GLES2_EXPORT SharedContextState + bool disable_check_reset_status_throttling_for_test_ = false; + + #if BUILDFLAG(ENABLE_VULKAN) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) + std::unique_ptr<ExternalSemaphorePool> external_semaphore_pool_; + #endif + diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc index a666bb3d1c69..a53b3e28f14f 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2024-09-30 07:45:04 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2024-10-22 08:31:56 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc @@ -59,7 +59,7 @@ #include "ui/gl/gl_version_info.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" #if BUILDFLAG(DAWN_ENABLE_BACKEND_OPENGLES) #include "gpu/command_buffer/service/shared_image/dawn_gl_texture_representation.h" -@@ -739,7 +739,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma +@@ -727,7 +727,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma wgpu::BackendType backend_type, std::vector<wgpu::TextureFormat> view_formats, scoped_refptr<SharedContextState> context_state) { diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc new file mode 100644 index 000000000000..3c7a9ee9f458 --- /dev/null +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc @@ -0,0 +1,11 @@ +--- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2024-10-22 08:31:56 UTC ++++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc +@@ -142,7 +142,7 @@ bool IsFormatSupported(viz::SharedImageFormat format, + } // namespace + + constexpr SharedImageUsageSet kSupportedUsage = +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) + SHARED_IMAGE_USAGE_WEBGPU_READ | SHARED_IMAGE_USAGE_WEBGPU_WRITE | + SHARED_IMAGE_USAGE_WEBGPU_SWAP_CHAIN_TEXTURE | + SHARED_IMAGE_USAGE_WEBGPU_STORAGE_TEXTURE | diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc index 0e75f997bec5..e9fc91131f89 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc @@ -1,6 +1,15 @@ ---- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2024-09-30 07:45:04 UTC +--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2024-10-22 08:31:56 UTC +++ gpu/command_buffer/service/shared_image/shared_image_factory.cc -@@ -122,7 +122,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { +@@ -48,7 +48,7 @@ + #include "gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.h" + #include "gpu/vulkan/vulkan_device_queue.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.h" + #endif + +@@ -112,7 +112,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER; @@ -9,3 +18,12 @@ return gfx::GpuMemoryBufferType::NATIVE_PIXMAP; #elif BUILDFLAG(IS_WIN) return gfx::GpuMemoryBufferType::DXGI_SHARED_HANDLE; +@@ -315,7 +315,7 @@ SharedImageFactory::SharedImageFactory( + context_state_, workarounds_); + factories_.push_back(std::move(ozone_factory)); + } +-#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA)) ++#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)) + if (gr_context_type_ == GrContextType::kVulkan) { + auto external_vk_image_factory = + std::make_unique<ExternalVkImageBackingFactory>(context_state_); 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 d625b3b69697..eda9c1460799 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-09-30 07:45:04 UTC +--- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2024-10-22 08:31:56 UTC +++ gpu/command_buffer/service/shared_image/shared_image_manager.cc -@@ -576,7 +576,7 @@ bool SharedImageManager::SupportsScanoutImages() { +@@ -603,7 +603,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 c726da7beb96..d37de69df23a 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-09-30 07:45:04 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2024-10-22 08:31:56 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1308,7 +1308,7 @@ WGPUFuture WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1309,7 +1309,7 @@ WGPUFuture WebGPUDecoderImpl::RequestAdapterImpl( force_fallback_adapter = true; } @@ -9,7 +9,7 @@ if (!shared_context_state_->GrContextIsVulkan() && !shared_context_state_->IsGraphiteDawnVulkan() && use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) { -@@ -1977,7 +1977,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( +@@ -1978,7 +1978,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 18d5e36e27e2..a3f0d6b9435d 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-07-30 11:12:21 UTC +--- gpu/config/gpu_finch_features.cc.orig 2024-10-22 08:31:56 UTC +++ gpu/config/gpu_finch_features.cc -@@ -157,7 +157,7 @@ const base::FeatureParam<std::string> +@@ -150,7 +150,7 @@ const base::FeatureParam<std::string> BASE_FEATURE(kDefaultEnableGpuRasterization, "DefaultEnableGpuRasterization", #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,12 +9,12 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -170,7 +170,7 @@ BASE_FEATURE(kCanvasOopRasterization, +@@ -163,7 +163,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) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-gpu_config_gpu__info__collector.cc b/www/chromium/files/patch-gpu_config_gpu__info__collector.cc index 3b7e4ddcbb9e..db3219d9b43c 100644 --- a/www/chromium/files/patch-gpu_config_gpu__info__collector.cc +++ b/www/chromium/files/patch-gpu_config_gpu__info__collector.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_info_collector.cc.orig 2024-09-30 07:45:04 UTC +--- gpu/config/gpu_info_collector.cc.orig 2024-10-22 08:31:56 UTC +++ gpu/config/gpu_info_collector.cc -@@ -370,7 +370,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance +@@ -368,7 +368,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance void ReportWebGPUSupportMetrics(dawn::native::Instance* instance) { static BASE_FEATURE(kCollectWebGPUSupportMetrics, "CollectWebGPUSupportMetrics", diff --git a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc index 297d7701bf26..961f45a601d6 100644 --- a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc +++ b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc @@ -1,4 +1,4 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2023-08-17 07:33:31 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2024-10-22 08:31:56 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.cc @@ -26,7 +26,7 @@ #include "ui/ozone/public/ozone_platform.h" @@ -9,7 +9,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" #endif -@@ -56,7 +56,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() +@@ -55,7 +55,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() return gfx::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::ANDROID_HARDWARE_BUFFER; diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc index 22009bb2bdd6..e6b775a9e6e8 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc @@ -1,4 +1,4 @@ ---- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2024-08-26 12:06:38 UTC +--- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2024-10-22 08:31:56 UTC +++ gpu/ipc/service/gpu_memory_buffer_factory.cc @@ -14,7 +14,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h" @@ -9,10 +9,10 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h" #endif -@@ -37,7 +37,7 @@ GpuMemoryBufferFactory::CreateNativeType( - return std::make_unique<GpuMemoryBufferFactoryIOSurface>(); - #elif BUILDFLAG(IS_ANDROID) - return std::make_unique<GpuMemoryBufferFactoryAndroidHardwareBuffer>(); +@@ -71,7 +71,7 @@ GpuMemoryBufferFactory::CreateNativeType( + // to have a factory that vends invalid GMB handles rather than having no + // factory at all. + return std::make_unique<GpuMemoryBufferFactoryStub>(); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) return std::make_unique<GpuMemoryBufferFactoryNativePixmap>( diff --git a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc new file mode 100644 index 000000000000..657057aeb7b2 --- /dev/null +++ b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc @@ -0,0 +1,20 @@ +--- headless/lib/browser/headless_content_browser_client.cc.orig 2024-10-22 08:31:56 UTC ++++ headless/lib/browser/headless_content_browser_client.cc +@@ -56,7 +56,7 @@ + #include "content/public/common/content_descriptors.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + +-#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)) && defined(HEADLESS_USE_PREFS) ++#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(HEADLESS_USE_PREFS) + #include "components/os_crypt/sync/os_crypt.h" // nogncheck + #include "content/public/browser/network_service_util.h" + #endif +@@ -478,7 +478,7 @@ void HeadlessContentBrowserClient::HandleExplicitlyAll + + void HeadlessContentBrowserClient::SetEncryptionKey( + ::network::mojom::NetworkService* network_service) { +-#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)) && defined(HEADLESS_USE_PREFS) ++#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(HEADLESS_USE_PREFS) + // The OSCrypt keys are process bound, so if network service is out of + // process, send it the required key if it is available. + if (content::IsOutOfProcessNetworkService() diff --git a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc deleted file mode 100644 index c2b1b7e7ed31..000000000000 --- a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- headless/lib/browser/headless_request_context_manager.cc.orig 2024-06-17 12:56:06 UTC -+++ headless/lib/browser/headless_request_context_manager.cc -@@ -66,7 +66,7 @@ void SetCryptKeyOnce(const base::FilePath& user_data_p - return; - done_once = true; - --#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)) && defined(HEADLESS_USE_PREFS) -+#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(HEADLESS_USE_PREFS) - // The OSCrypt keys are process bound, so if network service is out of - // process, send it the required key if it is available. - if (content::IsOutOfProcessNetworkService() diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc index f489030ec58a..27c785d42001 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-09-30 07:45:04 UTC +--- media/base/media_switches.cc.orig 2024-10-22 08:31:56 UTC +++ media/base/media_switches.cc @@ -21,7 +21,7 @@ #include "ui/gl/gl_features.h" @@ -9,8 +9,8 @@ #include "base/cpu.h" #endif -@@ -368,8 +368,8 @@ BASE_FEATURE(kMacLoopbackAudioForScreenShare, - "MacLoopbackAudioForScreenShare", +@@ -375,8 +375,8 @@ BASE_FEATURE(kUseSCContentSharingPicker, + "UseSCContentSharingPicker", base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_MAC) - @@ -20,7 +20,7 @@ // Enables system audio mirroring using pulseaudio. BASE_FEATURE(kPulseaudioLoopbackForCast, "PulseaudioLoopbackForCast", -@@ -379,6 +379,28 @@ BASE_FEATURE(kPulseaudioLoopbackForCast, +@@ -386,6 +386,28 @@ BASE_FEATURE(kPulseaudioLoopbackForCast, BASE_FEATURE(kPulseaudioLoopbackForScreenShare, "PulseaudioLoopbackForScreenShare", base::FEATURE_DISABLED_BY_DEFAULT); @@ -49,7 +49,7 @@ #endif // BUILDFLAG(IS_LINUX) // When enabled, MediaCapabilities will check with GPU Video Accelerator -@@ -676,7 +698,7 @@ BASE_FEATURE(kFeatureManagementLiveTranslateCrOS, +@@ -682,7 +704,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInPicture, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", @@ -58,7 +58,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -704,7 +726,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, +@@ -705,7 +727,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, // If enabled, users can request Media Remoting without fullscreen-in-tab. BASE_FEATURE(kMediaRemotingWithoutFullscreen, "MediaRemotingWithoutFullscreen", @@ -67,7 +67,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -716,7 +738,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, +@@ -717,7 +739,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -76,7 +76,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -745,7 +767,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -746,7 +768,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -85,16 +85,16 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. BASE_FEATURE(kVaapiVideoDecodeLinux, -@@ -836,7 +858,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, - "VaapiVp9SModeHWEncoding", - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -846,7 +868,7 @@ BASE_FEATURE(kVSyncMjpegDecoding, + "VSyncMjpegDecoding", + 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. // Owners: frkoenig@chromium.org, mcasas@chromium.org // Expiry: When the |V4L2FlatVideoDecoder| flag handles stateful decoding on -@@ -1463,7 +1485,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, +@@ -1479,7 +1501,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) @@ -103,7 +103,7 @@ // Spawn utility processes to perform hardware encode acceleration instead of // using the GPU process. BASE_FEATURE(kUseOutOfProcessVideoEncoding, -@@ -1543,7 +1565,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, +@@ -1559,7 +1581,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, "RecordWebAudioEngagement", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-media_base_media__switches.h b/www/chromium/files/patch-media_base_media__switches.h index 935a4d2cf5b3..3034c2f6ba50 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-09-30 07:45:04 UTC +--- media/base/media_switches.h.orig 2024-10-22 08:31:56 UTC +++ media/base/media_switches.h -@@ -327,13 +327,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder +@@ -331,13 +331,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend); @@ -28,7 +28,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kReduceHardwareVideoDecoderBuffers); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) MEDIA_EXPORT BASE_DECLARE_FEATURE(kResumeBackgroundVideo); -@@ -348,7 +360,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay); +@@ -352,7 +364,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); @@ -37,16 +37,16 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux); -@@ -367,7 +379,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa - MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding); +@@ -373,7 +385,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLay MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kVSyncMjpegDecoding); #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(kV4L2FlatStatefulVideoDecoder); MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2H264TemporalLayerHWEncoding); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -507,7 +519,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide +@@ -513,7 +525,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseGTFOOutOfProcessVideoDecoding); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index 69dc6724d279..a712de5eeb03 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-09-30 07:45:04 UTC +--- media/base/video_frame.cc.orig 2024-10-22 08:31:56 UTC +++ media/base/video_frame.cc @@ -88,7 +88,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; @@ -27,7 +27,7 @@ bool is_native_buffer = gpu_memory_buffer ? (gpu_memory_buffer->GetType() != gfx::SHARED_MEMORY_BUFFER) -@@ -822,7 +822,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -782,7 +782,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -36,8 +36,8 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -1536,7 +1536,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar - : shared_images_[texture_index]; +@@ -1489,7 +1489,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar + return wrapped_frame_ ? wrapped_frame_->shared_image() : shared_image_; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index 86a9c37ead5c..8a4f70fd49b2 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-09-30 07:45:04 UTC +--- media/base/video_frame.h.orig 2024-10-22 08:31:56 UTC +++ media/base/video_frame.h @@ -50,7 +50,7 @@ #include "base/apple/scoped_cftyperef.h" @@ -18,7 +18,7 @@ // TODO(mcasas): Consider turning this type into STORAGE_NATIVE // based on the idea of using this same enum value for both DMA // buffers on Linux and CVPixelBuffers on Mac (which currently use -@@ -407,7 +407,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -393,7 +393,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb, base::TimeDelta timestamp); @@ -27,16 +27,16 @@ // 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 -@@ -726,7 +726,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte - scoped_refptr<gpu::ClientSharedImage> shared_image( - size_t texture_index) const; +@@ -711,7 +711,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + // wait for the included sync point. + scoped_refptr<gpu::ClientSharedImage> shared_image() const; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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. -@@ -968,7 +968,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -953,7 +953,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GpuMemoryBuffers. Clients will set this flag while creating a VideoFrame. bool is_mappable_si_enabled_ = false; diff --git a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc index 8af6d80221d6..1c8f4e26c08d 100644 --- a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc +++ b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc @@ -1,4 +1,4 @@ ---- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2024-07-30 11:12:21 UTC +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2024-10-22 08:31:56 UTC +++ media/capture/video/linux/v4l2_capture_delegate.cc @@ -5,8 +5,10 @@ #include "media/capture/video/linux/v4l2_capture_delegate.h" @@ -11,7 +11,7 @@ #include <poll.h> #include <sys/ioctl.h> #include <sys/mman.h> -@@ -27,17 +29,19 @@ +@@ -29,17 +31,19 @@ #include "media/capture/video/blob_utils.h" #include "media/capture/video/linux/video_capture_device_linux.h" @@ -32,7 +32,7 @@ // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the // format is introduced to kernel. -@@ -47,6 +51,14 @@ using media::mojom::MeteringMode; +@@ -49,6 +53,14 @@ using media::mojom::MeteringMode; #define V4L2_PIX_FMT_INVZ v4l2_fourcc('I', 'N', 'V', 'Z') #endif @@ -47,7 +47,7 @@ namespace media { namespace { -@@ -264,7 +276,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control +@@ -268,7 +280,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control // static bool V4L2CaptureDelegate::IsControllableControl( int control_id, @@ -56,7 +56,7 @@ const int special_control_id = GetControllingSpecialControl(control_id); if (!special_control_id) { // The control is not controlled by a special control thus the control is -@@ -320,7 +332,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate( +@@ -324,7 +336,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate( is_capturing_(false), timeout_count_(0), rotation_(rotation) { @@ -65,7 +65,7 @@ use_gpu_buffer_ = switches::IsVideoCaptureUseGpuMemoryBufferEnabled(); #endif // BUILDFLAG(IS_LINUX) } -@@ -447,7 +459,7 @@ void V4L2CaptureDelegate::AllocateAndStart( +@@ -451,7 +463,7 @@ void V4L2CaptureDelegate::AllocateAndStart( client_->OnStarted(); @@ -74,7 +74,7 @@ if (use_gpu_buffer_) { v4l2_gpu_helper_ = std::make_unique<V4L2CaptureDelegateGpuHelper>( std::move(gmb_support_test_)); -@@ -797,7 +809,7 @@ void V4L2CaptureDelegate::SetGPUEnvironmentForTesting( +@@ -801,7 +813,7 @@ void V4L2CaptureDelegate::SetGPUEnvironmentForTesting( V4L2CaptureDelegate::~V4L2CaptureDelegate() = default; @@ -83,7 +83,7 @@ int num_retries = 0; for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries; ++num_retries) { -@@ -807,7 +819,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* +@@ -811,7 +823,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* return num_retries != kMaxIOCtrlRetries; } @@ -92,7 +92,7 @@ return HANDLE_EINTR(v4l2_->ioctl(device_fd_.get(), request, argp)); } -@@ -818,6 +830,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co +@@ -822,6 +834,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co } void V4L2CaptureDelegate::ReplaceControlEventSubscriptions() { @@ -100,7 +100,7 @@ constexpr uint32_t kControlIds[] = {V4L2_CID_AUTO_EXPOSURE_BIAS, V4L2_CID_AUTO_WHITE_BALANCE, V4L2_CID_BRIGHTNESS, -@@ -845,6 +858,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript +@@ -849,6 +862,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript << ", {type = V4L2_EVENT_CTRL, id = " << control_id << "}"; } } @@ -108,7 +108,7 @@ } mojom::RangePtr V4L2CaptureDelegate::RetrieveUserControlRange(int control_id) { -@@ -1025,7 +1039,11 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1029,7 +1043,11 @@ void V4L2CaptureDelegate::DoCapture() { pollfd device_pfd = {}; device_pfd.fd = device_fd_.get(); @@ -120,7 +120,7 @@ const int result = HANDLE_EINTR(v4l2_->poll(&device_pfd, 1, kCaptureTimeoutMs)); -@@ -1063,6 +1081,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1067,6 +1085,7 @@ void V4L2CaptureDelegate::DoCapture() { timeout_count_ = 0; } @@ -128,7 +128,7 @@ // Dequeue events if the driver has filled in some. if (device_pfd.revents & POLLPRI) { bool controls_changed = false; -@@ -1098,6 +1117,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1102,6 +1121,7 @@ void V4L2CaptureDelegate::DoCapture() { client_->OnCaptureConfigurationChanged(); } } @@ -136,7 +136,7 @@ // Deenqueue, send and reenqueue a buffer if the driver has filled one in. if (device_pfd.revents & POLLIN) { -@@ -1151,7 +1171,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1155,7 +1175,7 @@ void V4L2CaptureDelegate::DoCapture() { // workable on Linux. // See http://crbug.com/959919. @@ -145,7 +145,7 @@ if (use_gpu_buffer_) { v4l2_gpu_helper_->OnIncomingCapturedData( client_.get(), buffer_tracker->start(), -@@ -1224,7 +1244,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureEr +@@ -1228,7 +1248,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureEr client_->OnError(error, from_here, reason); } 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 642a54359af7..547af83d2dea 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-09-30 07:45:04 UTC +--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2024-10-22 08:31: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) { -@@ -176,6 +179,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( +@@ -188,6 +191,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( NOTREACHED(); #endif // BUILDFLAG(USE_V4L2_CODEC) } @@ -26,7 +26,7 @@ } // namespace -@@ -191,6 +195,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( +@@ -203,6 +207,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( // (at least). bool HardwareVideoDecodingPreSandboxHook( sandbox::policy::SandboxLinux::Options options) { @@ -34,7 +34,7 @@ using HardwareVideoDecodingProcessPolicy = sandbox::policy::HardwareVideoDecodingProcessPolicy; using PolicyType = -@@ -236,6 +241,7 @@ bool HardwareVideoDecodingPreSandboxHook( +@@ -248,6 +253,7 @@ bool HardwareVideoDecodingPreSandboxHook( // |permissions| is empty? sandbox::policy::SandboxLinux::GetInstance()->StartBrokerProcess( command_set, permissions, options); 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 e59de2f27ed8..cb2676ffbbaa 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 2024-04-19 13:02:56 UTC +--- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc.orig 2024-10-22 08:31:56 UTC +++ media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc @@ -18,12 +18,15 @@ #include "media/gpu/v4l2/v4l2_device.h" @@ -16,9 +16,9 @@ sandbox::syscall_broker::BrokerCommandSet command_set; std::vector<BrokerFilePermission> permissions; -@@ -120,6 +123,7 @@ bool HardwareVideoEncodingPreSandboxHook( - return false; - } +@@ -131,6 +134,7 @@ bool HardwareVideoEncodingPreSandboxHook( + dlopen("libvulkan.so.1", kDlopenFlags); + dlopen("libvulkan_radeon.so", kDlopenFlags); } +#endif #endif diff --git a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc index fac46f5a5393..790240da443f 100644 --- a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc +++ b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc @@ -1,6 +1,6 @@ ---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2023-10-11 18:22:24 UTC +--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2024-10-22 08:31:56 UTC +++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc -@@ -837,7 +837,7 @@ const gfx::GpuMemoryBufferId& StructTraits< +@@ -841,7 +841,7 @@ const gfx::GpuMemoryBufferId& StructTraits< return input.id; } @@ -9,7 +9,7 @@ // static gfx::NativePixmapHandle StructTraits< media::stable::mojom::NativeGpuMemoryBufferHandleDataView, -@@ -858,7 +858,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor +@@ -862,7 +862,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor output->type = gfx::NATIVE_PIXMAP; 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 dc54b24b6b4b..2f7879758c96 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,6 +1,6 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2024-09-30 07:45:04 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2024-10-22 08:31:56 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -111,7 +111,7 @@ class GpuMemoryBufferVideoFramePool::PoolImpl +@@ -98,7 +98,7 @@ class GpuMemoryBufferVideoFramePool::PoolImpl gpu::SHARED_IMAGE_USAGE_RASTER_READ | gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | gpu::SHARED_IMAGE_USAGE_SCANOUT; @@ -9,7 +9,7 @@ // TODO(crbug.com/40194712): Always add the flag once the // OzoneImageBacking is by default turned on. if (base::CommandLine::ForCurrentProcess()->HasSwitch( -@@ -800,7 +800,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -695,7 +695,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); @@ -18,12 +18,12 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1345,7 +1345,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo - media::IOSurfaceIsWebGPUCompatible(handle.io_surface.get()); +@@ -1104,7 +1104,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo + media::IOSurfaceIsWebGPUCompatible(handle.io_surface.get()); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - is_webgpu_compatible = - handle.native_pixmap_handle.supports_zero_copy_webgpu_import; + is_webgpu_compatible = + handle.native_pixmap_handle.supports_zero_copy_webgpu_import; #endif diff --git a/www/chromium/files/patch-mojo_core_channel.cc b/www/chromium/files/patch-mojo_core_channel.cc index b06c418f40ba..877640e50494 100644 --- a/www/chromium/files/patch-mojo_core_channel.cc +++ b/www/chromium/files/patch-mojo_core_channel.cc @@ -1,8 +1,8 @@ ---- mojo/core/channel.cc.orig 2024-08-26 12:06:38 UTC +--- mojo/core/channel.cc.orig 2024-10-22 08:31:56 UTC +++ mojo/core/channel.cc -@@ -79,7 +79,11 @@ const size_t kMaxUnusedReadBufferCapacity = 4096; - // Fuchsia: The zx_channel_write() API supports up to 64 handles. - const size_t kMaxAttachedHandles = 64; +@@ -82,7 +82,11 @@ const size_t kMaxAttachedHandles = 64; + const size_t kMaxAttachedHandles = 253; + #endif // BUILDFLAG(IS_FUCHSIA) +#if defined(__i386__) && defined(OS_FREEBSD) +const size_t kChannelMessageAlignment = 4; diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index fc2b72ffaee2..4a0c5cc882a8 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-09-30 07:45:04 UTC +--- net/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ net/BUILD.gn -@@ -123,7 +123,7 @@ net_configs = [ +@@ -125,7 +125,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1254,6 +1254,19 @@ component("net") { +@@ -1277,6 +1277,19 @@ component("net") { ] } @@ -29,7 +29,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1415,7 +1428,7 @@ component("net") { +@@ -1438,7 +1451,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", -@@ -2892,7 +2905,7 @@ test("net_unittests") { +@@ -2921,7 +2934,7 @@ target(_test_target_type, "net_unittests") { ] } @@ -47,7 +47,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -2983,6 +2996,10 @@ test("net_unittests") { +@@ -3014,6 +3027,10 @@ target(_test_target_type, "net_unittests") { ] } @@ -56,9 +56,9 @@ + } + if (enable_websockets) { - deps += [ "//net/server:tests" ] - } -@@ -3044,7 +3061,7 @@ test("net_unittests") { + sources += [ + "server/http_connection_unittest.cc", +@@ -3080,7 +3097,7 @@ target(_test_target_type, "net_unittests") { ] } @@ -67,7 +67,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3183,7 +3200,7 @@ test("net_unittests") { +@@ -3219,7 +3236,7 @@ target(_test_target_type, "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 d335e692eceb..c4414fa736b8 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-09-30 07:45:04 UTC +--- net/base/features.cc.orig 2024-10-22 08:31: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 -@@ -524,7 +524,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, +@@ -522,7 +522,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 4c42e20fe3cb..d2101f16a249 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-06-17 12:56:06 UTC +--- net/cert/cert_verify_proc.h.orig 2024-10-22 08:31:56 UTC +++ net/cert/cert_verify_proc.h -@@ -176,7 +176,7 @@ class NET_EXPORT CertVerifyProc +@@ -178,7 +178,7 @@ class NET_EXPORT CertVerifyProc kMaxValue = kChainLengthOne }; diff --git a/www/chromium/files/patch-net_socket_tcp__socket__posix.cc b/www/chromium/files/patch-net_socket_tcp__socket__posix.cc index b7fd04b068eb..4feef7ca3fb9 100644 --- a/www/chromium/files/patch-net_socket_tcp__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_tcp__socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/tcp_socket_posix.cc.orig 2024-07-30 11:12:21 UTC +--- net/socket/tcp_socket_posix.cc.orig 2024-10-22 08:31:56 UTC +++ net/socket/tcp_socket_posix.cc -@@ -97,6 +97,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) { +@@ -98,6 +98,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) { PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd; return false; } 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 1c4f5762f705..bb123e4d2b87 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-08-26 12:06:38 UTC +--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2024-10-22 08:31:56 UTC +++ net/tools/cert_verify_tool/cert_verify_tool.cc @@ -35,7 +35,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. // -@@ -579,7 +579,7 @@ int main(int argc, char** argv) { +@@ -580,7 +580,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-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc index 5460fd9b81f3..40998626d20e 100644 --- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,6 +1,6 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2024-08-26 12:06:38 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2024-10-22 08:31:56 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -93,7 +93,7 @@ +@@ -94,7 +94,7 @@ #include "gin/public/cppgc.h" #endif @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -524,7 +524,7 @@ void InitializeSDK(bool enable_v8, +@@ -523,7 +523,7 @@ void InitializeSDK(bool enable_v8, FPDF_InitLibraryWithConfig(&config); diff --git a/www/chromium/files/patch-printing_backend_print__backend__cups.cc b/www/chromium/files/patch-printing_backend_print__backend__cups.cc index 80fe1ae58918..ae7d68c0094a 100644 --- a/www/chromium/files/patch-printing_backend_print__backend__cups.cc +++ b/www/chromium/files/patch-printing_backend_print__backend__cups.cc @@ -1,6 +1,6 @@ ---- printing/backend/print_backend_cups.cc.orig 2024-08-26 12:06:38 UTC +--- printing/backend/print_backend_cups.cc.orig 2024-10-22 08:31:56 UTC +++ printing/backend/print_backend_cups.cc -@@ -32,7 +32,7 @@ +@@ -33,7 +33,7 @@ #include "printing/mojom/print.mojom.h" #include "url/gurl.h" @@ -9,12 +9,21 @@ #include "base/feature_list.h" #include "printing/backend/cups_connection.h" #include "printing/backend/print_backend_cups_ipp.h" -@@ -283,7 +283,7 @@ bool PrintBackendCUPS::IsValidPrinter(const std::strin +@@ -63,7 +63,7 @@ int CaptureCupsDestCallback(void* data, unsigned flags + return 1; // Keep going. + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + // This may be removed when Amazon Linux 2 reaches EOL (30 Jun 2025). + bool AreNewerCupsFunctionsAvailable() { + return cupsFindDestDefault && cupsFindDestSupported && ippValidateAttributes; +@@ -291,7 +291,7 @@ bool PrintBackendCUPS::IsValidPrinter(const std::strin #if !BUILDFLAG(IS_CHROMEOS) scoped_refptr<PrintBackend> PrintBackend::CreateInstanceImpl( const std::string& locale) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled(features::kCupsIppPrintingBackend)) { + if (AreNewerCupsFunctionsAvailable() && + base::FeatureList::IsEnabled(features::kCupsIppPrintingBackend)) { return base::MakeRefCounted<PrintBackendCupsIpp>(CupsConnection::Create()); - } diff --git a/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc b/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc index f5d4dab751ac..68ec36ae06c7 100644 --- a/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc +++ b/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc @@ -1,6 +1,6 @@ ---- remoting/codec/webrtc_video_encoder_vpx.cc.orig 2023-05-31 08:12:17 UTC +--- remoting/codec/webrtc_video_encoder_vpx.cc.orig 2024-10-22 08:31:56 UTC +++ remoting/codec/webrtc_video_encoder_vpx.cc -@@ -88,7 +88,7 @@ void SetVp8CodecParameters(vpx_codec_enc_cfg_t* config +@@ -93,7 +93,7 @@ void SetVp8CodecParameters(vpx_codec_enc_cfg_t* config const webrtc::DesktopSize& size) { SetCommonCodecParameters(config, size); diff --git a/www/chromium/files/patch-remoting_host_base_desktop__environment__options.cc b/www/chromium/files/patch-remoting_host_base_desktop__environment__options.cc index 13301e0d6bb1..1d5099c700fe 100644 --- a/www/chromium/files/patch-remoting_host_base_desktop__environment__options.cc +++ b/www/chromium/files/patch-remoting_host_base_desktop__environment__options.cc @@ -1,6 +1,6 @@ ---- remoting/host/base/desktop_environment_options.cc.orig 2024-02-23 21:04:38 UTC +--- remoting/host/base/desktop_environment_options.cc.orig 2024-10-22 08:31:56 UTC +++ remoting/host/base/desktop_environment_options.cc -@@ -124,7 +124,7 @@ bool DesktopEnvironmentOptions::capture_video_on_dedic +@@ -99,7 +99,7 @@ bool DesktopEnvironmentOptions::capture_video_on_dedic // TODO(joedow): Determine whether we can migrate additional platforms to // using the DesktopCaptureWrapper instead of the DesktopCaptureProxy. Then // clean up DesktopCapturerProxy::Core::CreateCapturer(). diff --git a/www/chromium/files/patch-remoting_host_chromoting__host.cc b/www/chromium/files/patch-remoting_host_chromoting__host.cc index c0888ea9d898..3f1b890b1a05 100644 --- a/www/chromium/files/patch-remoting_host_chromoting__host.cc +++ b/www/chromium/files/patch-remoting_host_chromoting__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/chromoting_host.cc.orig 2024-02-23 21:04:38 UTC +--- remoting/host/chromoting_host.cc.orig 2024-10-22 08:31:56 UTC +++ remoting/host/chromoting_host.cc -@@ -129,7 +129,7 @@ void ChromotingHost::Start(const std::string& host_own +@@ -132,7 +132,7 @@ void ChromotingHost::Start(const std::string& host_own &ChromotingHost::OnIncomingSession, base::Unretained(this))); } diff --git a/www/chromium/files/patch-remoting_host_chromoting__host.h b/www/chromium/files/patch-remoting_host_chromoting__host.h index c11c4cd7f079..60d925536383 100644 --- a/www/chromium/files/patch-remoting_host_chromoting__host.h +++ b/www/chromium/files/patch-remoting_host_chromoting__host.h @@ -1,4 +1,4 @@ ---- remoting/host/chromoting_host.h.orig 2024-09-30 07:45:04 UTC +--- remoting/host/chromoting_host.h.orig 2024-10-22 08:31:56 UTC +++ remoting/host/chromoting_host.h @@ -33,7 +33,7 @@ #include "remoting/protocol/session_manager.h" @@ -9,7 +9,7 @@ #include "remoting/host/chromoting_host_services_server.h" #endif -@@ -98,7 +98,7 @@ class ChromotingHost : public ClientSession::EventHand +@@ -99,7 +99,7 @@ class ChromotingHost : public ClientSession::EventHand // This method can only be called once during the lifetime of this object. void Start(const std::string& host_owner); @@ -18,7 +18,7 @@ // Starts running the ChromotingHostServices server and listening for incoming // IPC binding requests. // Currently only Linux runs the ChromotingHostServices server on the host -@@ -204,7 +204,7 @@ class ChromotingHost : public ClientSession::EventHand +@@ -203,7 +203,7 @@ class ChromotingHost : public ClientSession::EventHand // List of host extensions. std::vector<std::unique_ptr<HostExtension>> extensions_; diff --git a/www/chromium/files/patch-remoting_host_client__session.cc b/www/chromium/files/patch-remoting_host_client__session.cc index 103de0f4e7c5..2781eba2dd35 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-09-30 07:45:04 UTC +--- remoting/host/client_session.cc.orig 2024-10-22 08:31:56 UTC +++ remoting/host/client_session.cc -@@ -158,7 +158,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_it2me_it2me__host.cc b/www/chromium/files/patch-remoting_host_it2me_it2me__host.cc index f92035f4eef6..07cdca7cca85 100644 --- a/www/chromium/files/patch-remoting_host_it2me_it2me__host.cc +++ b/www/chromium/files/patch-remoting_host_it2me_it2me__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/it2me/it2me_host.cc.orig 2024-09-30 07:45:04 UTC +--- remoting/host/it2me/it2me_host.cc.orig 2024-10-22 08:31:56 UTC +++ remoting/host/it2me/it2me_host.cc -@@ -56,7 +56,7 @@ +@@ -57,7 +57,7 @@ #include "remoting/host/chromeos/features.h" #endif @@ -9,7 +9,7 @@ #include "remoting/host/linux/wayland_manager.h" #include "remoting/host/linux/wayland_utils.h" #endif // BUILDFLAG(IS_LINUX) -@@ -184,7 +184,7 @@ void It2MeHost::Connect( +@@ -185,7 +185,7 @@ void It2MeHost::Connect( OnPolicyUpdate(std::move(policies)); @@ -18,7 +18,7 @@ if (IsRunningWayland()) { WaylandManager::Get()->Init(host_context_->ui_task_runner()); } -@@ -344,7 +344,7 @@ void It2MeHost::ConnectOnNetworkThread( +@@ -318,7 +318,7 @@ void It2MeHost::ConnectOnNetworkThread( // Set up the desktop environment options. DesktopEnvironmentOptions options(DesktopEnvironmentOptions::CreateDefault()); diff --git a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc index d3b90f117c57..51f37a321bdd 100644 --- a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc +++ b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc @@ -1,6 +1,6 @@ ---- remoting/host/me2me_desktop_environment.cc.orig 2024-07-30 11:12:21 UTC +--- remoting/host/me2me_desktop_environment.cc.orig 2024-10-22 08:31:56 UTC +++ remoting/host/me2me_desktop_environment.cc -@@ -119,7 +119,7 @@ std::string Me2MeDesktopEnvironment::GetCapabilities() +@@ -108,7 +108,7 @@ std::string Me2MeDesktopEnvironment::GetCapabilities() capabilities += protocol::kRemoteWebAuthnCapability; } @@ -9,7 +9,7 @@ if (!IsRunningWayland()) { capabilities += " "; capabilities += protocol::kMultiStreamCapability; -@@ -161,7 +161,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( +@@ -150,7 +150,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( // properly under Xvfb. mutable_desktop_capture_options()->set_use_update_notifications(true); @@ -18,7 +18,7 @@ // Setting this option to false means that the capture differ wrapper will not // be used when the X11 capturer is selected. This reduces the X11 capture // time by a few milliseconds per frame and is safe because we can rely on -@@ -170,7 +170,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( +@@ -159,7 +159,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( mutable_desktop_capture_options()->set_detect_updated_region(false); #endif @@ -27,7 +27,7 @@ if (IsRunningWayland()) { mutable_desktop_capture_options()->set_prefer_cursor_embedded(false); } -@@ -195,7 +195,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( +@@ -184,7 +184,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( // Otherwise, if the session is shared with the local user start monitoring // the local input and create the in-session UI. 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 780a5dcb793a..60acc91c53e1 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-09-30 07:45:04 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2024-10-22 08:31:56 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -131,7 +131,7 @@ +@@ -134,7 +134,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 @@ +@@ -145,13 +145,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 @@ +@@ -164,7 +164,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"; +@@ -193,7 +193,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"; -@@ -401,7 +401,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -412,7 +412,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) -@@ -471,7 +471,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -478,7 +478,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_; -@@ -778,7 +778,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -785,7 +785,7 @@ void HostProcess::StartOnNetworkThread() { void HostProcess::ShutdownOnNetworkThread() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); config_watcher_.reset(); @@ -70,16 +70,16 @@ cert_watcher_.reset(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -814,7 +814,7 @@ void HostProcess::CreateAuthenticatorFactory() { - base::MakeRefCounted<CorpSessionAuthzServiceClientFactory>( +@@ -856,7 +856,7 @@ void HostProcess::CreateAuthenticatorFactory() { context_->url_loader_factory(), service_account_email_, oauth_refresh_token_)); + -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -960,13 +960,13 @@ void HostProcess::StartOnUiThread() { +@@ -1001,13 +1001,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 = -@@ -1043,7 +1043,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1084,7 +1084,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. -@@ -1051,7 +1051,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1092,7 +1092,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(); })); -@@ -1450,7 +1450,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V +@@ -1502,7 +1502,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V // Returns false: never restart the host after this policy update. DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); @@ -122,16 +122,16 @@ std::optional<bool> host_username_match_required = policies.FindBool(policy::key::kRemoteAccessHostMatchUsername); if (!host_username_match_required.has_value()) { -@@ -1883,7 +1883,7 @@ void HostProcess::StartHost() { +@@ -1778,7 +1778,7 @@ void HostProcess::StartHost() { corp_host_status_logger_->StartObserving(*session_manager); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - desktop_environment_options_.set_enable_remote_webauthn(is_corp_user_); + desktop_environment_options_.set_enable_remote_webauthn(is_corp_host_); #endif -@@ -1912,7 +1912,7 @@ void HostProcess::StartHost() { +@@ -1798,7 +1798,7 @@ void HostProcess::StartHost() { host_status_logger_ = std::make_unique<HostStatusLogger>( host_->status_monitor(), log_to_server_.get()); @@ -140,16 +140,16 @@ const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->HasSwitch(kEnableUtempter)) { host_utmp_logger_ = -@@ -1944,7 +1944,7 @@ void HostProcess::StartHost() { - - host_->Start(host_owner_); +@@ -1834,7 +1834,7 @@ void HostProcess::StartHost() { + // addresses. + host_->Start(*host_owner_emails_.begin()); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // For Windows, ChromotingHostServices connections are handled by the daemon // process, then the message pipe is forwarded to the network process. host_->StartChromotingHostServices(); -@@ -2078,7 +2078,7 @@ int HostProcessMain() { +@@ -1968,7 +1968,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 ...) -@@ -2127,7 +2127,7 @@ int HostProcessMain() { +@@ -2017,7 +2017,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); diff --git a/www/chromium/files/patch-remoting_host_setup_start__host__main.cc b/www/chromium/files/patch-remoting_host_setup_start__host__main.cc index 66e206d2b344..2a32ddfb8642 100644 --- a/www/chromium/files/patch-remoting_host_setup_start__host__main.cc +++ b/www/chromium/files/patch-remoting_host_setup_start__host__main.cc @@ -1,4 +1,4 @@ ---- remoting/host/setup/start_host_main.cc.orig 2024-09-30 07:45:04 UTC +--- remoting/host/setup/start_host_main.cc.orig 2024-10-22 08:31:56 UTC +++ remoting/host/setup/start_host_main.cc @@ -38,7 +38,7 @@ #include <unistd.h> @@ -9,7 +9,7 @@ #include "remoting/host/setup/daemon_controller_delegate_linux.h" #include "remoting/host/setup/start_host_as_root.h" #endif // BUILDFLAG(IS_LINUX) -@@ -354,7 +354,7 @@ bool InitializeCloudMachineParams(HostStarter::Params& +@@ -369,7 +369,7 @@ bool InitializeCloudMachineParams(HostStarter::Params& } // namespace int StartHostMain(int argc, char** argv) { @@ -18,7 +18,7 @@ // Minimize the amount of code that runs as root on Posix systems. if (getuid() == 0) { return remoting::StartHostAsRoot(argc, argv); -@@ -379,7 +379,7 @@ int StartHostMain(int argc, char** argv) { +@@ -394,7 +394,7 @@ int StartHostMain(int argc, char** argv) { mojo::core::Init(); diff --git a/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc b/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc index 3375e977def2..267e0459e0c9 100644 --- a/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc +++ b/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc @@ -1,6 +1,6 @@ ---- remoting/host/webauthn/remote_webauthn_extension_notifier.cc.orig 2023-02-08 09:03:45 UTC +--- remoting/host/webauthn/remote_webauthn_extension_notifier.cc.orig 2024-10-22 08:31:56 UTC +++ remoting/host/webauthn/remote_webauthn_extension_notifier.cc -@@ -24,7 +24,7 @@ +@@ -30,7 +30,7 @@ #include "base/task/thread_pool.h" #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #include "base/strings/string_util.h" -@@ -69,14 +69,14 @@ static constexpr char kExtensionWakeupFileContent[] = +@@ -75,14 +75,14 @@ static constexpr char kExtensionWakeupFileContent[] = // Caller should check if the directory exists before writing files to it. A // directory only exists if the corresponding Chrome version is installed. std::vector<base::FilePath> GetRemoteStateChangeDirPaths() { diff --git a/www/chromium/files/patch-sandbox_policy_BUILD.gn b/www/chromium/files/patch-sandbox_policy_BUILD.gn index 10d9c6fcfc2c..6a018e40fac7 100644 --- a/www/chromium/files/patch-sandbox_policy_BUILD.gn +++ b/www/chromium/files/patch-sandbox_policy_BUILD.gn @@ -1,4 +1,4 @@ ---- sandbox/policy/BUILD.gn.orig 2024-09-30 07:45:04 UTC +--- sandbox/policy/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ sandbox/policy/BUILD.gn @@ -50,7 +50,7 @@ component("policy") { "//third_party/jni_zero", @@ -9,7 +9,7 @@ sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", -@@ -123,6 +123,27 @@ component("policy") { +@@ -125,6 +125,27 @@ component("policy") { "//sandbox/linux:sandbox_services", "//sandbox/linux:seccomp_bpf", "//sandbox/linux:suid_sandbox_client", diff --git a/www/chromium/files/patch-sandbox_policy_features.cc b/www/chromium/files/patch-sandbox_policy_features.cc index 16b146e190ce..aa0b425de899 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-09-30 07:45:04 UTC +--- sandbox/policy/features.cc.orig 2024-10-22 08:31: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. -@@ -140,7 +144,7 @@ BASE_FEATURE(kSpectreVariant2Mitigation, +@@ -134,7 +138,7 @@ BASE_FEATURE(kSpectreVariant2Mitigation, base::FEATURE_ENABLED_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 039dc2e5f138..2a02d797dc21 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-09-30 07:45:04 UTC +--- sandbox/policy/features.h.orig 2024-10-22 08:31:56 UTC +++ sandbox/policy/features.h -@@ -46,7 +46,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kWinSboxACP +@@ -45,7 +45,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE( SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kSpectreVariant2Mitigation); #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/chromium/files/patch-sandbox_policy_mojom_sandbox.mojom b/www/chromium/files/patch-sandbox_policy_mojom_sandbox.mojom index 48b525912c9f..8e371a89ca35 100644 --- a/www/chromium/files/patch-sandbox_policy_mojom_sandbox.mojom +++ b/www/chromium/files/patch-sandbox_policy_mojom_sandbox.mojom @@ -1,6 +1,6 @@ ---- sandbox/policy/mojom/sandbox.mojom.orig 2023-12-10 06:10:27 UTC +--- sandbox/policy/mojom/sandbox.mojom.orig 2024-10-22 08:31:56 UTC +++ sandbox/policy/mojom/sandbox.mojom -@@ -77,6 +77,12 @@ enum Sandbox { +@@ -80,6 +80,12 @@ enum Sandbox { [EnableIf=is_fuchsia] kVideoCapture, diff --git a/www/chromium/files/patch-sandbox_policy_sandbox__type.cc b/www/chromium/files/patch-sandbox_policy_sandbox__type.cc index 5add5372c79d..925a25d6e469 100644 --- a/www/chromium/files/patch-sandbox_policy_sandbox__type.cc +++ b/www/chromium/files/patch-sandbox_policy_sandbox__type.cc @@ -1,4 +1,4 @@ ---- sandbox/policy/sandbox_type.cc.orig 2024-09-30 07:45:04 UTC +--- sandbox/policy/sandbox_type.cc.orig 2024-10-22 08:31:56 UTC +++ sandbox/policy/sandbox_type.cc @@ -38,7 +38,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { #endif @@ -27,7 +27,7 @@ case Sandbox::kZygoteIntermediateSandbox: case Sandbox::kHardwareVideoEncoding: #endif -@@ -130,7 +130,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -131,7 +131,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi #endif case Sandbox::kPrintCompositor: case Sandbox::kAudio: @@ -36,7 +36,7 @@ case Sandbox::kVideoCapture: #endif #if BUILDFLAG(IS_WIN) -@@ -141,10 +141,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -142,10 +142,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kMediaFoundationCdm: case Sandbox::kWindowsSystemProxyResolver: #endif // BUILDFLAG(IS_WIN) @@ -49,7 +49,7 @@ case Sandbox::kHardwareVideoEncoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -169,7 +169,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -171,7 +171,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi switches::kServiceSandboxType, StringFromUtilitySandboxType(sandbox_type)); break; @@ -58,7 +58,7 @@ case Sandbox::kZygoteIntermediateSandbox: break; #endif -@@ -209,7 +209,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( +@@ -211,7 +211,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( return Sandbox::kUtility; } @@ -67,7 +67,7 @@ // Intermediate process gains a sandbox later. if (process_type == switches::kZygoteProcessType) return Sandbox::kZygoteIntermediateSandbox; -@@ -257,7 +257,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -259,7 +259,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb return switches::kUtilitySandbox; case Sandbox::kAudio: return switches::kAudioSandbox; @@ -76,7 +76,7 @@ case Sandbox::kVideoCapture: return switches::kVideoCaptureSandbox; #endif -@@ -287,11 +287,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -291,11 +291,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb case Sandbox::kMirroring: return switches::kMirroringSandbox; #endif @@ -90,7 +90,7 @@ case Sandbox::kHardwareVideoEncoding: return switches::kHardwareVideoEncodingSandbox; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -310,7 +310,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -314,7 +314,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb // The following are not utility processes so should not occur. case Sandbox::kRenderer: case Sandbox::kGpu: @@ -99,10 +99,10 @@ case Sandbox::kZygoteIntermediateSandbox: #endif NOTREACHED_IN_MIGRATION(); -@@ -382,15 +382,15 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( - if (sandbox_string == switches::kScreenAISandbox) - return Sandbox::kScreenAI; - #endif +@@ -389,15 +389,15 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( + if (sandbox_string == switches::kVideoEffectsSandbox) { + return Sandbox::kVideoEffects; + } -#if BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) if (sandbox_string == switches::kVideoCaptureSandbox) diff --git a/www/chromium/files/patch-sandbox_policy_switches.cc b/www/chromium/files/patch-sandbox_policy_switches.cc index cf15e9bc9cc2..f347405b4e91 100644 --- a/www/chromium/files/patch-sandbox_policy_switches.cc +++ b/www/chromium/files/patch-sandbox_policy_switches.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/switches.cc.orig 2024-07-30 11:12:21 UTC +--- sandbox/policy/switches.cc.orig 2024-10-22 08:31:56 UTC +++ sandbox/policy/switches.cc -@@ -54,10 +54,10 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro +@@ -55,10 +55,10 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro const char kMirroringSandbox[] = "mirroring"; #endif // BUILDFLAG(IS_MAC) @@ -13,7 +13,7 @@ const char kHardwareVideoEncodingSandbox[] = "hardware_video_encoding"; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -97,7 +97,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f +@@ -98,7 +98,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f // Meant to be used as a browser-level switch for testing purposes only. const char kNoSandbox[] = "no-sandbox"; diff --git a/www/chromium/files/patch-sandbox_policy_switches.h b/www/chromium/files/patch-sandbox_policy_switches.h index 3296847119ed..ec38340c0e48 100644 --- a/www/chromium/files/patch-sandbox_policy_switches.h +++ b/www/chromium/files/patch-sandbox_policy_switches.h @@ -1,6 +1,6 @@ ---- sandbox/policy/switches.h.orig 2024-07-30 11:12:21 UTC +--- sandbox/policy/switches.h.orig 2024-10-22 08:31:56 UTC +++ sandbox/policy/switches.h -@@ -57,10 +57,10 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem +@@ -58,10 +58,10 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem SANDBOX_POLICY_EXPORT extern const char kMirroringSandbox[]; #endif // BUILDFLAG(IS_MAC) @@ -13,7 +13,7 @@ SANDBOX_POLICY_EXPORT extern const char kHardwareVideoEncodingSandbox[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -82,7 +82,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid +@@ -83,7 +83,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[]; SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[]; SANDBOX_POLICY_EXPORT extern const char kNoSandbox[]; diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index 449d27984c2a..8a194b4807db 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-09-30 07:45:04 UTC +--- services/network/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ services/network/BUILD.gn -@@ -410,7 +410,6 @@ if (is_linux || is_chromeos) { +@@ -395,7 +395,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 5238d91b90ee..e1174ca287ef 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-09-30 07:45:04 UTC +--- services/network/network_context.cc.orig 2024-10-22 08:31:56 UTC +++ services/network/network_context.cc -@@ -590,7 +590,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: +@@ -588,7 +588,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: NetworkContext::NetworkContextHttpAuthPreferences:: ~NetworkContextHttpAuthPreferences() = default; @@ -9,7 +9,7 @@ bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad() const { if (network_service_) { -@@ -2437,7 +2437,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( +@@ -2435,7 +2435,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 1ee1e01f3204..094ed9990a73 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-09-30 07:45:04 UTC +--- services/network/network_context.h.orig 2024-10-22 08:31:56 UTC +++ services/network/network_context.h -@@ -696,7 +696,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -697,7 +697,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext public: explicit NetworkContextHttpAuthPreferences(NetworkService* network_service); ~NetworkContextHttpAuthPreferences() override; 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 4be03f6a6ea9..d1129453802b 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-08-26 12:06:38 UTC +--- services/network/public/cpp/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ services/network/public/cpp/BUILD.gn -@@ -497,7 +497,7 @@ component("cpp_base") { +@@ -481,7 +481,7 @@ component("cpp_base") { sources += [ "transferable_directory_fuchsia.cc" ] } diff --git a/www/chromium/files/patch-services_on__device__model_on__device__model__service.h b/www/chromium/files/patch-services_on__device__model_on__device__model__service.h index 74c589214179..dafec70587cd 100644 --- a/www/chromium/files/patch-services_on__device__model_on__device__model__service.h +++ b/www/chromium/files/patch-services_on__device__model_on__device__model__service.h @@ -1,8 +1,8 @@ ---- services/on_device_model/on_device_model_service.h.orig 2024-06-17 12:56:06 UTC +--- services/on_device_model/on_device_model_service.h.orig 2024-10-22 08:31:56 UTC +++ services/on_device_model/on_device_model_service.h -@@ -22,6 +22,10 @@ - #include "sandbox/policy/linux/sandbox_linux.h" - #endif +@@ -27,6 +27,10 @@ namespace ml { + class OnDeviceModelInternalImpl; + } +#if BUILDFLAG(IS_BSD) +#include "sandbox/policy/sandbox.h" @@ -11,7 +11,7 @@ namespace on_device_model { class COMPONENT_EXPORT(ON_DEVICE_MODEL) OnDeviceModelService -@@ -35,7 +39,7 @@ class COMPONENT_EXPORT(ON_DEVICE_MODEL) OnDeviceModelS +@@ -40,7 +44,7 @@ class COMPONENT_EXPORT(ON_DEVICE_MODEL) OnDeviceModelS // Must be called in the service's process after the run loop finished. [[nodiscard]] static bool Shutdown(); diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index 49e5aade1c73..e6bbbadcd23e 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-07-30 11:12:21 UTC +--- third_party/angle/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ third_party/angle/BUILD.gn -@@ -347,7 +347,6 @@ config("extra_warnings") { +@@ -354,7 +354,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,7 +8,7 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -524,7 +523,7 @@ template("angle_common_lib") { +@@ -531,7 +530,7 @@ template("angle_common_lib") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -679,6 +678,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -686,6 +685,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] diff --git a/www/chromium/files/patch-third__party_blink_public_platform_platform.h b/www/chromium/files/patch-third__party_blink_public_platform_platform.h index d4a2a0e758e1..eba7c4b76272 100644 --- a/www/chromium/files/patch-third__party_blink_public_platform_platform.h +++ b/www/chromium/files/patch-third__party_blink_public_platform_platform.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/platform/platform.h.orig 2024-09-30 07:45:04 UTC +--- third_party/blink/public/platform/platform.h.orig 2024-10-22 08:31:56 UTC +++ third_party/blink/public/platform/platform.h -@@ -375,7 +375,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -374,7 +374,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; } 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 55b7af454b57..725324dc6d95 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,6 +1,6 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2024-09-30 07:45:04 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2024-10-22 08:31:56 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -427,7 +427,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( +@@ -428,7 +428,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -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' -@@ -3407,7 +3407,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3413,7 +3413,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_frame_web__frame__test.cc b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc index df3cff3753fa..9c5eb73c25a8 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2024-08-26 12:06:38 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2024-10-22 08:31:56 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6477,7 +6477,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6478,7 +6478,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { } #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // TODO(crbug.com/1090246): Fix these tests on Fuchsia and re-enable. // TODO(crbug.com/1317375): Build these tests on all platforms. #define MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved \ -@@ -6886,7 +6886,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc +@@ -6887,7 +6887,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) { RunTest("composited_selection_bounds_large_selection_noscroll.html"); } 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 3776779bd492..601e8174b016 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,4 +1,4 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2024-09-30 07:45:04 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2024-10-22 08:31:56 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc @@ -73,7 +73,7 @@ #include "ui/display/screen_info.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -774,7 +774,7 @@ void LayoutView::LayoutRoot() { +@@ -776,7 +776,7 @@ void LayoutView::LayoutRoot() { intrinsic_logical_widths_ = LogicalWidth(); } diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc new file mode 100644 index 000000000000..a094c3af19df --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc @@ -0,0 +1,10 @@ +--- third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc.orig 2024-10-22 08:31:56 UTC ++++ third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc +@@ -557,6 +557,7 @@ void RTCDataChannel::send(Blob* data, ExceptionState& + pending_messages_.push_back(message); + } + ++#undef close + void RTCDataChannel::close() { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + if (state_ == webrtc::DataChannelInterface::kClosing || diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc index 64c8f8d98c39..8f8d912b98ea 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2024-08-26 12:06:38 UTC +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2024-10-22 08:31:56 UTC +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -302,7 +302,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar +@@ -304,7 +304,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar SetupRenderer(kDefaultOutputDeviceId); renderer_proxy_->Start(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ 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 0a59ff51adea..7e8874fe9721 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-09-30 07:45:04 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2024-10-22 08:31:56 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6305,7 +6305,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6304,7 +6304,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 c8e8c57f1be4..027d6bf7330b 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-09-30 07:45:04 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -2007,7 +2007,7 @@ static_library("test_support") { +@@ -2015,7 +2015,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_graphics_gpu_image__layer__bridge.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc new file mode 100644 index 000000000000..2614ca5de35c --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc @@ -0,0 +1,11 @@ +--- third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc.orig 2024-10-22 08:31:56 UTC ++++ third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc +@@ -49,7 +49,7 @@ scoped_refptr<StaticBitmapImage> MakeAccelerated( + const auto paint_image = source->PaintImageForCurrentFrame(); + const auto image_info = paint_image.GetSkImageInfo().makeWH( + source->Size().width(), source->Size().height()); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(b/330865436): On Linux, CanvasResourceProvider doesn't always check + // for SCANOUT support correctly on X11 and it's never supported in + // practice. Therefore, don't include it until this flow is reworked. 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 8ae2dc942ff8..7c312e3e305c 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-09-30 07:45:04 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2024-10-22 08:31:56 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -420,7 +420,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -438,7 +438,7 @@ void VideoFrameSubmitter::OnBeginFrame( auto& details = timing_details.find(frame_token)->value; auto& feedback = details.presentation_feedback; 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 acb08184b11d..e7cb5db07ad1 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-09-30 07:45:04 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2024-10-22 08:31:56 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -364,7 +364,7 @@ +@@ -384,7 +384,7 @@ name: "AppTitle", status: "experimental", origin_trial_feature_name: "AppTitle", @@ -9,7 +9,7 @@ base_feature: "WebAppEnableAppTitle", }, { -@@ -1801,7 +1801,7 @@ +@@ -1840,7 +1840,7 @@ base_feature: "none", public: true, origin_trial_feature_name: "FedCmMultipleIdentityProviders", @@ -18,7 +18,7 @@ origin_trial_allows_third_party: true, }, { -@@ -3227,7 +3227,7 @@ +@@ -3208,7 +3208,7 @@ // Tracking bug for the implementation: https://crbug.com/1462930 name: "PermissionElement", origin_trial_feature_name: "PermissionElement", @@ -27,7 +27,7 @@ status: "experimental", public: true, base_feature_status: "enabled", -@@ -3366,7 +3366,7 @@ +@@ -3354,7 +3354,7 @@ { name: "PrivateNetworkAccessPermissionPrompt", origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt", @@ -36,7 +36,7 @@ status: "stable", public: true, base_feature: "none", -@@ -4384,7 +4384,7 @@ +@@ -4365,7 +4365,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 -@@ -4564,7 +4564,7 @@ +@@ -4515,7 +4515,7 @@ { name: "WebAppScopeExtensions", origin_trial_feature_name: "WebAppScopeExtensions", @@ -54,7 +54,7 @@ status: "experimental", base_feature: "none", }, -@@ -4607,7 +4607,7 @@ +@@ -4558,7 +4558,7 @@ status: "experimental", base_feature: "none", origin_trial_feature_name: "WebAppUrlHandling", diff --git a/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn b/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn index 8256c0dc6015..d220c240e87d 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 2024-04-19 13:02:56 UTC +--- third_party/ffmpeg/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ third_party/ffmpeg/BUILD.gn -@@ -343,7 +343,6 @@ target(link_target_type, "ffmpeg_internal") { +@@ -350,7 +350,6 @@ target(link_target_type, "ffmpeg_internal") { libs += [ "m", "z", diff --git a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc index 4ebf1fcf6385..a266c66d9ff6 100644 --- a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc +++ b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc @@ -1,6 +1,6 @@ ---- third_party/leveldatabase/env_chromium.cc.orig 2024-02-23 21:04:38 UTC +--- third_party/leveldatabase/env_chromium.cc.orig 2024-10-22 08:31:56 UTC +++ third_party/leveldatabase/env_chromium.cc -@@ -326,7 +326,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std:: +@@ -329,7 +329,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std:: Status ChromiumWritableFile::SyncParent() { TRACE_EVENT0("leveldb", "SyncParent"); diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_utils.cc b/www/chromium/files/patch-third__party_perfetto_src_base_utils.cc index d7263e91c097..b9a5eefa8c08 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_base_utils.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_base_utils.cc @@ -1,4 +1,4 @@ ---- third_party/perfetto/src/base/utils.cc.orig 2024-08-26 12:06:38 UTC +--- third_party/perfetto/src/base/utils.cc.orig 2024-10-22 08:31:56 UTC +++ third_party/perfetto/src/base/utils.cc @@ -38,8 +38,9 @@ #include <mach/vm_page_size.h> @@ -7,19 +7,19 @@ -#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ - PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) +#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ -+ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \ ++ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \ + !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) - #include <linux/prctl.h> #include <sys/prctl.h> -@@ -338,8 +339,9 @@ void AlignedFree(void* ptr) { + #ifndef PR_GET_TAGGED_ADDR_CTRL +@@ -337,8 +338,9 @@ void AlignedFree(void* ptr) { } bool IsSyncMemoryTaggingEnabled() { -#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ - PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) +#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ -+ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \ ++ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \ + !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) // Compute only once per lifetime of the process. static bool cached_value = [] { 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 e0369cd495f2..f023c39a6119 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,4 +1,4 @@ ---- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2024-09-30 07:45:04 UTC +--- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2024-10-22 08:31:56 UTC +++ third_party/sqlite/src/amalgamation/sqlite3.c @@ -14187,7 +14187,7 @@ struct fts5_api { ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit @@ -9,7 +9,7 @@ # define _XOPEN_SOURCE 600 #endif -@@ -45170,7 +45170,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -45183,7 +45183,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB memset(zBuf, 0, nBuf); randomnessPid = osGetpid(0); #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS) @@ -22,7 +22,7 @@ int fd, got; fd = robust_open("/dev/urandom", O_RDONLY, 0); if( fd<0 ){ -@@ -45185,6 +45190,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -45198,6 +45203,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB robust_close(0, fd, __LINE__); } } diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn index d8f29dd9e60f..1f1b03594a8b 100644 --- a/www/chromium/files/patch-third__party_webrtc_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/BUILD.gn.orig 2024-08-26 12:06:38 UTC +--- third_party/webrtc/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ third_party/webrtc/BUILD.gn -@@ -215,6 +215,9 @@ config("common_inherited_config") { +@@ -218,6 +218,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } 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 63ec19d4c321..05d05f9d4df3 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-07-30 11:12:21 UTC +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ third_party/webrtc/modules/audio_device/BUILD.gn -@@ -333,7 +333,7 @@ rtc_library("audio_device_impl") { +@@ -330,7 +330,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_video__coding_codecs_av1_libaom__av1__encoder.cc b/www/chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_av1_libaom__av1__encoder.cc new file mode 100644 index 000000000000..3a1a4c20e146 --- /dev/null +++ b/www/chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_av1_libaom__av1__encoder.cc @@ -0,0 +1,23 @@ +--- third_party/webrtc/modules/video_coding/codecs/av1/libaom_av1_encoder.cc.orig 2024-10-22 08:31:56 UTC ++++ third_party/webrtc/modules/video_coding/codecs/av1/libaom_av1_encoder.cc +@@ -299,7 +299,9 @@ int LibaomAv1Encoder::InitEncode(const VideoCodec* cod + SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_ENABLE_PALETTE, 0); + } + ++#ifdef notyet + SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_AUTO_TILES, 1); ++#endif + SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_ROW_MT, 1); + SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_ENABLE_OBMC, 0); + SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_NOISE_SENSITIVITY, 0); +@@ -332,8 +334,10 @@ int LibaomAv1Encoder::InitEncode(const VideoCodec* cod + SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_MAX_REFERENCE_FRAMES, 3); + + if (adaptive_max_consec_drops_) { ++#ifdef notyet + SET_ENCODER_PARAM_OR_RETURN_ERROR(AV1E_SET_MAX_CONSEC_FRAME_DROP_MS_CBR, + 250); ++#endif + } + + return WEBRTC_VIDEO_CODEC_OK; diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc index 5bd234bc4b29..401272424b51 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc @@ -1,9 +1,9 @@ ---- third_party/webrtc/rtc_base/ip_address.cc.orig 2022-05-19 14:06:27 UTC +--- third_party/webrtc/rtc_base/ip_address.cc.orig 2024-10-22 08:31:56 UTC +++ third_party/webrtc/rtc_base/ip_address.cc -@@ -13,7 +13,8 @@ - #include <sys/socket.h> - - #include "absl/strings/string_view.h" +@@ -14,7 +14,8 @@ + #include <cstring> + #include <string> + #if defined(WEBRTC_POSIX) -#ifdef OPENBSD +#if defined(WEBRTC_BSD) +#include <sys/types.h> diff --git a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn index 7b4ee28b4fc3..ebb3fbe1bf82 100644 --- a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/system_wrappers/BUILD.gn.orig 2024-06-17 12:56:06 UTC +--- third_party/webrtc/system_wrappers/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ third_party/webrtc/system_wrappers/BUILD.gn -@@ -63,8 +63,6 @@ rtc_library("system_wrappers") { +@@ -62,8 +62,6 @@ rtc_library("system_wrappers") { if (!build_with_chromium) { sources += [ "source/cpu_features_linux.cc" ] } diff --git a/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc b/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc index de2fe5444183..1488107524d3 100644 --- a/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc +++ b/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc @@ -1,6 +1,6 @@ ---- tools/gn/src/base/files/file_posix.cc.orig 2022-09-24 10:57:32 UTC +--- tools/gn/src/base/files/file_posix.cc.orig 2024-10-22 08:31:56 UTC +++ tools/gn/src/base/files/file_posix.cc -@@ -371,7 +371,7 @@ void File::DoInitialize(const FilePath& path, uint32_t +@@ -359,7 +359,7 @@ void File::DoInitialize(const FilePath& path, uint32_t bool File::Flush() { DCHECK(IsValid()); diff --git a/www/chromium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py b/www/chromium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py index 33f8bb31eebd..0e52e6fb8dc5 100644 --- a/www/chromium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py +++ b/www/chromium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py @@ -1,6 +1,6 @@ ---- tools/json_schema_compiler/cpp_bundle_generator.py.orig 2024-09-30 07:45:04 UTC +--- tools/json_schema_compiler/cpp_bundle_generator.py.orig 2024-10-22 08:31:56 UTC +++ tools/json_schema_compiler/cpp_bundle_generator.py -@@ -148,7 +148,7 @@ class CppBundleGenerator(object): +@@ -145,7 +145,7 @@ class CppBundleGenerator(object): # BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(IS_CHROMEOS_LACROS). ifdefs.append('BUILDFLAG(IS_CHROMEOS_LACROS)') elif platform == Platforms.LINUX: diff --git a/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py index 06c4d10e89bb..5bade055ffc2 100644 --- a/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py +++ b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py @@ -1,6 +1,6 @@ ---- tools/json_schema_compiler/feature_compiler.py.orig 2024-05-21 18:07:39 UTC +--- tools/json_schema_compiler/feature_compiler.py.orig 2024-10-22 08:31:56 UTC +++ tools/json_schema_compiler/feature_compiler.py -@@ -277,6 +277,8 @@ FEATURE_GRAMMAR = ({ +@@ -292,6 +292,8 @@ FEATURE_GRAMMAR = ({ 'linux': 'Feature::LINUX_PLATFORM', 'mac': 'Feature::MACOSX_PLATFORM', 'win': 'Feature::WIN_PLATFORM', diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc index cc14a6419c61..495a5a821f28 100644 --- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- ui/base/resource/resource_bundle.cc.orig 2024-09-30 07:45:04 UTC +--- ui/base/resource/resource_bundle.cc.orig 2024-10-22 08:31:56 UTC +++ ui/base/resource/resource_bundle.cc -@@ -913,7 +913,7 @@ void ResourceBundle::ReloadFonts() { +@@ -914,7 +914,7 @@ void ResourceBundle::ReloadFonts() { } ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const { diff --git a/www/chromium/files/patch-ui_color_color__id.h b/www/chromium/files/patch-ui_color_color__id.h index 9d6a661787ad..afb6c5e97396 100644 --- a/www/chromium/files/patch-ui_color_color__id.h +++ b/www/chromium/files/patch-ui_color_color__id.h @@ -1,6 +1,6 @@ ---- ui/color/color_id.h.orig 2024-08-26 12:06:38 UTC +--- ui/color/color_id.h.orig 2024-10-22 08:31:56 UTC +++ ui/color/color_id.h -@@ -621,7 +621,7 @@ +@@ -622,7 +622,7 @@ \ E_CPONLY(kColorCrosSysPositive) \ E_CPONLY(kColorCrosSysComplementVariant) diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc index 05caad0958a5..d0e640a38172 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-09-30 07:45:04 UTC +--- ui/compositor/compositor.cc.orig 2024-10-22 08:31:56 UTC +++ ui/compositor/compositor.cc -@@ -926,7 +926,7 @@ void Compositor::OnResume() { +@@ -925,7 +925,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 42b4a86d1ca9..2e797a27ee27 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-09-30 07:45:04 UTC +--- ui/compositor/compositor.h.orig 2024-10-22 08:31:56 UTC +++ ui/compositor/compositor.h -@@ -458,7 +458,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe +@@ -457,7 +457,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe // base::PowerSuspendObserver: void OnResume() override; diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn index 9b4c81eccd06..1b9620849b22 100644 --- a/www/chromium/files/patch-ui_gl_BUILD.gn +++ b/www/chromium/files/patch-ui_gl_BUILD.gn @@ -1,23 +1,14 @@ ---- ui/gl/BUILD.gn.orig 2024-08-26 12:06:38 UTC +--- ui/gl/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ ui/gl/BUILD.gn -@@ -149,8 +149,6 @@ component("gl") { - defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] - } - -- include_dirs = [ "//third_party/mesa_headers" ] -- - public_configs = [ "//third_party/khronos:khronos_headers" ] - - deps = [ -@@ -165,7 +163,6 @@ component("gl") { - ] +@@ -168,7 +168,6 @@ component("gl") { public_deps = [ + ":gl_enums", "//base", - "//third_party/mesa_headers", "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -313,7 +310,6 @@ component("gl") { +@@ -316,7 +315,6 @@ component("gl") { data_deps += [ "//third_party/angle:libEGL", "//third_party/angle:libGLESv2", @@ -25,7 +16,7 @@ ] if (enable_swiftshader) { data_deps += [ -@@ -538,7 +534,6 @@ test("gl_unittests") { +@@ -538,7 +536,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", diff --git a/www/chromium/files/patch-ui_gl_gl__context.cc b/www/chromium/files/patch-ui_gl_gl__context.cc index 6c4a32c74541..ecfa7aa6ccdf 100644 --- a/www/chromium/files/patch-ui_gl_gl__context.cc +++ b/www/chromium/files/patch-ui_gl_gl__context.cc @@ -1,6 +1,6 @@ ---- ui/gl/gl_context.cc.orig 2024-08-26 12:06:38 UTC +--- ui/gl/gl_context.cc.orig 2024-10-22 08:31:56 UTC +++ ui/gl/gl_context.cc -@@ -509,7 +509,7 @@ bool GLContext::MakeVirtuallyCurrent( +@@ -522,7 +522,7 @@ bool GLContext::MakeVirtuallyCurrent( DCHECK(virtual_context->IsCurrent(surface)); if (switched_real_contexts || virtual_context != current_virtual_context_) { diff --git a/www/chromium/files/patch-ui_gl_gl__implementation.cc b/www/chromium/files/patch-ui_gl_gl__implementation.cc index 76e6bea8fb0d..676bfcfe4a8a 100644 --- a/www/chromium/files/patch-ui_gl_gl__implementation.cc +++ b/www/chromium/files/patch-ui_gl_gl__implementation.cc @@ -1,6 +1,6 @@ ---- ui/gl/gl_implementation.cc.orig 2024-09-30 07:45:04 UTC +--- ui/gl/gl_implementation.cc.orig 2024-10-22 08:31:56 UTC +++ ui/gl/gl_implementation.cc -@@ -252,7 +252,7 @@ GetRequestedGLImplementationFromCommandLine( +@@ -253,7 +253,7 @@ GetRequestedGLImplementationFromCommandLine( const base::CommandLine* command_line) { bool overrideUseSoftwareGL = command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests); diff --git a/www/chromium/files/patch-ui_gl_gl__switches.cc b/www/chromium/files/patch-ui_gl_gl__switches.cc index f21605470b46..bfe00267a4ad 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-09-30 07:45:04 UTC +--- ui/gl/gl_switches.cc.orig 2024-10-22 08:31: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 -@@ -284,7 +284,7 @@ bool IsDefaultANGLEVulkan() { +@@ -288,7 +288,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; -@@ -296,7 +296,7 @@ bool IsDefaultANGLEVulkan() { +@@ -300,7 +300,7 @@ bool IsDefaultANGLEVulkan() { const auto& active_gpu = system_info.gpus[system_info.activeGPUIndex]; diff --git a/www/chromium/files/patch-ui_ozone_common_features.cc b/www/chromium/files/patch-ui_ozone_common_features.cc index 7b312489b114..9af6132ee450 100644 --- a/www/chromium/files/patch-ui_ozone_common_features.cc +++ b/www/chromium/files/patch-ui_ozone_common_features.cc @@ -1,4 +1,4 @@ ---- ui/ozone/common/features.cc.orig 2023-05-31 08:12:17 UTC +--- ui/ozone/common/features.cc.orig 2024-10-22 08:31:56 UTC +++ ui/ozone/common/features.cc @@ -30,7 +30,7 @@ BASE_FEATURE(kWaylandSurfaceSubmissionInPixelCoordinat // enabled. @@ -9,3 +9,12 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT +@@ -42,7 +42,7 @@ BASE_FEATURE(kWaylandFractionalScaleV1, + // protocol is supported. + BASE_FEATURE(kWaylandXdgToplevelDrag, + "WaylandXdgToplevelDrag", +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT 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 797e8e14845b..d65661645ef9 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-09-30 07:45:04 UTC +--- ui/ozone/platform/wayland/common/wayland_util.cc.orig 2024-10-23 07:00:35 UTC +++ ui/ozone/platform/wayland/common/wayland_util.cc -@@ -344,7 +344,7 @@ void TransformToWlArray( +@@ -347,7 +347,7 @@ void TransformToWlArray( } base::TimeTicks EventMillisecondsToTimeTicks(uint32_t milliseconds) { @@ -9,3 +9,12 @@ // TODO(crbug.com/40287874): `milliseconds` comes from Weston that // uses timestamp from libinput, which is different from TimeTicks. // Use EventTimeForNow(), for now. +@@ -389,7 +389,7 @@ bool MaybeHandlePlatformEventForDrag(const ui::Platfor + } + + void RecordConnectionMetrics(wl_display* display) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + CHECK(display); + + // These values are logged to metrics so must not be changed. 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 index d54fa9586474..1799b3573172 100644 --- 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 @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_connection.cc.orig 2024-09-30 07:45:04 UTC +--- ui/ozone/platform/wayland/host/wayland_connection.cc.orig 2024-10-22 08:31:56 UTC +++ ui/ozone/platform/wayland/host/wayland_connection.cc -@@ -537,7 +537,7 @@ bool WaylandConnection::ShouldUseOverlayDelegation() c +@@ -541,7 +541,7 @@ bool WaylandConnection::ShouldUseOverlayDelegation() c // isn't present on any non-exo Wayland compositors. bool should_use_overlay_delegation = IsWaylandOverlayDelegationEnabled() && !fractional_scale_manager_v1(); diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.cc new file mode 100644 index 000000000000..7937489a04cb --- /dev/null +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.cc @@ -0,0 +1,29 @@ +--- ui/ozone/platform/wayland/host/wayland_screen.cc.orig 2024-10-22 08:31:56 UTC ++++ ui/ozone/platform/wayland/host/wayland_screen.cc +@@ -46,7 +46,7 @@ + #include "ui/ozone/platform/wayland/host/org_gnome_mutter_idle_monitor.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #endif + +@@ -133,7 +133,7 @@ WaylandScreen::WaylandScreen(WaylandConnection* connec + tablet_state_ = connection_->GetTabletState(); + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (auto* linux_ui = ui::LinuxUi::instance()) { + OnDeviceScaleFactorChanged(); + display_scale_factor_observer_.Observe(linux_ui); +@@ -606,7 +606,7 @@ bool WaylandScreen::VerifyOutputStateConsistentForTest + return true; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void WaylandScreen::OnDeviceScaleFactorChanged() { + if (const auto* linux_ui = ui::LinuxUi::instance()) { + const float new_font_scale = linux_ui->display_config().font_scale; diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.h b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.h new file mode 100644 index 000000000000..d17eee298e45 --- /dev/null +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.h @@ -0,0 +1,38 @@ +--- ui/ozone/platform/wayland/host/wayland_screen.h.orig 2024-10-22 08:31:56 UTC ++++ ui/ozone/platform/wayland/host/wayland_screen.h +@@ -24,7 +24,7 @@ + #include "ui/ozone/platform/wayland/host/wayland_output.h" + #include "ui/ozone/public/platform_screen.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/scoped_observation.h" + #include "ui/linux/device_scale_factor_observer.h" + #include "ui/linux/linux_ui.h" +@@ -44,7 +44,7 @@ class OrgGnomeMutterIdleMonitor; + + // A PlatformScreen implementation for Wayland. + class WaylandScreen : public PlatformScreen +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + , + public DeviceScaleFactorObserver + #endif +@@ -96,7 +96,7 @@ class WaylandScreen : public PlatformScreen + display::TabletState GetTabletState() const override; + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // DeviceScaleFactorObserver: + void OnDeviceScaleFactorChanged() override; + #endif +@@ -158,7 +158,7 @@ class WaylandScreen : public PlatformScreen + display::TabletState tablet_state_; + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + float font_scale_ = 1.0f; + + base::ScopedObservation<ui::LinuxUi, DeviceScaleFactorObserver> diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc index f2f1756b0a97..f6b690809364 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_window.cc.orig 2024-08-26 12:06:38 UTC +--- ui/ozone/platform/wayland/host/wayland_window.cc.orig 2024-10-22 08:31:56 UTC +++ ui/ozone/platform/wayland/host/wayland_window.cc -@@ -317,7 +317,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused +@@ -318,7 +318,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused // Whenever the window gets the pointer focus back, the cursor shape must be // updated. Otherwise, it is invalidated upon wl_pointer::leave and is not // restored by the Wayland compositor. @@ -9,7 +9,7 @@ if (focused && async_cursor_) { async_cursor_->AddCursorLoadedCallback(base::BindOnce( &WaylandWindow::OnCursorLoaded, AsWeakPtr(), async_cursor_)); -@@ -575,7 +575,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const { +@@ -584,7 +584,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const { void WaylandWindow::SetCursor(scoped_refptr<PlatformCursor> platform_cursor) { DCHECK(platform_cursor); @@ -18,7 +18,7 @@ auto async_cursor = WaylandAsyncCursor::FromPlatformCursor(platform_cursor); if (async_cursor_ == async_cursor) { -@@ -786,7 +786,7 @@ std::string WaylandWindow::WindowStates::ToString() co +@@ -795,7 +795,7 @@ std::string WaylandWindow::WindowStates::ToString() co } else { base::TrimString(states, " ", &states); } @@ -27,7 +27,7 @@ states += "; tiled_edges: "; std::string tiled = ""; if (tiled_edges.left) { -@@ -1274,12 +1274,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi +@@ -1283,12 +1283,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi cursor->bitmaps(), hotspot_in_dips, std::ceil(cursor->cursor_image_scale_factor())); } 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 b23edd25b6be..103d58524087 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-09-30 07:45:04 UTC +--- ui/ozone/platform/wayland/host/wayland_window.h.orig 2024-10-22 08:31:56 UTC +++ ui/ozone/platform/wayland/host/wayland_window.h @@ -41,7 +41,7 @@ #include "ui/platform_window/platform_window_init_properties.h" @@ -9,7 +9,7 @@ #include "ui/ozone/platform/wayland/host/wayland_async_cursor.h" #endif -@@ -284,7 +284,7 @@ class WaylandWindow : public PlatformWindow, +@@ -285,7 +285,7 @@ class WaylandWindow : public PlatformWindow, bool is_snapped_secondary = false; bool is_floated = false; bool is_pip = false; @@ -18,7 +18,7 @@ WindowTiledEdges tiled_edges; #endif -@@ -564,7 +564,7 @@ class WaylandWindow : public PlatformWindow, +@@ -569,7 +569,7 @@ class WaylandWindow : public PlatformWindow, void UpdateCursorShape(scoped_refptr<BitmapCursor> cursor); @@ -27,7 +27,7 @@ void OnCursorLoaded(scoped_refptr<WaylandAsyncCursor> cursor, scoped_refptr<BitmapCursor> bitmap_cursor); #endif -@@ -633,7 +633,7 @@ class WaylandWindow : public PlatformWindow, +@@ -638,7 +638,7 @@ class WaylandWindow : public PlatformWindow, wl::Object<zaura_surface> aura_surface_; diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc index 88c69434f539..2c481758f96c 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig 2024-09-30 07:45:04 UTC +--- ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig 2024-10-22 08:31:56 UTC +++ ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc -@@ -261,6 +261,10 @@ void ZWPTextInputWrapperV1::SetSurroundingText( +@@ -256,6 +256,10 @@ void ZWPTextInputWrapperV1::SetSurroundingText( // so if it exceeds 16 bits, it may be broken. static constexpr size_t kSizeLimit = 60000; if (HasAdvancedSurroundingTextSupport() && text.length() > kSizeLimit) { @@ -11,7 +11,7 @@ base::ScopedFD memfd(memfd_create("surrounding_text", MFD_CLOEXEC)); if (!memfd.get()) { PLOG(ERROR) << "Failed to create memfd"; -@@ -273,6 +277,7 @@ void ZWPTextInputWrapperV1::SetSurroundingText( +@@ -268,6 +272,7 @@ void ZWPTextInputWrapperV1::SetSurroundingText( zcr_extended_text_input_v1_set_large_surrounding_text( extended_obj_.get(), memfd.get(), text.length(), selection_range.start(), selection_range.end()); 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 981ceed20443..cb1d1744dec8 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,4 +1,4 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2024-09-30 07:45:04 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2024-10-22 08:31:56 UTC +++ ui/views/controls/textfield/textfield.cc @@ -85,7 +85,7 @@ #include "base/win/win_util.h" @@ -18,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -757,7 +757,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -761,7 +761,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 && -@@ -940,7 +940,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -944,7 +944,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; -@@ -1995,7 +1995,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1994,7 +1994,7 @@ bool Textfield::ShouldDoLearning() { return false; } @@ -45,7 +45,7 @@ // TODO(crbug.com/41452689): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2501,14 +2501,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2500,14 +2500,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } 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 98a0706a53c9..d47aa672a2e8 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 2024-06-17 12:56:06 UTC +--- ui/views/corewm/tooltip_aura.cc.orig 2024-10-22 08:31:56 UTC +++ ui/views/corewm/tooltip_aura.cc -@@ -36,7 +36,7 @@ namespace { +@@ -37,7 +37,7 @@ namespace { bool CanUseTranslucentTooltipWidget() { // TODO(crbug.com/40118868): 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__drag__drop__client__ozone.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc index 4f442bbc4243..0aff48ffc838 100644 --- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2024-08-26 12:06:38 UTC +--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2024-10-22 08:31:56 UTC +++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc -@@ -197,7 +197,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd +@@ -206,7 +206,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd return selected_operation_; } diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h index 044ff317287a..2ac770e8258a 100644 --- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig 2024-02-23 21:04:38 UTC +--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig 2024-10-22 08:31:56 UTC +++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h -@@ -65,7 +65,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone +@@ -66,7 +66,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone // The offset of |drag_widget_| relative to the mouse position. gfx::Vector2d offset; @@ -9,7 +9,7 @@ // The last received drag location. The drag widget is moved asynchronously // so its position is updated when the UI thread has time for that. When // the first change to the location happens, a call to UpdateDragWidget() -@@ -86,7 +86,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone +@@ -87,7 +87,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone const gfx::Point& root_location, int allowed_operations, ui::mojom::DragEventSource source) override; diff --git a/www/chromium/files/patch-ui_views_widget_root__view.cc b/www/chromium/files/patch-ui_views_widget_root__view.cc index 323d14e3cb95..554b4d8a1f27 100644 --- a/www/chromium/files/patch-ui_views_widget_root__view.cc +++ b/www/chromium/files/patch-ui_views_widget_root__view.cc @@ -1,11 +1,11 @@ ---- ui/views/widget/root_view.cc.orig 2024-09-30 07:45:04 UTC +--- ui/views/widget/root_view.cc.orig 2024-10-22 08:31:56 UTC +++ ui/views/widget/root_view.cc -@@ -135,7 +135,7 @@ class AnnounceTextView : public View { +@@ -139,7 +139,7 @@ class AnnounceTextView : public View { #if BUILDFLAG(IS_CHROMEOS) // On ChromeOS, kAlert role can invoke an unnecessary event on reparenting. - node_data->role = ax::mojom::Role::kStaticText; + GetViewAccessibility().SetRole(ax::mojom::Role::kStaticText); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // TODO(crbug.com/40658933): Use live regions (do not use alerts). // May require setting kLiveStatus, kContainerLiveStatus to "polite". - node_data->role = ax::mojom::Role::kAlert; + GetViewAccessibility().SetRole(ax::mojom::Role::kAlert); diff --git a/www/chromium/files/patch-ui_views_widget_widget.cc b/www/chromium/files/patch-ui_views_widget_widget.cc index 20d7486db269..84abc077b3a7 100644 --- a/www/chromium/files/patch-ui_views_widget_widget.cc +++ b/www/chromium/files/patch-ui_views_widget_widget.cc @@ -1,4 +1,4 @@ ---- ui/views/widget/widget.cc.orig 2024-09-30 07:45:04 UTC +--- ui/views/widget/widget.cc.orig 2024-10-22 08:31:56 UTC +++ ui/views/widget/widget.cc @@ -58,7 +58,7 @@ #include "ui/views/window/custom_frame_view.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -2192,7 +2192,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2203,7 +2203,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const if (parent_) return parent_->GetNativeTheme(); diff --git a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc index 28f016945bb5..3d9c205bc011 100644 --- a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc +++ b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/window/dialog_delegate.cc.orig 2024-09-30 07:45:04 UTC +--- ui/views/window/dialog_delegate.cc.orig 2024-10-22 08:31:56 UTC +++ ui/views/window/dialog_delegate.cc -@@ -104,7 +104,7 @@ Widget* DialogDelegate::CreateDialogWidget( +@@ -105,7 +105,7 @@ Widget* DialogDelegate::CreateDialogWidget( // static bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) { diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index f378d99d907c..c1eea0b9dd95 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-09-30 07:45:04 UTC +--- v8/BUILD.gn.orig 2024-10-22 08:31:56 UTC +++ v8/BUILD.gn -@@ -917,6 +917,8 @@ external_v8_defines = [ +@@ -907,6 +907,8 @@ external_v8_defines = [ "V8_TARGET_OS_MACOS", "V8_TARGET_OS_WIN", "V8_TARGET_OS_CHROMEOS", @@ -9,7 +9,7 @@ ] enabled_external_v8_defines = [ -@@ -993,6 +995,12 @@ if (target_os == "android") { +@@ -983,6 +985,12 @@ if (target_os == "android") { } else if (target_os == "chromeos") { enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ] enabled_external_v8_defines += [ "V8_TARGET_OS_CHROMEOS" ] @@ -22,7 +22,7 @@ } disabled_external_v8_defines = external_v8_defines - enabled_external_v8_defines -@@ -2519,6 +2527,12 @@ template("run_mksnapshot") { +@@ -2535,6 +2543,12 @@ template("run_mksnapshot") { if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) { args += [ "--reorder-builtins" ] } @@ -35,7 +35,7 @@ } if (v8_enable_turboshaft_csa) { -@@ -6641,7 +6655,7 @@ v8_component("v8_libbase") { +@@ -6625,7 +6639,7 @@ v8_component("v8_libbase") { } } @@ -44,7 +44,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -6652,6 +6666,18 @@ v8_component("v8_libbase") { +@@ -6636,6 +6650,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/chromium/files/patch-v8_include_v8-internal.h b/www/chromium/files/patch-v8_include_v8-internal.h index b3959ade3d49..c4264fc727e6 100644 --- a/www/chromium/files/patch-v8_include_v8-internal.h +++ b/www/chromium/files/patch-v8_include_v8-internal.h @@ -1,6 +1,6 @@ ---- v8/include/v8-internal.h.orig 2024-07-30 11:12:21 UTC +--- v8/include/v8-internal.h.orig 2024-10-22 08:31:56 UTC +++ v8/include/v8-internal.h -@@ -213,7 +213,7 @@ using SandboxedPointer_t = Address; +@@ -229,7 +229,7 @@ using SandboxedPointer_t = Address; #ifdef V8_ENABLE_SANDBOX // Size of the sandbox, excluding the guard regions surrounding it. diff --git a/www/chromium/files/patch-v8_include_v8config.h b/www/chromium/files/patch-v8_include_v8config.h index b1ee1b194c81..fc0b948317e3 100644 --- a/www/chromium/files/patch-v8_include_v8config.h +++ b/www/chromium/files/patch-v8_include_v8config.h @@ -1,4 +1,4 @@ ---- v8/include/v8config.h.orig 2024-09-30 07:45:04 UTC +--- v8/include/v8config.h.orig 2024-10-22 08:31:56 UTC +++ v8/include/v8config.h @@ -201,6 +201,8 @@ path. Add it with -I<path> to the command line && !defined(V8_TARGET_OS_FUCHSIA) \ @@ -28,7 +28,7 @@ +#endif + +#ifdef V8_OS_FREEBSD -+# define V8_TARGET_OS_FREEBSD ++# define V8_TARGET_OS_OPENBSD +# define V8_TARGET_OS_BSD +#endif + diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc index 39345e688c2b..d8add43d4dc1 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-09-30 07:45:04 UTC +--- v8/src/api/api.cc.orig 2024-10-22 08:31:56 UTC +++ v8/src/api/api.cc @@ -149,7 +149,7 @@ #include "src/wasm/wasm-serialization.h" @@ -9,7 +9,7 @@ #include <signal.h> #include <unistd.h> -@@ -6523,7 +6523,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6525,7 +6525,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/chromium/files/patch-v8_src_base_platform_memory.h b/www/chromium/files/patch-v8_src_base_platform_memory.h index 1e80422187cd..dbd115bfb277 100644 --- a/www/chromium/files/patch-v8_src_base_platform_memory.h +++ b/www/chromium/files/patch-v8_src_base_platform_memory.h @@ -1,9 +1,9 @@ ---- v8/src/base/platform/memory.h.orig 2024-08-26 12:06:38 UTC +--- v8/src/base/platform/memory.h.orig 2024-10-22 08:31:56 UTC +++ v8/src/base/platform/memory.h -@@ -19,13 +19,13 @@ - - #if V8_OS_DARWIN +@@ -21,13 +21,13 @@ #include <malloc/malloc.h> + #elif V8_OS_OPENBSD + #include <sys/malloc.h> -#elif V8_OS_ZOS +#elif (V8_OS_ZOS || V8_OS_BSD) #include <stdlib.h> @@ -11,7 +11,7 @@ #include <malloc.h> #endif --#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS && !V8_OS_ZOS) || V8_OS_WIN +-#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS && !V8_OS_ZOS && !V8_OS_OPENBSD) || V8_OS_WIN +#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS && !V8_OS_ZOS && !V8_OS_BSD) || V8_OS_WIN #define V8_HAS_MALLOC_USABLE_SIZE 1 #endif diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc index 930e96d3e679..2a753e7ac56e 100644 --- a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,15 +1,6 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2024-09-30 07:45:04 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2024-10-22 08:31:56 UTC +++ v8/src/base/platform/platform-posix.cc -@@ -55,7 +55,7 @@ - #if V8_OS_DARWIN - #include <mach/mach.h> - #include <malloc/malloc.h> --#elif !V8_OS_ZOS -+#elif !V8_OS_ZOS && !V8_OS_BSD - #include <malloc.h> - #endif - -@@ -73,7 +73,7 @@ +@@ -75,7 +75,7 @@ #include <sys/syscall.h> #endif @@ -18,7 +9,7 @@ #define MAP_ANONYMOUS MAP_ANON #endif -@@ -312,8 +312,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { +@@ -314,8 +314,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { } } @@ -34,7 +25,7 @@ uintptr_t raw_addr; { MutexGuard guard(rng_mutex.Pointer()); -@@ -408,6 +415,7 @@ void* OS::GetRandomMmapAddr() { +@@ -416,6 +423,7 @@ void* OS::GetRandomMmapAddr() { #endif return reinterpret_cast<void*>(raw_addr); } @@ -42,7 +33,7 @@ // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files. #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA -@@ -682,7 +690,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor +@@ -704,7 +712,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor #if !V8_OS_ZOS // static bool OS::HasLazyCommits() { @@ -51,7 +42,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1328,7 +1336,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1350,7 +1358,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* // keep this version in POSIX as most Linux-compatible derivatives will // support it. MacOS and FreeBSD are different here. #if !defined(V8_OS_FREEBSD) && !defined(V8_OS_DARWIN) && !defined(_AIX) && \ diff --git a/www/chromium/files/patch-v8_src_base_sys-info.cc b/www/chromium/files/patch-v8_src_base_sys-info.cc index d3c532c9289f..f7429f1ac8f0 100644 --- a/www/chromium/files/patch-v8_src_base_sys-info.cc +++ b/www/chromium/files/patch-v8_src_base_sys-info.cc @@ -1,6 +1,6 @@ ---- v8/src/base/sys-info.cc.orig 2022-02-07 13:39:41 UTC +--- v8/src/base/sys-info.cc.orig 2024-10-22 08:31:56 UTC +++ v8/src/base/sys-info.cc -@@ -38,7 +38,7 @@ namespace base { +@@ -36,7 +36,7 @@ namespace base { // static int SysInfo::NumberOfProcessors() { #if V8_OS_OPENBSD diff --git a/www/chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc b/www/chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc new file mode 100644 index 000000000000..2960a88b0451 --- /dev/null +++ b/www/chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc @@ -0,0 +1,14 @@ +--- v8/src/builtins/x64/builtins-x64.cc.orig 2024-10-22 08:31:56 UTC ++++ v8/src/builtins/x64/builtins-x64.cc +@@ -2838,7 +2838,11 @@ void Generate_OSREntry(MacroAssembler* masm, Register + // Drop the return address on the stack and jump to the OSR entry + // point of the function. + __ Drop(1); ++#ifdef V8_ENABLE_CET_IBT ++ __ jmp(entry_address, /*notrack=*/true); ++#else + __ jmp(entry_address); ++#endif + } + + enum class OsrSourceTier { diff --git a/www/chromium/files/patch-v8_src_execution_isolate.cc b/www/chromium/files/patch-v8_src_execution_isolate.cc index 278134fa9b51..2ffe55a85bb9 100644 --- a/www/chromium/files/patch-v8_src_execution_isolate.cc +++ b/www/chromium/files/patch-v8_src_execution_isolate.cc @@ -1,6 +1,6 @@ ---- v8/src/execution/isolate.cc.orig 2024-09-30 07:45:04 UTC +--- v8/src/execution/isolate.cc.orig 2024-10-22 08:31:56 UTC +++ v8/src/execution/isolate.cc -@@ -164,6 +164,10 @@ +@@ -168,6 +168,10 @@ #include "src/execution/simulator-base.h" #endif @@ -11,7 +11,7 @@ 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_[]; -@@ -4958,6 +4962,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -4971,6 +4975,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() { uint32_t code_size = DefaultEmbeddedBlobCodeSize(); const uint8_t* data = DefaultEmbeddedBlobData(); uint32_t data_size = DefaultEmbeddedBlobDataSize(); diff --git a/www/chromium/files/patch-v8_src_flags_flags.cc b/www/chromium/files/patch-v8_src_flags_flags.cc index 67f6520c76d5..8f77fa86fa9d 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-09-30 07:45:04 UTC +--- v8/src/flags/flags.cc.orig 2024-10-22 08:31:56 UTC +++ v8/src/flags/flags.cc @@ -16,6 +16,10 @@ #include <set> @@ -11,19 +11,7 @@ #include "src/base/functional.h" #include "src/base/lazy-instance.h" #include "src/base/platform/platform.h" -@@ -35,7 +39,11 @@ - namespace v8::internal { - - // Define {v8_flags}, declared in flags.h. -+#if V8_OS_OPENBSD -+FlagValues v8_flags __attribute__((section(".openbsd.mutable"))); -+#else - FlagValues v8_flags; -+#endif - - // {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 -@@ -807,6 +815,10 @@ void FlagList::FreezeFlags() { +@@ -807,6 +811,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_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h b/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h index 9d1c731238e6..d5c3a478dfa5 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-09-30 07:45:04 UTC +--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig 2024-10-22 08:31:56 UTC +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h -@@ -505,7 +505,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst +@@ -512,7 +512,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) { -@@ -585,7 +585,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis +@@ -592,7 +592,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 +@@ -671,7 +671,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, +@@ -689,7 +689,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 }; +@@ -759,7 +759,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 +@@ -827,7 +827,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 +@@ -942,7 +942,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 +@@ -1038,7 +1038,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 +@@ -1052,7 +1052,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 +@@ -1065,7 +1065,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 +@@ -1079,7 +1079,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 +@@ -1093,7 +1093,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 +@@ -1107,7 +1107,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 +@@ -1122,7 +1122,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add } void LiftoffAssembler::AtomicCompareExchange( diff --git a/www/chromium/files/patch-v8_tools_run.py b/www/chromium/files/patch-v8_tools_run.py index 194cc4ae7c4c..5606a90b788e 100644 --- a/www/chromium/files/patch-v8_tools_run.py +++ b/www/chromium/files/patch-v8_tools_run.py @@ -1,11 +1,11 @@ ---- v8/tools/run.py.orig 2022-05-19 14:06:27 UTC +--- v8/tools/run.py.orig 2024-10-22 08:31:56 UTC +++ v8/tools/run.py -@@ -9,7 +9,7 @@ scripts.""" - import subprocess - import sys +@@ -21,7 +21,7 @@ if cmd and cmd[0] == '--redirect-stdout': + kwargs = dict(stdout=subprocess.PIPE) + cmd = cmd[2:] --result = subprocess.call(sys.argv[1:]) -+sys.exit(subprocess.call(sys.argv[1:], env={"LD_LIBRARY_PATH":"${WRKSRC}/out/Release"})) - if result != 0: - # Windows error codes such as 0xC0000005 and 0xC0000409 are much easier - # to recognize and differentiate in hex. +-process = subprocess.Popen(cmd, **kwargs) ++process = subprocess.Popen(cmd, env={"LD_LIBRARY_PATH":"${WRKSRC}/out/Release"}, **kwargs) + stdout, _ = process.communicate() + if stdout_file: + with stdout_file.open('w') as f: |