diff options
Diffstat (limited to 'www/chromium')
293 files changed, 1773 insertions, 1380 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 3189946b487e..d690a84f9f67 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,6 +1,5 @@ PORTNAME= chromium -PORTVERSION= 117.0.5938.149 -PORTREVISION= 2 +PORTVERSION= 118.0.5993.70 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:external diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 82486a551870..b2f208fe9651 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1696414784 -SHA256 (chromium-117.0.5938.149.tar.xz) = ddd7c852bd191c0917ab800655da341e7583c2377ca220ae077fc5de7fc7d9df -SIZE (chromium-117.0.5938.149.tar.xz) = 3141300340 -SHA256 (chrome-linux-117.0.5938.149-llvm13.profdata.tar.xz) = ed73d6b2643dd3060670c99c4c708b10d2e5403d7f6edcf8489591a813b48993 -SIZE (chrome-linux-117.0.5938.149-llvm13.profdata.tar.xz) = 28666288 -SHA256 (chromium-117.0.5938.149-testdata.tar.xz) = 385aeae97e66a66ef0adab0397538a99d9ac59c3bb4c715f63ae1431cfb89248 -SIZE (chromium-117.0.5938.149-testdata.tar.xz) = 264315044 +TIMESTAMP = 1697050996 +SHA256 (chromium-118.0.5993.70.tar.xz) = 49ee00a734de3dae7c421eb3c974e8d451b4de6f5b4e34b603fd6435eab6993d +SIZE (chromium-118.0.5993.70.tar.xz) = 3236238920 +SHA256 (chrome-linux-118.0.5993.70-llvm13.profdata.tar.xz) = bd3bf4191752db7ccaa9c29e246f82f29f69a953c03ede7c818ff11d5db629f7 +SIZE (chrome-linux-118.0.5993.70-llvm13.profdata.tar.xz) = 28957632 +SHA256 (chromium-118.0.5993.70-testdata.tar.xz) = f02faeaa1dbc06ba8dbb61caddb9015e213fa548fc27b18533d75ce5cae08ee0 +SIZE (chromium-118.0.5993.70-testdata.tar.xz) = 267730908 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734 diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index 2059a90ff070..9fdc6a87cf31 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2023-09-13 12:11:42 UTC +--- BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ BUILD.gn @@ -61,7 +61,7 @@ declare_args() { root_extra_deps = [] @@ -17,7 +17,7 @@ "//net:net_unittests", "//sandbox:sandbox_unittests", "//services:services_unittests", -@@ -422,7 +421,7 @@ group("gn_all") { +@@ -417,7 +416,7 @@ group("gn_all") { } } @@ -26,7 +26,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -622,6 +621,15 @@ group("gn_all") { +@@ -617,6 +616,15 @@ group("gn_all") { } } @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:dump_syms", -@@ -671,7 +679,7 @@ group("gn_all") { +@@ -666,7 +674,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -51,7 +51,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -1095,7 +1103,7 @@ if (!is_ios && !is_cronet_build) { +@@ -1094,7 +1102,7 @@ if (use_blink && !is_cronet_build) { ] } @@ -60,7 +60,7 @@ script_test("webdriver_wpt_tests") { script = "//third_party/blink/tools/run_wpt_tests.py" args = [ -@@ -1185,7 +1193,7 @@ if (!is_ios && !is_cronet_build) { +@@ -1184,7 +1192,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -69,7 +69,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1194,7 +1202,7 @@ if (!is_ios && !is_cronet_build) { +@@ -1193,7 +1201,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -78,7 +78,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1654,7 +1662,7 @@ group("chromium_builder_perf") { +@@ -1653,7 +1661,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 968d1ae65166..d3f084541b7e 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,4 +1,4 @@ ---- base/BUILD.gn.orig 2023-09-13 12:11:42 UTC +--- base/BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ base/BUILD.gn @@ -198,7 +198,7 @@ buildflag_header("ios_cronet_buildflags") { flags = [ "CRONET_BUILD=$is_cronet_build" ] @@ -9,7 +9,7 @@ buildflag_header("message_pump_buildflags") { header = "message_pump_buildflags.h" header_dir = "base/message_loop" -@@ -1112,11 +1112,23 @@ component("base") { +@@ -1111,11 +1111,23 @@ component("base") { # Needed for <atomic> if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -33,8 +33,8 @@ + if (use_allocator_shim) { if (is_apple) { - sources += [ "allocator/early_zone_registration_mac.h" ] -@@ -1133,7 +1145,7 @@ component("base") { + sources += [ "allocator/early_zone_registration_apple.h" ] +@@ -1135,7 +1147,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -43,7 +43,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2075,6 +2087,22 @@ component("base") { +@@ -2080,6 +2092,22 @@ component("base") { ] } @@ -66,7 +66,7 @@ # iOS if (is_ios) { sources += [ -@@ -2207,6 +2235,29 @@ component("base") { +@@ -2212,6 +2240,29 @@ component("base") { } } @@ -96,7 +96,7 @@ if (use_blink) { sources += [ "files/file_path_watcher.cc", -@@ -2217,7 +2268,7 @@ component("base") { +@@ -2222,7 +2273,7 @@ component("base") { } if (dep_libevent) { @@ -105,7 +105,7 @@ } if (use_libevent) { -@@ -3587,7 +3638,7 @@ test("base_unittests") { +@@ -3596,7 +3647,7 @@ test("base_unittests") { ] } @@ -114,7 +114,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3608,7 +3659,7 @@ test("base_unittests") { +@@ -3617,7 +3668,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -123,7 +123,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3619,7 +3670,7 @@ test("base_unittests") { +@@ -3628,7 +3679,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -132,7 +132,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3871,7 +3922,7 @@ test("base_unittests") { +@@ -3884,7 +3935,7 @@ test("base_unittests") { } } diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_BUILD.gn b/www/chromium/files/patch-base_allocator_partition__allocator_BUILD.gn index 0ee8d3a24baf..7bf4d91aa232 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_BUILD.gn +++ b/www/chromium/files/patch-base_allocator_partition__allocator_BUILD.gn @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/BUILD.gn.orig 2023-09-13 12:11:42 UTC +--- base/allocator/partition_allocator/BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ base/allocator/partition_allocator/BUILD.gn -@@ -541,7 +541,7 @@ source_set("allocator_shim") { +@@ -562,7 +562,7 @@ source_set("allocator_shim") { ] configs += [ ":mac_no_default_new_delete_symbols" ] } 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 650ecbb2b699..b54367652de0 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,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-09-13 12:11:42 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-10-11 18:22:24 UTC +++ base/allocator/partition_allocator/partition_alloc.gni -@@ -332,7 +332,7 @@ declare_args() { +@@ -328,7 +328,7 @@ declare_args() { # pkeys support is explicitly disabled in all Cronet builds, as some test # dependencies that use partition_allocator are compiled in AOSP against a # version of glibc that does not include pkeys syscall numbers. diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_debug_stack__trace__posix.cc new file mode 100644 index 000000000000..9bf380b83878 --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_debug_stack__trace__posix.cc @@ -0,0 +1,34 @@ +--- base/allocator/partition_allocator/partition_alloc_base/debug/stack_trace_posix.cc.orig 2023-10-11 18:22:24 UTC ++++ base/allocator/partition_allocator/partition_alloc_base/debug/stack_trace_posix.cc +@@ -12,11 +12,11 @@ + #include <string.h> + #include <unistd.h> + +-#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_APPLE) ++#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) + #include <link.h> // For ElfW() macro. + #endif + +-#if BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) + #define HAVE_DLADDR + #include <dlfcn.h> + #endif +@@ -25,7 +25,7 @@ namespace partition_alloc::internal::base::debug { + + namespace { + +-#if !BUILDFLAG(IS_APPLE) ++#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) + + constexpr size_t kBufferSize = 4096u; + +@@ -359,7 +359,7 @@ void PrintStackTraceInternal(void* const* trace, size_ + } + #endif // !BUILDFLAG(IS_APPLE) + +-#if BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) + // Since /proc/self/maps is not available, use dladdr() to obtain module + // names and offsets inside the modules from the given addresses. + void PrintStackTraceInternal(void* const* trace, size_t size) { diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h index 32c3f467758c..76697bda70fb 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-09-13 12:11:42 UTC +--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-10-11 18:22:24 UTC +++ base/allocator/partition_allocator/partition_alloc_config.h @@ -94,7 +94,7 @@ static_assert(sizeof(void*) != 8, ""); // POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific @@ -9,7 +9,7 @@ // On some platforms, we implement locking by spinning in userspace, then going // into the kernel only if there is contention. This requires platform support, -@@ -236,7 +236,7 @@ constexpr bool kUseLazyCommit = false; +@@ -237,7 +237,7 @@ constexpr bool kUseLazyCommit = false; // On these platforms, lock all the partitions before fork(), and unlock after. // This may be required on more platforms in the future. #define PA_CONFIG_HAS_ATFORK_HANDLER() \ @@ -18,7 +18,7 @@ // PartitionAlloc uses PartitionRootEnumerator to acquire all // PartitionRoots at BeforeFork and to release at AfterFork. -@@ -283,7 +283,7 @@ constexpr bool kUseLazyCommit = false; +@@ -284,7 +284,7 @@ constexpr bool kUseLazyCommit = false; // Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to // larger slot spans. #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() \ diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc index ef3bf3657c59..81eda43af37c 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_root.cc.orig 2023-09-13 12:11:42 UTC +--- base/allocator/partition_allocator/partition_root.cc.orig 2023-10-11 18:22:24 UTC +++ base/allocator/partition_allocator/partition_root.cc -@@ -46,7 +46,7 @@ +@@ -47,7 +47,7 @@ #include "wow64apiset.h" #endif @@ -9,7 +9,7 @@ #include <pthread.h> #endif -@@ -280,7 +280,7 @@ void PartitionAllocMallocInitOnce() { +@@ -281,7 +281,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. -@@ -372,7 +372,7 @@ static size_t PartitionPurgeSlotSpan(internal::SlotSpa +@@ -379,7 +379,7 @@ static size_t PartitionPurgeSlotSpan(PartitionRoot* ro constexpr size_t kMaxSlotCount = (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) / MinPurgeableSlotSize(); @@ -27,7 +27,7 @@ // It's better for slot_usage to be stack-allocated and fixed-size, which // demands that its size be constexpr. On IS_APPLE and Linux on arm64, // PartitionPageSize() is always SystemPageSize() << 2, so regardless of -@@ -849,7 +849,7 @@ void PartitionRoot::Init(PartitionOptions opts) { +@@ -948,7 +948,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__switches.cc b/www/chromium/files/patch-base_base__switches.cc index 9d726a9d9a12..214bebc575e3 100644 --- a/www/chromium/files/patch-base_base__switches.cc +++ b/www/chromium/files/patch-base_base__switches.cc @@ -1,7 +1,7 @@ ---- base/base_switches.cc.orig 2023-09-13 12:11:42 UTC +--- base/base_switches.cc.orig 2023-10-11 18:22:24 UTC +++ base/base_switches.cc -@@ -162,7 +162,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria - +@@ -180,7 +180,7 @@ const char kPackageVersionName[] = "package-version-na + const char kPackageVersionCode[] = "package-version-code"; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-base_base__switches.h b/www/chromium/files/patch-base_base__switches.h index bc0eea35cacf..e6d6e19de940 100644 --- a/www/chromium/files/patch-base_base__switches.h +++ b/www/chromium/files/patch-base_base__switches.h @@ -1,7 +1,7 @@ ---- base/base_switches.h.orig 2023-09-13 12:11:42 UTC +--- base/base_switches.h.orig 2023-10-11 18:22:24 UTC +++ base/base_switches.h -@@ -56,7 +56,7 @@ extern const char kEnableIdleTracing[]; - extern const char kForceFieldTrialParams[]; +@@ -62,7 +62,7 @@ extern const char kPackageVersionName[]; + extern const char kPackageVersionCode[]; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h index cc07adb6057b..5a4a49653054 100644 --- a/www/chromium/files/patch-base_system_sys__info.h +++ b/www/chromium/files/patch-base_system_sys__info.h @@ -1,6 +1,6 @@ ---- base/system/sys_info.h.orig 2023-09-13 12:11:42 UTC +--- base/system/sys_info.h.orig 2023-10-11 18:22:24 UTC +++ base/system/sys_info.h -@@ -264,6 +264,8 @@ class BASE_EXPORT SysInfo { +@@ -266,6 +266,8 @@ class BASE_EXPORT SysInfo { static void ResetCpuSecurityMitigationsEnabledForTesting(); #endif @@ -9,7 +9,7 @@ private: friend class test::ScopedAmountOfPhysicalMemoryOverride; FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); -@@ -276,7 +278,7 @@ class BASE_EXPORT SysInfo { +@@ -278,7 +280,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/chromium/files/patch-base_test_launcher_test__launcher.cc b/www/chromium/files/patch-base_test_launcher_test__launcher.cc index 6b0706a91793..4176faa10b09 100644 --- a/www/chromium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc @@ -1,7 +1,7 @@ ---- base/test/launcher/test_launcher.cc.orig 2023-05-31 08:12:17 UTC +--- base/test/launcher/test_launcher.cc.orig 2023-10-11 18:22:24 UTC +++ base/test/launcher/test_launcher.cc -@@ -69,6 +69,7 @@ - #include "third_party/libxml/chromium/libxml_utils.h" +@@ -68,6 +68,7 @@ + #include "testing/gtest/include/gtest/gtest.h" #if BUILDFLAG(IS_POSIX) +#include <signal.h> diff --git a/www/chromium/files/patch-base_threading_hang__watcher.cc b/www/chromium/files/patch-base_threading_hang__watcher.cc new file mode 100644 index 000000000000..43f5c06f568c --- /dev/null +++ b/www/chromium/files/patch-base_threading_hang__watcher.cc @@ -0,0 +1,11 @@ +--- base/threading/hang_watcher.cc.orig 2023-10-11 18:22:24 UTC ++++ base/threading/hang_watcher.cc +@@ -331,7 +331,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p + + bool enable_hang_watcher = base::FeatureList::IsEnabled(kEnableHangWatcher); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD) + if (is_zygote_child) { + enable_hang_watcher = + enable_hang_watcher && diff --git a/www/chromium/files/patch-base_trace__event_trace__log.cc b/www/chromium/files/patch-base_trace__event_trace__log.cc index 0c3cfb9bd0ff..aab016ef7dca 100644 --- a/www/chromium/files/patch-base_trace__event_trace__log.cc +++ b/www/chromium/files/patch-base_trace__event_trace__log.cc @@ -1,6 +1,6 @@ ---- base/trace_event/trace_log.cc.orig 2023-09-13 12:11:42 UTC +--- base/trace_event/trace_log.cc.orig 2023-10-11 18:22:24 UTC +++ base/trace_event/trace_log.cc -@@ -2187,8 +2187,13 @@ void TraceLog::SetTraceBufferForTesting( +@@ -2190,8 +2190,13 @@ void TraceLog::SetTraceBufferForTesting( #if BUILDFLAG(USE_PERFETTO_CLIENT_LIBRARY) void TraceLog::OnSetup(const perfetto::DataSourceBase::SetupArgs& args) { AutoLock lock(track_event_lock_); diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index 3241f975d29f..bc5c3e725439 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,15 @@ ---- build/config/compiler/BUILD.gn.orig 2023-09-13 12:11:42 UTC +--- build/config/compiler/BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ build/config/compiler/BUILD.gn -@@ -248,13 +248,16 @@ config("default_include_dirs") { +@@ -192,7 +192,7 @@ declare_args() { + # This greatly reduces the size of debug builds, at the cost of + # debugging information which is required by some specialized + # debugging tools. +- simple_template_names = is_clang && !is_nacl && !is_win && !is_apple ++ simple_template_names = is_clang && !is_nacl && !is_win && !is_apple && !is_bsd + } + + declare_args() { +@@ -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") { @@ -18,7 +27,7 @@ } # compiler --------------------------------------------------------------------- -@@ -499,6 +502,10 @@ config("compiler") { +@@ -507,6 +510,10 @@ config("compiler") { } } @@ -29,7 +38,7 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_gold) { -@@ -574,7 +581,7 @@ config("compiler") { +@@ -582,7 +589,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -38,7 +47,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -759,7 +766,7 @@ config("compiler") { +@@ -768,7 +775,7 @@ config("compiler") { ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ] @@ -47,16 +56,7 @@ # TODO(https://crbug.com/972449): turn on for ChromeOS when that # toolchain has this flag. # We only use one version of LLVM within a build so there's no need to -@@ -866,7 +873,7 @@ config("compiler") { - # * Apple platforms (e.g. MacOS, iPhone, iPad) aren't supported because xcode - # lldb doesn't have the needed changes yet. - # TODO(crbug.com/1379070): Remove if the upstream default ever changes. -- if (is_clang && !is_nacl && !is_win && !is_apple) { -+ if (is_clang && !is_nacl && !is_win && !is_apple && !is_bsd) { - cflags_cc += [ "-gsimple-template-names" ] - } - -@@ -1108,7 +1115,7 @@ config("compiler_cpu_abi") { +@@ -1112,7 +1119,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -65,7 +65,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -1123,7 +1130,7 @@ config("compiler_cpu_abi") { +@@ -1127,7 +1134,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -74,7 +74,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1458,7 +1465,7 @@ config("compiler_deterministic") { +@@ -1462,7 +1469,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. @@ -83,7 +83,7 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1510,7 +1517,7 @@ config("compiler_deterministic") { +@@ -1514,7 +1521,7 @@ config("compiler_deterministic") { } config("clang_revision") { @@ -92,7 +92,7 @@ update_args = [ "--print-revision", "--verify-version=$clang_version", -@@ -1764,7 +1771,7 @@ config("default_warnings") { +@@ -1778,7 +1785,7 @@ config("default_warnings") { "-Wno-ignored-pragma-optimize", ] @@ -101,7 +101,7 @@ cflags += [ # TODO(crbug.com/1343975) Evaluate and possibly enable. "-Wno-deprecated-builtins", -@@ -1973,7 +1980,7 @@ config("no_chromium_code") { +@@ -1991,7 +1998,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] @@ -110,7 +110,7 @@ cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -2483,7 +2490,7 @@ config("afdo_optimize_size") { +@@ -2501,7 +2508,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") { @@ -119,7 +119,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2510,7 +2517,7 @@ config("afdo") { +@@ -2528,7 +2535,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } @@ -128,7 +128,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2674,7 +2681,8 @@ config("symbols") { +@@ -2692,7 +2699,8 @@ config("symbols") { configs += [ "//build/config:compress_debug_sections" ] } diff --git a/www/chromium/files/patch-build_config_compiler_pgo_BUILD.gn b/www/chromium/files/patch-build_config_compiler_pgo_BUILD.gn index 80517dd4a570..29afed82d1b8 100644 --- a/www/chromium/files/patch-build_config_compiler_pgo_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_pgo_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/pgo/BUILD.gn.orig 2023-09-13 12:11:42 UTC +--- build/config/compiler/pgo/BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ build/config/compiler/pgo/BUILD.gn -@@ -138,13 +138,14 @@ config("pgo_optimization_flags") { +@@ -143,13 +143,14 @@ config("pgo_optimization_flags") { # Enable basic block layout based on the extended TSP problem. This aims to # improve icache utilization and reduce the binary size. diff --git a/www/chromium/files/patch-build_config_ozone.gni b/www/chromium/files/patch-build_config_ozone.gni index 739797e19626..707fb6deb3d0 100644 --- a/www/chromium/files/patch-build_config_ozone.gni +++ b/www/chromium/files/patch-build_config_ozone.gni @@ -1,6 +1,6 @@ ---- build/config/ozone.gni.orig 2022-08-31 12:19:35 UTC +--- build/config/ozone.gni.orig 2023-10-11 18:22:24 UTC +++ build/config/ozone.gni -@@ -87,7 +87,15 @@ declare_args() { +@@ -84,7 +84,15 @@ declare_args() { } else if (is_chromeos_lacros) { ozone_platform = "wayland" ozone_platform_wayland = true diff --git a/www/chromium/files/patch-build_toolchain_toolchain.gni b/www/chromium/files/patch-build_toolchain_toolchain.gni index 8f919ee5b629..bfc72a3387eb 100644 --- a/www/chromium/files/patch-build_toolchain_toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_toolchain.gni @@ -1,6 +1,6 @@ ---- build/toolchain/toolchain.gni.orig 2023-09-13 12:11:42 UTC +--- build/toolchain/toolchain.gni.orig 2023-10-11 18:22:24 UTC +++ build/toolchain/toolchain.gni -@@ -62,7 +62,7 @@ if (host_os == "mac") { +@@ -67,7 +67,7 @@ if (host_os == "mac") { host_shlib_extension = ".dylib" } else if (host_os == "win") { host_shlib_extension = ".dll" diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index 05c420f5e1fd..2a52cd0c4d5b 100644 --- a/www/chromium/files/patch-cc_BUILD.gn +++ b/www/chromium/files/patch-cc_BUILD.gn @@ -1,6 +1,6 @@ ---- cc/BUILD.gn.orig 2023-09-13 12:11:42 UTC +--- cc/BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ cc/BUILD.gn -@@ -671,7 +671,7 @@ cc_test_static_library("test_support") { +@@ -674,7 +674,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -8,8 +8,8 @@ + if (!is_android && !is_bsd) { data_deps = [ "//third_party/mesa_headers" ] } - } -@@ -919,7 +919,6 @@ cc_test("cc_unittests") { + if (skia_use_dawn) { +@@ -929,7 +929,6 @@ cc_test("cc_unittests") { data = [ "//components/test/data/viz/" ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/chromium/files/patch-cc_base_features.cc b/www/chromium/files/patch-cc_base_features.cc index d3788aa98e47..d7a0330827c0 100644 --- a/www/chromium/files/patch-cc_base_features.cc +++ b/www/chromium/files/patch-cc_base_features.cc @@ -1,11 +1,11 @@ ---- cc/base/features.cc.orig 2023-09-13 12:11:42 UTC +--- cc/base/features.cc.orig 2023-10-11 18:22:24 UTC +++ cc/base/features.cc -@@ -71,7 +71,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding, - +@@ -85,7 +85,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding, + // be using a separate flag to control the launch on GL. BASE_FEATURE(kUseDMSAAForTiles, "UseDMSAAForTiles", --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT 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 77df8fc2846d..f182b1a043d0 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 2023-09-13 12:11:42 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -139,7 +139,7 @@ +@@ -143,7 +143,7 @@ #include "components/about_ui/credit_utils.h" #endif @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -182,16 +182,16 @@ +@@ -186,16 +186,16 @@ #include "v8/include/v8.h" #endif @@ -29,7 +29,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -330,7 +330,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -334,7 +334,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -38,7 +38,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -415,7 +415,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -419,7 +419,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -47,7 +47,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) || -@@ -542,7 +542,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -546,7 +546,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -56,7 +56,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. -@@ -632,7 +632,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -636,7 +636,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -65,7 +65,7 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::GetCommon().RecordStartupProcessCreationTime( -@@ -959,7 +959,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { +@@ -994,7 +994,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv base::InitializeCpuReductionExperiment(); base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures(); base::sequence_manager::internal::ThreadController::InitializeFeatures(); @@ -74,7 +74,7 @@ base::MessagePumpLibevent::InitializeFeatures(); #elif BUILDFLAG(IS_MAC) base::PlatformThread::InitFeaturesPostFieldTrial(); -@@ -1106,7 +1106,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo +@@ -1141,7 +1141,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo // TODO(crbug.com/1052397): Revisit the macro expression once build flag // switch of lacros-chrome is complete. @@ -83,7 +83,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1136,7 +1136,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo +@@ -1171,7 +1171,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -92,7 +92,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1526,7 +1526,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1561,7 +1561,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -101,7 +101,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) { -@@ -1628,7 +1628,7 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1663,7 +1663,7 @@ absl::variant<int, content::MainFunctionParams> Chrome // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd index cf16059907eb..a0969a38ad02 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/generated_resources.grd.orig 2023-09-29 10:14:06 UTC +--- chrome/app/generated_resources.grd.orig 2023-10-11 18:22:24 UTC +++ chrome/app/generated_resources.grd @@ -2,7 +2,7 @@ @@ -9,7 +9,7 @@ for making strings OS specific. Other platform defines such as use_titlecase are declared in tools/grit/grit_rule.gni. --> -@@ -3575,7 +3575,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3601,7 +3601,7 @@ are declared in tools/grit/grit_rule.gni. </if> <!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog --> @@ -18,7 +18,7 @@ <message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog."> Device Credentials </message> -@@ -5406,7 +5406,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -5432,7 +5432,7 @@ are declared in tools/grit/grit_rule.gni. Read information about your browser, OS, device, installed software, registry values and files </message> </if> @@ -27,7 +27,7 @@ <message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS" desc="Permission string for enterprise private reporting permission on Linux and MacOS."> Read information about your browser, OS, device, installed software and files </message> -@@ -6095,7 +6095,7 @@ Keep your key file in a safe place. You will need it t +@@ -6145,7 +6145,7 @@ Keep your key file in a safe place. You will need it t Old versions of Chrome Apps won't open on Windows devices after December 2022. Contact your administrator to update to a new version or remove this app. </message> </if> @@ -36,7 +36,7 @@ <message name="IDS_FORCE_INSTALLED_DEPRECATED_APPS_CONTENT" desc="Content of the force installed deprecated app dialog"> Old versions of Chrome Apps won't open on Linux devices after December 2022. Contact your administrator to update to a new version or remove this app. </message> -@@ -6141,7 +6141,7 @@ Keep your key file in a safe place. You will need it t +@@ -6191,7 +6191,7 @@ Keep your key file in a safe place. You will need it t Old versions of Chrome apps won't open on Windows devices after December 2022. You can check if there's a new version available. </message> </if> @@ -45,7 +45,7 @@ <message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch."> Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available. </message> -@@ -10364,7 +10364,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -10396,7 +10396,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW <message name="IDS_APP_MENU_BUTTON_UPDATE" desc="Short label next to app-menu button when an update is available."> Update </message> @@ -54,7 +54,7 @@ <message name="IDS_APP_MENU_BUTTON_UPDATE_ALT1" desc="Alternate short label next to app-menu button when an update is available."> Finish update </message> -@@ -10703,7 +10703,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -10743,7 +10743,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW Google Pay </message> @@ -63,7 +63,7 @@ <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders."> Use system title bar and borders </message> -@@ -11688,7 +11688,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -11728,7 +11728,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW </message> <!-- Device Trust Consent dialog --> @@ -72,7 +72,7 @@ <message name="IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE" desc="Title of the dialog shown when user consent is required to share device signals."> Share information about your device? </message> -@@ -12087,7 +12087,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -12136,7 +12136,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> @@ -81,7 +81,7 @@ <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window."> Minimize </message> -@@ -14309,7 +14309,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -14346,7 +14346,7 @@ Please help our engineers fix this problem. Tell us wh Open Anyway </message> diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp index d436d75350f3..5d631f17d5f6 100644 --- a/www/chromium/files/patch-chrome_app_settings__strings.grdp +++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp @@ -1,6 +1,21 @@ ---- chrome/app/settings_strings.grdp.orig 2023-09-13 12:11:42 UTC +--- chrome/app/settings_strings.grdp.orig 2023-10-11 18:22:24 UTC +++ chrome/app/settings_strings.grdp -@@ -207,7 +207,7 @@ +@@ -183,12 +183,12 @@ + Manage accessibility features + </message> + </if> +- <if expr="is_win or is_linux or is_macosx"> ++ <if expr="is_win or is_posix or is_macosx"> + <message name="IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE" desc="Title for the overscroll history navigation setting, which allows you to navigate back and forward by swiping left or right with a touch device."> + Swipe between pages + </message> + </if> +- <if expr="is_win or is_linux"> ++ <if expr="is_win or is_posix"> + <message name="IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_SUBTITLE" desc="Subtitle for the overscroll history navigation setting, which allows you to navigate back and forward by swiping left or right with a touch device."> + Navigate back and forward with swipe gesture + </message> +@@ -222,7 +222,7 @@ Theme </message> </if> @@ -9,7 +24,7 @@ <message name="IDS_SETTINGS_GTK_THEME" desc="Text of the label describing the system (GTK) browser theme on Linux"> GTK </message> -@@ -227,7 +227,7 @@ +@@ -242,7 +242,7 @@ Use Classic </message> </if> diff --git a/www/chromium/files/patch-chrome_app_theme_theme__resources.grd b/www/chromium/files/patch-chrome_app_theme_theme__resources.grd index f6ce85ad73a3..5a08dee6db83 100644 --- a/www/chromium/files/patch-chrome_app_theme_theme__resources.grd +++ b/www/chromium/files/patch-chrome_app_theme_theme__resources.grd @@ -1,6 +1,6 @@ ---- chrome/app/theme/theme_resources.grd.orig 2023-09-13 12:11:42 UTC +--- chrome/app/theme/theme_resources.grd.orig 2023-10-11 18:22:24 UTC +++ chrome/app/theme/theme_resources.grd -@@ -143,14 +143,14 @@ +@@ -146,14 +146,14 @@ </if> <if expr="_google_chrome"> <then> @@ -17,7 +17,7 @@ <if expr="not is_android"> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/product_logo_32.png" /> -@@ -158,7 +158,7 @@ +@@ -161,7 +161,7 @@ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/product_logo_32_beta.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/product_logo_32_dev.png" /> </else> @@ -26,7 +26,7 @@ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_CANARY" file="google_chrome/product_logo_32_canary.png" /> <if expr="not is_android"> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="google_chrome/product_logo_name_22.png" /> -@@ -170,7 +170,7 @@ +@@ -173,7 +173,7 @@ <else> <!-- not _google_chrome --> <if expr="_is_chrome_for_testing_branded"> <then> @@ -35,7 +35,7 @@ <then> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/linux/product_logo_16.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/linux/product_logo_32.png" /> -@@ -179,10 +179,10 @@ +@@ -182,10 +182,10 @@ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/product_logo_16.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/product_logo_32.png" /> </else> @@ -48,7 +48,7 @@ <then> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/linux/product_logo_16.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/linux/product_logo_32.png" /> -@@ -191,7 +191,7 @@ +@@ -194,7 +194,7 @@ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" /> </else> diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn index fb174ba7cdf6..32d9462c774e 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 2023-09-13 12:11:42 UTC +--- chrome/browser/BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/BUILD.gn -@@ -6366,6 +6366,13 @@ static_library("browser") { +@@ -6390,6 +6390,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 8e3e78065b7c..d8bc00999c0d 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 2023-09-13 12:11:42 UTC +--- chrome/browser/about_flags.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/about_flags.cc -@@ -221,7 +221,7 @@ +@@ -225,7 +225,7 @@ #include "ui/ui_features.h" #include "url/url_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -320,7 +320,7 @@ +@@ -324,7 +324,7 @@ #include "device/vr/public/cpp/features.h" #endif @@ -18,7 +18,7 @@ #include "ui/ozone/buildflags.h" #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -334,7 +334,7 @@ +@@ -338,7 +338,7 @@ #include "chrome/browser/win/titlebar_config.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) -@@ -434,7 +434,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -438,7 +438,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -36,7 +36,7 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -1474,7 +1474,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 +@@ -1475,7 +1475,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 std::size(kChromeRefresh2023Level1), nullptr}}; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -45,7 +45,7 @@ const FeatureEntry::FeatureParam kShortcutBoostSearchAndUrl1414[] = { {"ShortcutBoostSearchScore", "1414"}, {"ShortcutBoostUrlScore", "1414"}}; -@@ -5022,13 +5022,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5039,13 +5039,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -61,8 +61,8 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -5317,7 +5317,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(feed::kFeedDynamicColors)}, +@@ -5347,7 +5347,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(feed::kFeedSportsCard)}, #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) @@ -70,16 +70,16 @@ {"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName, flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop, FEATURE_VALUE_TYPE(feed::kWebUiFeed)}, -@@ -6007,7 +6007,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6025,7 +6025,7 @@ const FeatureEntry kFeatureEntries[] = { kOsAll, FEATURE_VALUE_TYPE(omnibox::kUseExistingAutocompleteClient)}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - {"omnibox-domain-suggestions", - flag_descriptions::kOmniboxDomainSuggestionsName, - flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, -@@ -6805,7 +6805,7 @@ const FeatureEntry kFeatureEntries[] = { + {"omnibox-actions-ui-simplification", + flag_descriptions::kOmniboxActionsUISimplificationName, + flag_descriptions::kOmniboxActionsUISimplificationDescription, kOsDesktop, +@@ -6853,7 +6853,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kParallelDownloadingDescription, kOsAll, FEATURE_VALUE_TYPE(download::features::kParallelDownloading)}, @@ -88,7 +88,7 @@ {"enable-async-dns", flag_descriptions::kAsyncDnsName, flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, FEATURE_VALUE_TYPE(features::kAsyncDns)}, -@@ -7788,7 +7788,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7848,7 +7848,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(supervised_user::kEnableProtoApiForClassifyUrl)}, #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) @@ -97,7 +97,7 @@ {"enable-network-service-sandbox", flag_descriptions::kEnableNetworkServiceSandboxName, flag_descriptions::kEnableNetworkServiceSandboxDescription, -@@ -8519,7 +8519,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8553,7 +8553,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -106,8 +106,8 @@ {"quick-commands", flag_descriptions::kQuickCommandsName, flag_descriptions::kQuickCommandsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kQuickCommands)}, -@@ -8799,7 +8799,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, +@@ -8844,7 +8844,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(ash::features::kWallpaperRefreshRevamp)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) @@ -115,7 +115,7 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -8859,7 +8859,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8900,7 +8900,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -124,7 +124,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9377,7 +9377,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9443,7 +9443,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -133,7 +133,7 @@ {"document-picture-in-picture-api", flag_descriptions::kDocumentPictureInPictureApiName, flag_descriptions::kDocumentPictureInPictureApiDescription, -@@ -10037,7 +10037,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10060,7 +10060,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebUIOmniboxPopupDescription, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopup)}, @@ -142,7 +142,7 @@ {"webui-system-font", flag_descriptions::kWebUiSystemFontName, flag_descriptions::kWebUiSystemFontDescription, kOsAll, FEATURE_VALUE_TYPE(features::kWebUiSystemFont)}, -@@ -10223,7 +10223,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10263,7 +10263,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ @@ -151,7 +151,7 @@ {"data-retention-policies-disable-sync-types-needed", flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededName, flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededDescription, -@@ -10616,7 +10616,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10657,7 +10657,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -160,7 +160,7 @@ {"camera-mic-preview", flag_descriptions::kCameraMicPreviewName, flag_descriptions::kCameraMicPreviewDescription, static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux | kOsFuchsia), -@@ -10793,7 +10793,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10834,7 +10834,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kDigestAuthEnableSecureAlgorithmsDescription, kOsAll, FEATURE_VALUE_TYPE(net::features::kDigestAuthEnableSecureAlgorithms)}, 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 85cac79f0822..ad11de197132 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 2023-09-13 12:11:42 UTC +--- chrome/browser/browser_process_impl.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/browser_process_impl.cc -@@ -216,7 +216,7 @@ +@@ -215,7 +215,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck #endif -@@ -1207,7 +1207,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1206,7 +1206,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); @@ -18,7 +18,7 @@ ChromeJsErrorReportProcessor::Create(); #endif -@@ -1463,7 +1463,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1460,7 +1460,7 @@ void BrowserProcessImpl::Unpin() { // Mac is currently not supported. // TODO(crbug.com/1052397): Revisit 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 56fd2be53481..1376fde01a9c 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,4 +1,4 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/chrome_browser_interface_binders.cc @@ -129,13 +129,13 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) @@ -22,10 +22,19 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "chrome/browser/companion/visual_search/visual_search_suggestions_service_factory.h" #include "chrome/browser/ui/webui/discards/discards.mojom.h" #include "chrome/browser/ui/webui/discards/discards_ui.h" - #include "chrome/browser/ui/webui/discards/site_data.mojom.h" -@@ -949,7 +949,7 @@ void PopulateChromeFrameBinders( +@@ -831,7 +831,7 @@ void BindScreen2xMainContentExtractor( + #endif + + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + void BindVisualSuggestionsModelProvider( + content::RenderFrameHost* frame_host, + mojo::PendingReceiver< +@@ -977,7 +977,7 @@ void PopulateChromeFrameBinders( #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -34,7 +43,7 @@ if (!render_frame_host->GetParent()) { map->Add<chrome::mojom::DraggableRegions>( base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed)); -@@ -957,7 +957,7 @@ void PopulateChromeFrameBinders( +@@ -985,7 +985,7 @@ void PopulateChromeFrameBinders( #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -43,7 +52,7 @@ if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && !render_frame_host->GetParentOrOuterDocument()) { // The service binder will reject non-primary main frames, but we still need -@@ -1031,7 +1031,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1065,7 +1065,7 @@ void PopulateChromeWebUIFrameBinders( commerce::CommerceInternalsUI>(map); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -52,7 +61,7 @@ RegisterWebUIControllerInterfaceBinder< connectors_internals::mojom::PageHandler, enterprise_connectors::ConnectorsInternalsUI>(map); -@@ -1046,7 +1046,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1080,7 +1080,7 @@ void PopulateChromeWebUIFrameBinders( #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -61,7 +70,7 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); #endif -@@ -1535,7 +1535,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1578,7 +1578,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 abc42cf78413..f7db58ea5eb2 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 2023-09-13 12:11:42 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -245,11 +245,11 @@ +@@ -247,11 +247,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -14,7 +14,7 @@ #include "components/crash/core/app/crashpad.h" #endif -@@ -284,14 +284,14 @@ +@@ -286,14 +286,14 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -31,7 +31,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" -@@ -1029,7 +1029,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1033,7 +1033,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -40,7 +40,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 . -@@ -1085,7 +1085,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1089,7 +1089,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -49,7 +49,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( -@@ -1321,7 +1321,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1325,7 +1325,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* *UrlLanguageHistogramFactory::GetForBrowserContext(profile)); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -58,7 +58,7 @@ if (headless::IsHeadlessMode()) { headless::ReportHeadlessActionMetrics(); } -@@ -1427,7 +1427,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( +@@ -1431,7 +1431,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( // In headless mode provide alternate SelectFileDialog factory overriding // any platform specific SelectFileDialog implementation that may have been // set. 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 44e5efe593ea..3aab71f4e63c 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 2023-09-13 12:11:42 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -433,7 +433,7 @@ +@@ -436,7 +436,7 @@ #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" #include "storage/browser/file_system/external_mount_points.h" @@ -9,7 +9,7 @@ #include "chrome/browser/chrome_browser_main_linux.h" #elif BUILDFLAG(IS_ANDROID) #include "base/android/application_status_listener.h" -@@ -524,12 +524,12 @@ +@@ -530,12 +530,12 @@ // TODO(crbug.com/1052397): 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 -@@ -538,14 +538,14 @@ +@@ -544,14 +544,14 @@ #include "components/crash/content/browser/crash_handler_host_linux.h" #endif @@ -41,7 +41,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) -@@ -572,11 +572,11 @@ +@@ -580,11 +580,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -55,7 +55,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" -@@ -1589,7 +1589,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre +@@ -1598,7 +1598,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre registry->RegisterBooleanPref(prefs::kNewBaseUrlInheritanceBehaviorAllowed, true); registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false); @@ -64,7 +64,7 @@ registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled, true); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) -@@ -1713,7 +1713,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1720,7 +1720,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( is_integration_test, &startup_data_); @@ -73,7 +73,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1752,7 +1752,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1759,7 +1759,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -82,7 +82,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1773,7 +1773,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1780,7 +1780,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); #endif @@ -91,7 +91,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1792,7 +1792,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1799,7 +1799,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -100,7 +100,7 @@ main_parts->AddParts( std::make_unique< chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2615,6 +2615,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2629,6 +2629,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin #elif BUILDFLAG(IS_POSIX) #if BUILDFLAG(IS_ANDROID) bool enable_crash_reporter = true; @@ -109,7 +109,7 @@ #elif BUILDFLAG(IS_CHROMEOS) bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { -@@ -3022,7 +3024,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -3006,7 +3008,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); @@ -118,7 +118,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4588,7 +4590,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4614,7 +4616,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -127,7 +127,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5115,7 +5117,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5161,7 +5163,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -136,7 +136,7 @@ MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -5125,7 +5127,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5171,7 +5173,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -145,7 +145,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -5164,7 +5166,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5210,7 +5212,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati handle)); } @@ -154,7 +154,7 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -6983,7 +6985,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -7054,7 +7056,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS } bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() { diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h index a39d4ff9cfbb..e5e073da642e 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -471,7 +471,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -478,7 +478,7 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; diff --git a/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc b/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc index e969c72a3671..cc2a17b48dbe 100644 --- a/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc +++ b/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc @@ -1,20 +1,20 @@ ---- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2023-09-27 23:09:54 UTC +--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/component_updater/widevine_cdm_component_installer.cc @@ -40,7 +40,7 @@ #include "third_party/widevine/cdm/buildflags.h" #include "third_party/widevine/cdm/widevine_cdm_common.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h" #endif -@@ -77,7 +77,7 @@ const char ImageLoaderComponentName[] = "WidevineCdm"; +@@ -77,7 +77,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto:: const char ImageLoaderComponentName[] = "WidevineCdm"; #endif -#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_FREEBSD) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) // On Linux and ChromeOS the Widevine CDM is loaded at startup before the // zygote is locked down. As a result there is no need to register the CDM // with Chrome as it can't be used until Chrome is restarted. @@ -23,7 +23,7 @@ } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FREEBSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) VLOG(1) << "Updating hint file with Widevine CDM " << cdm_version; // This is running on a thread that allows IO, so simply update the hint file. diff --git a/www/chromium/files/patch-chrome_browser_defaults.cc b/www/chromium/files/patch-chrome_browser_defaults.cc index 3f8246d6adad..0c5849fe4b5e 100644 --- a/www/chromium/files/patch-chrome_browser_defaults.cc +++ b/www/chromium/files/patch-chrome_browser_defaults.cc @@ -1,8 +1,8 @@ ---- chrome/browser/defaults.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/defaults.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/defaults.cc -@@ -46,7 +46,7 @@ const bool kShowHelpMenuItemIcon = false; - - const bool kDownloadPageHasShowInFolder = true; +@@ -44,7 +44,7 @@ const bool kShowHelpMenuItemIcon = true; + const bool kShowHelpMenuItemIcon = false; + #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 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 819b2125cdd8..9fa37e307e7e 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 2023-09-13 12:11:42 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1594,7 +1594,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1611,7 +1611,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( 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(); } -@@ -1713,7 +1713,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1730,7 +1730,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()) { -@@ -1759,7 +1759,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl +@@ -1776,7 +1776,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl DCHECK(download_item->IsSavePackageDownload()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc index 552d12a06841..fe511bb50e87 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 2023-09-13 12:11:42 UTC +--- chrome/browser/download/download_item_model.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/download/download_item_model.cc -@@ -768,7 +768,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -769,7 +769,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(); -@@ -814,7 +814,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -815,7 +815,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand base::UmaHistogramBoolean("Download.SetAlwaysOpenTo", !is_checked); 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); -@@ -1234,7 +1234,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1200,7 +1200,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe return; } diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc index c90f36e25b3a..7bc5a105a4c7 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig 2022-09-24 10:57:32 UTC +--- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc -@@ -142,11 +142,11 @@ AnalysisServiceSettings::AnalysisServiceSettings( +@@ -143,7 +143,7 @@ AnalysisServiceSettings::AnalysisServiceSettings( const char* verification_key = kKeyWindowsVerification; #elif BUILDFLAG(IS_MAC) const char* verification_key = kKeyMacVerification; @@ -9,8 +9,3 @@ const char* verification_key = kKeyLinuxVerification; #endif --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const base::Value::Dict& dict = settings_value.GetDict(); - const base::Value::List* signatures = - dict.FindListByDottedPath(verification_key); diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_content__analysis__delegate.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_content__analysis__delegate.cc deleted file mode 100644 index f4a1f3a381e7..000000000000 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_content__analysis__delegate.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc.orig 2023-09-13 12:11:42 UTC -+++ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc -@@ -52,7 +52,7 @@ - #include "ui/base/l10n/l10n_util.h" - #include "ui/base/ui_base_types.h" - --#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/connectors/analysis/content_analysis_sdk_manager.h" // nogncheck - #endif - -@@ -559,7 +559,7 @@ void ContentAnalysisDelegate::PageRequestCallback( - bool ContentAnalysisDelegate::UploadData() { - upload_start_time_ = base::TimeTicks::Now(); - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // If this is a local content analysis, check if the local agent is ready. - // If not, abort early. This is to prevent doing a lot of work, like reading - // files into memory or calcuating SHA256 hashes and prevent a flash of the diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.cc deleted file mode 100644 index 2de10f7d9984..000000000000 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.cc +++ /dev/null @@ -1,82 +0,0 @@ ---- chrome/browser/enterprise/connectors/connectors_manager.cc.orig 2023-07-16 15:47:57 UTC -+++ chrome/browser/enterprise/connectors/connectors_manager.cc -@@ -16,7 +16,7 @@ - #include "components/prefs/pref_service.h" - #include "url/gurl.h" - --#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/connectors/analysis/content_analysis_sdk_manager.h" // nogncheck - #include "chrome/browser/ui/browser.h" - #include "chrome/browser/ui/browser_list.h" -@@ -25,7 +25,7 @@ - - namespace enterprise_connectors { - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - namespace { - - static constexpr enterprise_connectors::AnalysisConnector -@@ -51,7 +51,7 @@ ConnectorsManager::ConnectorsManager( - DCHECK(browser_crash_event_router_) << "Crash event router is null"; - DCHECK(extension_install_event_router_) << "Extension event router is null"; - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Start observing tab strip models for all browsers. - BrowserList* browser_list = BrowserList::GetInstance(); - for (Browser* browser : *browser_list) { -@@ -62,14 +62,14 @@ ConnectorsManager::ConnectorsManager( - - if (observe_prefs) { - StartObservingPrefs(pref_service); --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - MaybeCloseLocalContentAnalysisAgentConnection(); - #endif - } - extension_install_event_router_->StartObserving(); - } - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - ConnectorsManager::~ConnectorsManager() { - BrowserList* browser_list = BrowserList::GetInstance(); - browser_list->RemoveObserver(this); -@@ -99,7 +99,7 @@ bool ConnectorsManager::IsConnectorEnabled(AnalysisCon - base::FeatureList::IsEnabled(kLocalContentAnalysisEnabled); - } - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - bool ConnectorsManager::IsConnectorEnabledForLocalAgent( - AnalysisConnector connector) const { - if (!IsConnectorEnabled(connector)) { -@@ -178,7 +178,7 @@ absl::optional<AnalysisSettings> ConnectorsManager::Ge - } - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void ConnectorsManager::OnBrowserAdded(Browser* browser) { - browser->tab_strip_model()->AddObserver(this); - } -@@ -241,7 +241,7 @@ void ConnectorsManager::CacheAnalysisConnectorPolicy( - service_settings, *service_provider_config_); - } - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void ConnectorsManager::MaybeCloseLocalContentAnalysisAgentConnection() { - for (auto connector : kLocalAnalysisConnectors) { - if (IsConnectorEnabledForLocalAgent(connector)) { -@@ -257,7 +257,7 @@ void ConnectorsManager::MaybeCloseLocalContentAnalysis - - void ConnectorsManager::OnPrefChanged(AnalysisConnector connector) { - CacheAnalysisConnectorPolicy(connector); --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - MaybeCloseLocalContentAnalysisAgentConnection(); - #endif - } diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.h b/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.h deleted file mode 100644 index 2396333e34aa..000000000000 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.h +++ /dev/null @@ -1,56 +0,0 @@ ---- chrome/browser/enterprise/connectors/connectors_manager.h.orig 2023-07-16 15:47:57 UTC -+++ chrome/browser/enterprise/connectors/connectors_manager.h -@@ -16,7 +16,7 @@ - #include "third_party/abseil-cpp/absl/types/optional.h" - #include "url/gurl.h" - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "chrome/browser/ui/browser_list_observer.h" - #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -31,7 +31,7 @@ class BrowserCrashEventRouter; - // Manages access to Connector policies for a given profile. This class is - // responsible for caching the Connector policies, validate them against - // approved service providers and provide a simple interface to them. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - class ConnectorsManager : public BrowserListObserver, - public TabStripModelObserver { - #else -@@ -51,7 +51,7 @@ class ConnectorsManager { - PrefService* pref_service, - const ServiceProviderConfig* config, - bool observe_prefs = true); --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - ~ConnectorsManager() override; - #else - ~ConnectorsManager(); -@@ -81,7 +81,7 @@ class ConnectorsManager { - bool IsConnectorEnabled(AnalysisConnector connector) const; - bool IsConnectorEnabled(ReportingConnector connector) const; - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Check if the corresponding connector is enabled for any local agent. - bool IsConnectorEnabledForLocalAgent(AnalysisConnector connector) const; - #endif -@@ -109,7 +109,7 @@ class ConnectorsManager { - const; - - private: --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // BrowserListObserver overrides: - void OnBrowserAdded(Browser* browser) override; - void OnBrowserRemoved(Browser* browser) override; -@@ -132,7 +132,7 @@ class ConnectorsManager { - void CacheAnalysisConnectorPolicy(AnalysisConnector connector) const; - void CacheReportingConnectorPolicy(ReportingConnector connector); - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Close connection with local agent if all the relevant connectors are turned - // off for it. - void MaybeCloseLocalContentAnalysisAgentConnection(); diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc index f34a9996e12d..e6fa06d7e530 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2023-08-17 07:33:31 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc @@ -11,7 +11,7 @@ #include "chrome/browser/profiles/profile.h" @@ -18,9 +18,9 @@ return IsDeviceTrustConnectorFeatureEnabled(); #else return false; -@@ -78,7 +78,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil - - auto* service = new DeviceTrustConnectorService(profile->GetPrefs()); +@@ -80,7 +80,7 @@ DeviceTrustConnectorServiceFactory::BuildServiceInstan + std::unique_ptr<DeviceTrustConnectorService> service = + std::make_unique<DeviceTrustConnectorService>(profile->GetPrefs()); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) 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 3aa2bd461996..2f0381a3ed56 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,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc -@@ -54,7 +54,7 @@ +@@ -55,7 +55,7 @@ #include "base/strings/utf_string_conversions.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" #include "components/device_signals/core/browser/signals_aggregator.h" #include "components/device_signals/core/common/signals_constants.h" -@@ -139,7 +139,7 @@ void UploadSecurityEventReport(base::Value::Dict event +@@ -140,7 +140,7 @@ void UploadSecurityEventReport(base::Value::Dict event std::move(upload_callback)); } diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h index 2195dfa4aa26..a8318619cded 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h -@@ -17,7 +17,7 @@ +@@ -16,7 +16,7 @@ #include "components/keyed_service/core/keyed_service.h" #include "components/policy/core/common/cloud/cloud_policy_client.h" @@ -9,7 +9,7 @@ #include "components/device_signals/core/browser/signals_types.h" #endif -@@ -194,7 +194,7 @@ class RealtimeReportingClient : public KeyedService, +@@ -184,7 +184,7 @@ class RealtimeReportingClient : public KeyedService, base::WeakPtrFactory<RealtimeReportingClient> weak_ptr_factory_{this}; }; diff --git a/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc b/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc index 7474e42d664a..eea255884d98 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2022-11-30 08:12:58 UTC +--- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/enterprise/signals/device_info_fetcher.cc @@ -10,7 +10,7 @@ #include "chrome/browser/enterprise/signals/device_info_fetcher_mac.h" @@ -9,12 +9,12 @@ #include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h" #endif -@@ -71,7 +71,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher:: - return std::make_unique<DeviceInfoFetcherMac>(); - #elif BUILDFLAG(IS_WIN) - return std::make_unique<DeviceInfoFetcherWin>(); --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - return std::make_unique<DeviceInfoFetcherLinux>(); - #else - return std::make_unique<StubDeviceFetcher>(); +@@ -67,7 +67,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher:: + return CreateInstanceInternal(); + } + +-#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) && \ ++#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD) && \ + !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) + // static + std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher::CreateInstanceInternal() { diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index a7b91aabf7a1..60ed5c8c7acf 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 2023-09-13 12:11:42 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1357,6 +1357,10 @@ static_library("extensions") { +@@ -1372,6 +1372,10 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc index d7a954ed8aa7..3ec6fb4cd0ab 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 2023-08-17 07:33:31 UTC +--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc -@@ -42,7 +42,7 @@ +@@ -43,7 +43,7 @@ #include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h" #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h" #endif -@@ -106,7 +106,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt +@@ -108,7 +108,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt extensions::SettingsPrivateEventRouterFactory::GetInstance(); extensions::SettingsOverridesAPI::GetFactoryInstance(); extensions::SidePanelService::GetFactoryInstance(); 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 cf842fa6e07d..720e666a5244 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 2023-09-13 12:11:42 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -593,7 +593,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem +@@ -603,7 +603,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem } void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() { 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 fa706d5164b7..2e173947ed2f 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -198,7 +198,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -199,7 +199,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] = settings_api::PrefType::PREF_TYPE_BOOLEAN; @@ -9,12 +9,12 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -210,7 +210,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -211,7 +211,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist settings_api::PrefType::PREF_TYPE_STRING; (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::PREF_TYPE_NUMBER; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - (*s_allowlist)[::prefs::kUsesSystemThemeDeprecated] = - settings_api::PrefType::PREF_TYPE_BOOLEAN; (*s_allowlist)[::prefs::kSystemTheme] = + settings_api::PrefType::PREF_TYPE_NUMBER; + #endif 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 48a5bfc565b7..9e63ad862aca 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 2023-08-17 07:33:31 UTC +--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/extensions/api/tabs/tabs_api.cc -@@ -833,7 +833,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio +@@ -860,7 +860,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio // ui::SHOW_STATE_MINIMIZED above, on Linux the window is not created as // minimized. // TODO(crbug.com/1410400): Remove this workaround when linux is fixed. diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc index e30b53e6081e..e4fc7f614390 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -913,7 +913,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: +@@ -924,7 +924,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: RequestExtensionApproval(contents); return; } diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index 4b8f60ddae96..4f3f2651120f 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 2023-09-13 12:11:42 UTC +--- chrome/browser/flag_descriptions.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/flag_descriptions.cc -@@ -2556,7 +2556,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P +@@ -2588,7 +2588,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P const char kWebUIOmniboxPopupDescription[] = "If enabled, shows the omnibox suggestions popup in WebUI."; @@ -9,7 +9,7 @@ const char kWebUiSystemFontName[] = "WebUI System font"; const char kWebUiSystemFontDescription[] = "If enabled, all WebUI surfaces will use the default UI font of the " -@@ -7040,7 +7040,7 @@ const char kLacrosMergeIcuDataFileDescription[] = +@@ -7151,7 +7151,7 @@ const char kLacrosMergeIcuDataFileDescription[] = "Enables sharing common areas of icudtl.dat between Ash and Lacros."; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -18,7 +18,7 @@ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -7254,7 +7254,7 @@ const char kSearchWebInSidePanelDescription[] = +@@ -7366,7 +7366,7 @@ const char kSearchWebInSidePanelDescription[] = // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ const char kQuickCommandsName[] = "Quick Commands"; const char kQuickCommandsDescription[] = "Enable a text interface to browser features. Invoke with Ctrl-Space."; -@@ -7263,7 +7263,7 @@ const char kQuickCommandsDescription[] = +@@ -7375,7 +7375,7 @@ const char kQuickCommandsDescription[] = // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -7278,7 +7278,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] +@@ -7390,7 +7390,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] "instead of JSON."; #endif @@ -45,7 +45,7 @@ const char kEnableNetworkServiceSandboxName[] = "Enable the network service sandbox."; const char kEnableNetworkServiceSandboxDescription[] = -@@ -7302,7 +7302,7 @@ const char kWebShareDescription[] = +@@ -7414,7 +7414,7 @@ const char kWebShareDescription[] = "platforms."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -54,7 +54,7 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -7322,7 +7322,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -7434,7 +7434,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -63,7 +63,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -7336,7 +7336,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail +@@ -7448,7 +7448,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail "storage and requests initial sync."; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -72,7 +72,7 @@ const char kAsyncDnsName[] = "Async DNS resolver"; const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -@@ -7443,7 +7443,7 @@ const char kElasticOverscrollDescription[] = +@@ -7555,7 +7555,7 @@ const char kElasticOverscrollDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -81,7 +81,7 @@ const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -7455,7 +7455,7 @@ const char kSyncPollImmediatelyOnEveryStartupDescripti +@@ -7567,7 +7567,7 @@ const char kSyncPollImmediatelyOnEveryStartupDescripti #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ @@ -90,7 +90,7 @@ const char kDataRetentionPoliciesDisableSyncTypesNeededName[] = "Data Retention Policies Disable Sync Types"; const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[] = -@@ -7500,7 +7500,7 @@ const char kEnableAudioFocusEnforcementDescription[] = +@@ -7612,7 +7612,7 @@ const char kEnableAudioFocusEnforcementDescription[] = "any one time. Requires #enable-media-session-service to be enabled too."; #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 888fac00badb..d862a0241a2c 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.h.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/flag_descriptions.h.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/flag_descriptions.h -@@ -1452,7 +1452,7 @@ extern const char kOmnibox2023RefreshConnectionSecurit +@@ -1472,7 +1472,7 @@ extern const char kOmnibox2023RefreshConnectionSecurit extern const char kWebUIOmniboxPopupName[]; extern const char kWebUIOmniboxPopupDescription[]; @@ -9,7 +9,7 @@ extern const char kWebUiSystemFontName[]; extern const char kWebUiSystemFontDescription[]; #endif -@@ -4036,7 +4036,7 @@ extern const char kLacrosMergeIcuDataFileName[]; +@@ -4103,7 +4103,7 @@ extern const char kLacrosMergeIcuDataFileName[]; extern const char kLacrosMergeIcuDataFileDescription[]; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -18,7 +18,7 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4166,14 +4166,14 @@ extern const char kSearchWebInSidePanelDescription[]; +@@ -4233,14 +4233,14 @@ extern const char kSearchWebInSidePanelDescription[]; // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -35,7 +35,7 @@ extern const char kWebShareName[]; extern const char kWebShareDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -4183,7 +4183,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4250,7 +4250,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -44,7 +44,7 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4193,7 +4193,7 @@ extern const char kOzonePlatformHintName[]; +@@ -4260,7 +4260,7 @@ extern const char kOzonePlatformHintName[]; extern const char kOzonePlatformHintDescription[]; #endif // BUILDFLAG(IS_LINUX) @@ -53,7 +53,7 @@ extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -4201,13 +4201,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt +@@ -4268,13 +4268,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -69,7 +69,7 @@ extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -4218,7 +4218,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; +@@ -4285,7 +4285,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; extern const char kEnableProtoApiForClassifyUrlDescription[]; #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) @@ -78,7 +78,7 @@ extern const char kEnableNetworkServiceSandboxName[]; extern const char kEnableNetworkServiceSandboxDescription[]; -@@ -4300,7 +4300,7 @@ extern const char kElasticOverscrollDescription[]; +@@ -4367,7 +4367,7 @@ extern const char kElasticOverscrollDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -87,7 +87,7 @@ extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; -@@ -4309,7 +4309,7 @@ extern const char kSyncPollImmediatelyOnEveryStartupDe +@@ -4376,7 +4376,7 @@ extern const char kSyncPollImmediatelyOnEveryStartupDe #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ @@ -96,7 +96,7 @@ extern const char kDataRetentionPoliciesDisableSyncTypesNeededName[]; extern const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[]; #endif -@@ -4336,7 +4336,7 @@ extern const char kEnableAudioFocusEnforcementName[]; +@@ -4403,7 +4403,7 @@ extern const char kEnableAudioFocusEnforcementName[]; extern const char kEnableAudioFocusEnforcementDescription[]; #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index 12d1e25e1e03..7c5b3c6b9a5d 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -79,8 +79,10 @@ +@@ -78,8 +78,10 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -12,7 +12,7 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" -@@ -109,7 +111,7 @@ +@@ -108,7 +110,7 @@ #include "chromeos/crosapi/cpp/crosapi_constants.h" #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -21,7 +21,7 @@ #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h" #endif // BUILDFLAG(IS_LINUX) -@@ -118,7 +120,7 @@ +@@ -117,7 +119,7 @@ #include "components/user_manager/user_manager.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -30,7 +30,7 @@ #include "components/power_metrics/system_power_monitor.h" #endif -@@ -931,7 +933,7 @@ void RecordStartupMetrics() { +@@ -917,7 +919,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. @@ -39,7 +39,7 @@ shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -1260,11 +1262,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt +@@ -1227,11 +1229,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt } #endif // !BUILDFLAG(IS_ANDROID) 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 b56d97cdda3e..aa0b29bc277c 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 2023-09-13 12:11:42 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -93,7 +93,7 @@ +@@ -92,7 +92,7 @@ // TODO(crbug.com/1052397): 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/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" -@@ -184,7 +184,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -183,7 +183,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -18,7 +18,7 @@ auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -242,7 +242,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -241,7 +241,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() if (g_previously_failed_to_launch_sandboxed_service) { return NetworkSandboxState::kDisabledBecauseOfFailedLaunch; } @@ -27,7 +27,7 @@ auto* local_state = g_browser_process->local_state(); #endif -@@ -263,7 +263,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -262,7 +262,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() } #endif // BUILDFLAG(IS_WIN) @@ -36,7 +36,16 @@ if (local_state && local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) { return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled) -@@ -494,7 +494,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -457,7 +457,7 @@ void SystemNetworkContextManager::DeleteInstance() { + g_system_network_context_manager = nullptr; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + SystemNetworkContextManager::GssapiLibraryLoadObserver:: + GssapiLibraryLoadObserver(SystemNetworkContextManager* owner) + : owner_(owner) {} +@@ -515,7 +515,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -45,7 +54,7 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -541,7 +541,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -562,7 +562,7 @@ SystemNetworkContextManager::SystemNetworkContextManag #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -54,7 +63,7 @@ pref_change_registrar_.Add( prefs::kEnforceLocalAnchorConstraintsEnabled, base::BindRepeating(&SystemNetworkContextManager:: -@@ -590,7 +590,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -611,7 +611,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -63,7 +72,7 @@ registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -619,7 +619,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -640,7 +640,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kChromeRootStoreEnabled, false); #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -72,7 +81,7 @@ // Note that the default value is not relevant because the pref is only // evaluated when it is managed. registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled, -@@ -628,7 +628,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -649,11 +649,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts); @@ -80,8 +89,22 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kNetworkServiceSandboxEnabled, true); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false); + #endif // BUILDFLAG(IS_LINUX) } -@@ -980,7 +980,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor +@@ -702,7 +702,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea + OnNewHttpAuthDynamicParams(http_auth_dynamic_params); + network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params)); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + gssapi_library_loader_observer_.Install(network_service); + #endif // BUILDFLAG(IS_LINUX) + +@@ -1009,7 +1009,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h index b6e94c226334..6b521bb05fc2 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,15 @@ ---- chrome/browser/net/system_network_context_manager.h.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/net/system_network_context_manager.h.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/net/system_network_context_manager.h -@@ -207,7 +207,7 @@ class SystemNetworkContextManager { +@@ -185,7 +185,7 @@ class SystemNetworkContextManager { + class URLLoaderFactoryForSystem; + class NetworkProcessLaunchWatcher; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + class GssapiLibraryLoadObserver + : public network::mojom::GssapiLibraryLoadObserver { + public: +@@ -229,7 +229,7 @@ class SystemNetworkContextManager { #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,3 +18,12 @@ // Applies the current value of the kEnforceLocalAnchorConstraintsEnabled // pref to the enforcement state. void UpdateEnforceLocalAnchorConstraintsEnabled(); +@@ -275,7 +275,7 @@ class SystemNetworkContextManager { + + static absl::optional<bool> certificate_transparency_enabled_for_testing_; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + GssapiLibraryLoadObserver gssapi_library_loader_observer_{this}; + #endif // BUILDFLAG(IS_LINUX) + }; diff --git a/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc index 05f7ca6f1d37..409486be5a88 100644 --- a/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc +++ b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2023-08-17 07:33:31 UTC +--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc -@@ -48,7 +48,7 @@ +@@ -49,7 +49,7 @@ #include "chrome/browser/policy/browser_dm_token_storage_mac.h" #endif // BUILDFLAG(IS_MAC) @@ -9,7 +9,7 @@ #include "chrome/browser/policy/browser_dm_token_storage_linux.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -57,7 +57,7 @@ +@@ -58,7 +58,7 @@ #include "chrome/install_static/install_util.h" #endif // BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/device_trust_features.h" // nogncheck #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h" #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher.h" -@@ -90,7 +90,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: +@@ -91,7 +91,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: #if BUILDFLAG(IS_MAC) storage_delegate = std::make_unique<BrowserDMTokenStorageMac>(); @@ -27,12 +27,12 @@ storage_delegate = std::make_unique<BrowserDMTokenStorageLinux>(); #elif BUILDFLAG(IS_WIN) storage_delegate = std::make_unique<BrowserDMTokenStorageWin>(); -@@ -245,7 +245,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC +@@ -246,7 +246,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC std::unique_ptr<enterprise_connectors::DeviceTrustKeyManager> ChromeBrowserCloudManagementControllerDesktop::CreateDeviceTrustKeyManager() { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) if (enterprise_connectors::IsDeviceTrustConnectorFeatureEnabled()) { - auto key_rotation_launcher = - enterprise_connectors::KeyRotationLauncher::Create( + auto* browser_dm_token_storage = BrowserDMTokenStorage::Get(); + auto* device_management_service = GetDeviceManagementService(); 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 62bc19ede386..1bced2d83620 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 2023-09-13 12:11:42 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -214,12 +214,12 @@ +@@ -214,17 +214,17 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -10,12 +10,18 @@ #include "components/device_signals/core/browser/pref_names.h" // nogncheck due to crbug.com/1125897 #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + #include "components/enterprise/idle/idle_timeout_policy_handler.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) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) #include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -800,7 +800,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -811,7 +811,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -24,7 +30,7 @@ { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, -@@ -810,7 +810,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -821,7 +821,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -33,8 +39,8 @@ { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1498,7 +1498,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::BOOLEAN }, +@@ -1532,7 +1532,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) @@ -42,7 +48,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1546,7 +1546,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1580,7 +1580,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -51,7 +57,7 @@ { key::kNetworkServiceSandboxEnabled, prefs::kNetworkServiceSandboxEnabled, base::Value::Type::BOOLEAN }, -@@ -1572,18 +1572,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1606,12 +1606,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -66,6 +72,8 @@ { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, +@@ -1620,7 +1620,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::LIST }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ - || BUILDFLAG(IS_FUCHSIA) @@ -73,7 +81,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1596,7 +1596,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1633,7 +1633,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ @@ -82,7 +90,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1700,7 +1700,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1737,7 +1737,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -91,7 +99,7 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -1796,7 +1796,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1833,7 +1833,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS) @@ -100,7 +108,7 @@ // TODO(crbug.com/1454054): replace the // kGetDisplayMediaSetSelectAllScreensAllowedForUrls policy by a policy that // matches the name of the new `getAllScreensMedia` API. -@@ -1805,7 +1805,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1842,7 +1842,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::LIST }, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) @@ -109,7 +117,7 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -1836,7 +1836,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1873,7 +1873,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -118,7 +126,7 @@ { key::kEnforceLocalAnchorConstraintsEnabled, prefs::kEnforceLocalAnchorConstraintsEnabled, base::Value::Type::BOOLEAN }, -@@ -1915,7 +1915,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1952,7 +1952,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -127,7 +135,7 @@ { key::kBatterySaverModeAvailability, performance_manager::user_tuning::prefs::kBatterySaverModeState, base::Value::Type::INTEGER }, -@@ -1946,7 +1946,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1983,7 +1983,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kCloudApAuthEnabled, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) @@ -136,7 +144,7 @@ { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -2062,7 +2062,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2097,7 +2097,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // Policies for all platforms - End #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -145,7 +153,7 @@ handlers->AddHandler( std::make_unique<performance_manager::HighEfficiencyPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -2266,7 +2266,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2299,7 +2299,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -154,7 +162,7 @@ handlers->AddHandler( std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); handlers->AddHandler( -@@ -2324,7 +2324,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2357,7 +2357,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -163,7 +171,7 @@ handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); handlers->AddHandler( -@@ -2365,7 +2365,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2413,7 +2413,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) || \ @@ -172,7 +180,7 @@ signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>( key::kForceBrowserSignin, prefs::kForceBrowserSignin, base::Value::Type::BOOLEAN)); -@@ -2726,7 +2726,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2774,7 +2774,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -181,7 +189,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -2734,7 +2734,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2782,7 +2782,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -190,7 +198,7 @@ handlers->AddHandler(std::make_unique<SimplePolicyHandler>( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -2747,7 +2747,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2795,7 +2795,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH handlers->AddHandler( std::make_unique<first_party_sets::FirstPartySetsOverridesPolicyHandler>( chrome_schema)); diff --git a/www/chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc b/www/chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc index 027b3b488fde..90e7b8d7afcc 100644 --- a/www/chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc +++ b/www/chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/policy/policy_value_and_status_aggregator.cc -@@ -52,7 +52,7 @@ +@@ -53,7 +53,7 @@ #include "chrome/browser/policy/value_provider/extension_policies_value_provider.h" #endif // BUILDFLAG(ENABLE_EXTENSIONS) @@ -9,7 +9,7 @@ #include "components/policy/core/common/cloud/profile_cloud_policy_manager.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -98,7 +98,7 @@ std::unique_ptr<policy::PolicyStatusProvider> GetUserP +@@ -99,7 +99,7 @@ std::unique_ptr<policy::PolicyStatusProvider> GetUserP #else // BUILDFLAG(IS_CHROMEOS_ASH) policy::CloudPolicyManager* cloud_policy_manager = profile->GetUserCloudPolicyManager(); 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 7297629a1172..66ad2773aa78 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 2023-09-13 12:11:42 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -472,13 +472,13 @@ +@@ -478,13 +478,13 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -16,7 +16,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -511,7 +511,7 @@ +@@ -517,7 +517,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -25,7 +25,7 @@ #include "ui/color/system_theme.h" #endif -@@ -716,7 +716,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li +@@ -662,7 +662,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li const char kPluginsShowDetails[] = "plugins.show_details"; // Deprecated 02/2023. @@ -34,7 +34,7 @@ const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -1007,7 +1007,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS +@@ -948,7 +948,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS #endif // BUILDFLAG(IS_CHROMEOS_ASH) // Deprecated 02/2023. @@ -43,16 +43,7 @@ registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -1163,7 +1163,7 @@ void RegisterProfilePrefsForMigration( - registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0); - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Deprecated 08/2022. - registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false); - #endif -@@ -1964,12 +1964,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1863,12 +1863,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -67,7 +58,7 @@ browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif -@@ -2127,7 +2127,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local +@@ -2018,7 +2018,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local #endif // BUILDFLAG(IS_CHROMEOS_ASH) // Added 02/2023 @@ -76,12 +67,3 @@ local_state->ClearPref(kWebAppsUrlHandlerInfo); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -2297,7 +2297,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { - profile_prefs->ClearPref(kProfileAvatarTutorialShown); - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Added 08/2022. - if (profile_prefs->HasPrefPath(prefs::kUsesSystemThemeDeprecated)) { - auto migrated_theme = 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 4095630873c4..911969cb79c7 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 2023-09-13 12:11:42 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -379,18 +379,18 @@ +@@ -385,18 +385,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -22,7 +22,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h" #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" -@@ -589,7 +589,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -596,7 +596,7 @@ void ChromeBrowserMainExtraPartsProfiles:: if (breadcrumbs::IsEnabled()) { BreadcrumbManagerKeyedServiceFactory::GetInstance(); } @@ -31,7 +31,7 @@ browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); #endif browser_sync::UserEventServiceFactory::GetInstance(); -@@ -675,26 +675,26 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -689,26 +689,26 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif enterprise::ProfileIdServiceFactory::GetInstance(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -63,7 +63,7 @@ enterprise_signals::UserPermissionServiceFactory::GetInstance(); #endif #if BUILDFLAG(ENABLE_SESSION_SERVICE) -@@ -797,7 +797,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -817,7 +817,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -72,7 +72,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif -@@ -891,7 +891,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -912,7 +912,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_CHROMEOS) policy::PolicyCertServiceFactory::GetInstance(); #endif @@ -81,7 +81,7 @@ policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); #endif policy::UserCloudPolicyInvalidatorFactory::GetInstance(); -@@ -932,7 +932,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -953,7 +953,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !BUILDFLAG(IS_ANDROID) ProfileThemeUpdateServiceFactory::GetInstance(); #endif diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_route.ts b/www/chromium/files/patch-chrome_browser_resources_settings_route.ts index 97b83845f08f..d5bacfcb0441 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_route.ts +++ b/www/chromium/files/patch-chrome_browser_resources_settings_route.ts @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/route.ts.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/resources/settings/route.ts.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/resources/settings/route.ts -@@ -231,7 +231,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes +@@ -236,7 +236,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes r.ACCESSIBILITY = r.ADVANCED.createSection( '/accessibility', 'a11y', loadTimeData.getString('a11yPageTitle')); diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc index a6f7fb5c3c59..67fac795c49b 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc @@ -18,7 +18,7 @@ #include "net/base/url_util.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" #endif -@@ -398,7 +398,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil +@@ -421,7 +421,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil Profile* profile, const enterprise_connectors::AnalysisSettings& settings) { // Local content analysis is supported only on desktop platforms. diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc index 50995ad45108..1af71da5fec9 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc @@ -21,7 +21,7 @@ #include "content/public/browser/browser_thread.h" @@ -18,7 +18,7 @@ } else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT) { StartExtractDocumentFeatures(); #endif -@@ -310,7 +310,7 @@ void FileAnalyzer::OnDmgAnalysisFinished( +@@ -314,7 +314,7 @@ void FileAnalyzer::OnDmgAnalysisFinished( } #endif // BUILDFLAG(IS_MAC) diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h index bdef6b9f8f1b..fdd114ec76f3 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/download_protection/file_analyzer.h.orig 2023-04-05 11:05:06 UTC +--- chrome/browser/safe_browsing/download_protection/file_analyzer.h.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/safe_browsing/download_protection/file_analyzer.h @@ -18,7 +18,7 @@ #include "components/safe_browsing/core/common/proto/csd.pb.h" @@ -9,7 +9,7 @@ #include "chrome/services/file_util/public/cpp/sandboxed_document_analyzer.h" #endif -@@ -106,7 +106,7 @@ class FileAnalyzer { +@@ -109,7 +109,7 @@ class FileAnalyzer { const safe_browsing::ArchiveAnalyzerResults& archive_results); #endif @@ -18,7 +18,7 @@ void StartExtractDocumentFeatures(); void OnDocumentAnalysisFinished( const DocumentAnalyzerResults& document_results); -@@ -136,7 +136,7 @@ class FileAnalyzer { +@@ -139,7 +139,7 @@ class FileAnalyzer { dmg_analyzer_{nullptr, base::OnTaskRunnerDeleter(nullptr)}; #endif diff --git a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc index 56293e7b0c60..99b3ed254ce9 100644 --- a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc +++ b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/signin/signin_util.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/signin/signin_util.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/signin/signin_util.cc -@@ -71,7 +71,7 @@ CookiesMover::CookiesMover(base::WeakPtr<Profile> sour +@@ -74,7 +74,7 @@ CookiesMover::CookiesMover(base::WeakPtr<Profile> sour CookiesMover::~CookiesMover() = default; void CookiesMover::StartMovingCookies() { 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 2dee4fff556d..c0c2530952fd 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,6 +1,6 @@ ---- chrome/browser/sync/sync_service_factory.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/sync/sync_service_factory.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/sync/sync_service_factory.cc -@@ -80,7 +80,7 @@ +@@ -82,7 +82,7 @@ #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || // BUILDFLAG(IS_WIN) -@@ -129,7 +129,7 @@ std::unique_ptr<KeyedService> BuildSyncService( +@@ -131,7 +131,7 @@ std::unique_ptr<KeyedService> BuildSyncService( // TODO(crbug.com/1052397): Reassess whether the following block needs to be // included in lacros-chrome once build flag switch of lacros-chrome is // complete. @@ -18,7 +18,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) syncer::SyncPrefs prefs(profile->GetPrefs()); local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); -@@ -251,7 +251,7 @@ SyncServiceFactory::SyncServiceFactory() +@@ -256,7 +256,7 @@ SyncServiceFactory::SyncServiceFactory() DependsOn(PasswordStoreFactory::GetInstance()); DependsOn(PowerBookmarkServiceFactory::GetInstance()); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ 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 fa871c2494cc..8853cc498572 100644 --- a/www/chromium/files/patch-chrome_browser_themes_theme__service.cc +++ b/www/chromium/files/patch-chrome_browser_themes_theme__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/themes/theme_service.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/themes/theme_service.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/themes/theme_service.cc -@@ -75,7 +75,7 @@ +@@ -74,7 +74,7 @@ #include "extensions/browser/extension_registry_observer.h" #endif @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -333,7 +333,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() +@@ -330,7 +330,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 new file mode 100644 index 000000000000..3411ce28c69f --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h @@ -0,0 +1,11 @@ +--- chrome/browser/ui/actions/chrome_action_id.h.orig 2023-10-11 18:22:24 UTC ++++ chrome/browser/ui/actions/chrome_action_id.h +@@ -532,7 +532,7 @@ + IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_ANSWER) \ + E(kActionContentContextQuickAnswersInlineQuery, \ + IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_QUERY) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #define CHROME_PLATFORM_SPECIFIC_ACTION_IDS \ + E(kUseSystemTitleBar, IDC_USE_SYSTEM_TITLE_BAR) \ + E(kRestoreWindow, IDC_RESTORE_WINDOW) diff --git a/www/chromium/files/patch-chrome_browser_ui_autofill_chrome__autofill__client.cc b/www/chromium/files/patch-chrome_browser_ui_autofill_chrome__autofill__client.cc deleted file mode 100644 index 0fd1fd25f5c3..000000000000 --- a/www/chromium/files/patch-chrome_browser_ui_autofill_chrome__autofill__client.cc +++ /dev/null @@ -1,17 +0,0 @@ ---- chrome/browser/ui/autofill/chrome_autofill_client.cc.orig 2023-09-13 12:11:42 UTC -+++ chrome/browser/ui/autofill/chrome_autofill_client.cc -@@ -1100,7 +1100,14 @@ void ChromeAutofillClient::PropagateAutofillPrediction - &renderer_form); - } - -+#if defined(__clang__) && (__clang_major__ >= 16) - for (const auto& [frame_token, frame_forms] : renderer_forms_by_frame) { -+#else -+ for (const auto& r_f : renderer_forms_by_frame) { -+ const auto& [f_t, f_f] = r_f; -+ const auto& frame_token = f_t; -+ const auto& frame_forms = f_f; -+#endif - // Attempt to find the RFH with this `frame_token`. - content::RenderFrameHost* rfh = nullptr; - GetWebContents().ForEachRenderFrameHost( diff --git a/www/chromium/files/patch-chrome_browser_ui_browser.h b/www/chromium/files/patch-chrome_browser_ui_browser.h index b489d67611ab..6c034f108ce7 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 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/browser.h.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/browser.h -@@ -288,7 +288,7 @@ class Browser : public TabStripModelObserver, +@@ -289,7 +289,7 @@ class Browser : public TabStripModelObserver, int32_t restore_id = kDefaultRestoreId; #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc index 977a098f1e68..9c2425bd0d26 100644 --- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc +++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/chrome_pages.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/chrome_pages.cc -@@ -71,7 +71,7 @@ +@@ -78,7 +78,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,12 +9,12 @@ #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -617,7 +617,7 @@ void ShowShortcutCustomizationApp(Profile* profile) { +@@ -668,7 +668,7 @@ void ShowShortcutCustomizationApp(Profile* profile, } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - void ShowWebAppSettings(Browser* browser, - const std::string& app_id, - web_app::AppSettingsPageEntryPoint entry_point) { + void ShowWebAppSettingsImpl(Browser* browser, + Profile* profile, + const std::string& app_id, diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h index 2ac2f16ae338..a2086842dc79 100644 --- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h +++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/chrome_pages.h.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/chrome_pages.h.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/chrome_pages.h -@@ -34,7 +34,7 @@ enum class ConsentLevel; +@@ -38,7 +38,7 @@ enum class ConsentLevel; } // namespace signin #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ namespace web_app { enum class AppSettingsPageEntryPoint; } // namespace web_app -@@ -237,7 +237,7 @@ void ShowShortcutCustomizationApp(Profile* profile); +@@ -249,7 +249,7 @@ void ShowShortcutCustomizationApp(Profile* profile, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc index 9cfa67211283..56880fb2dcd0 100644 --- a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/signin_view_controller.cc.orig 2023-08-17 07:33:31 UTC -+++ chrome/browser/ui/signin_view_controller.cc -@@ -275,7 +275,7 @@ void SigninViewController::ShowModalEnterpriseConfirma +--- chrome/browser/ui/signin/signin_view_controller.cc.orig 2023-10-11 18:22:24 UTC ++++ chrome/browser/ui/signin/signin_view_controller.cc +@@ -253,7 +253,7 @@ void SigninViewController::ShowModalEnterpriseConfirma bool show_link_data_option, signin::SigninChoiceCallback callback) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h index d041632ea4ee..8e0630151ac7 100644 --- a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h +++ b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h @@ -1,5 +1,5 @@ ---- chrome/browser/ui/signin_view_controller_delegate.h.orig 2023-09-13 12:11:42 UTC -+++ chrome/browser/ui/signin_view_controller_delegate.h +--- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig 2023-10-11 18:22:24 UTC ++++ chrome/browser/ui/signin/signin_view_controller_delegate.h @@ -81,7 +81,7 @@ class SigninViewControllerDelegate { #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc index eea8882ee703..55b1d54b8c82 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -96,7 +96,7 @@ static const char* kBadFlags[] = { +@@ -100,7 +100,7 @@ const char* const kBadFlags[] = { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index d577ca7cd241..2fe6c20e6639 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,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -132,7 +132,7 @@ +@@ -133,7 +133,7 @@ #include "chrome/credential_provider/common/gcp_strings.h" #endif // BUILDFLAG(IS_WIN) @@ -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" -@@ -917,7 +917,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -921,7 +921,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())) { -@@ -1021,7 +1021,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1025,7 +1025,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) && -@@ -1232,7 +1232,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1238,7 +1238,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow) << "Failed launch with app: couldn't pick a profile"; std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId); diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc index ef485f382314..8bb99442c7a7 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 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -223,7 +223,7 @@ +@@ -221,7 +221,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" -@@ -614,12 +614,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -610,12 +610,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc index 4166369fdbe7..fc42fab74d66 100644 --- a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc +++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/ui_features.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/ui_features.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/ui_features.cc -@@ -288,7 +288,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, +@@ -306,7 +306,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, "TopChromeWebUIUsesSpareRenderer", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.h b/www/chromium/files/patch-chrome_browser_ui_ui__features.h index 6bda27dc4934..3ee39837c20f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_ui__features.h +++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/ui_features.h.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/ui_features.h.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/ui_features.h -@@ -191,7 +191,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw); +@@ -194,7 +194,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw); BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_dark__mode__manager__linux.h b/www/chromium/files/patch-chrome_browser_ui_views_dark__mode__manager__linux.h new file mode 100644 index 000000000000..0b2c71ea2df0 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_dark__mode__manager__linux.h @@ -0,0 +1,10 @@ +--- chrome/browser/ui/views/dark_mode_manager_linux.h.orig 2023-10-11 18:22:24 UTC ++++ chrome/browser/ui/views/dark_mode_manager_linux.h +@@ -6,6 +6,7 @@ + #define CHROME_BROWSER_UI_VIEWS_DARK_MODE_MANAGER_LINUX_H_ + + #include <string> ++#include <vector> + + #include "base/gtest_prod_util.h" + #include "base/memory/scoped_refptr.h" diff --git a/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc index 7d33861f6c72..9b22f575aa8e 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc -@@ -159,7 +159,7 @@ EyeDropperView::EyeDropperView(content::RenderFrameHos +@@ -178,7 +178,7 @@ EyeDropperView::EyeDropperView(content::RenderFrameHos // EyeDropper/WidgetDelegate. set_owned_by_client(); SetPreferredSize(GetSize()); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc index e557ab4ecee9..82cc800d414b 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc -@@ -119,7 +119,7 @@ void EyeDropperView::MoveViewToFront() { +@@ -127,7 +127,7 @@ void EyeDropperView::MoveViewToFront() { } void EyeDropperView::CaptureInputIfNeeded() { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc index 2c9994511ef3..811b1a7469a4 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc @@ -54,7 +54,7 @@ #include "components/user_manager/user_manager.h" @@ -9,8 +9,8 @@ #include "ui/display/screen.h" #include "ui/linux/linux_ui.h" #endif -@@ -66,7 +66,7 @@ - namespace { +@@ -89,7 +89,7 @@ class ThemeChangedObserver : public views::WidgetObser + }; bool IsUsingLinuxSystemTheme(Profile* profile) { -#if BUILDFLAG(IS_LINUX) @@ -18,7 +18,16 @@ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -319,7 +319,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -180,7 +180,7 @@ void BrowserFrame::InitBrowserFrame() { + + Init(std::move(params)); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Because getting `linux_ui_theme` requires `native_widget_` to be + // initialized, this needs to happen after Init(). + if (!IsIncognitoBrowser() && +@@ -370,7 +370,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace()); chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(), IsVisibleOnAllWorkspaces()); @@ -27,16 +36,16 @@ // If the window was sent to a different workspace, prioritize it if // it was sent to the current workspace and deprioritize it // otherwise. This is done by MoveBrowsersInWorkspaceToFront() -@@ -547,7 +547,7 @@ void BrowserFrame::SelectNativeTheme() { - return; - } +@@ -558,7 +558,7 @@ void BrowserFrame::OnMenuClosed() { + } + void BrowserFrame::SelectNativeTheme() { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const auto* linux_ui_theme = - ui::LinuxUiTheme::GetForWindow(GetNativeWindow()); - // Ignore the system theme for web apps with window-controls-overlay as the -@@ -564,7 +564,7 @@ void BrowserFrame::SelectNativeTheme() { + // Use the regular NativeTheme instance if running incognito mode, regardless + // of system theme (gtk, qt etc). + ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi(); +@@ -599,7 +599,7 @@ void BrowserFrame::OnTouchUiChanged() { bool BrowserFrame::RegenerateFrameOnThemeChange( BrowserThemeChangeType theme_change_type) { bool need_regenerate = false; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h index 7287157dcc9d..2734f0125367 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-08-17 07:33:31 UTC +--- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/views/frame/browser_frame.h @@ -12,7 +12,7 @@ #include "ui/views/context_menu_controller.h" @@ -18,7 +18,7 @@ // Returns which edges of the frame are tiled. const ui::WindowTiledEdges& tiled_edges() const { return tiled_edges_; } void set_tiled_edges(ui::WindowTiledEdges tiled_edges) { -@@ -231,7 +231,7 @@ class BrowserFrame : public views::Widget, public view +@@ -230,7 +230,7 @@ class BrowserFrame : public views::Widget, public view // contents for smoother dragging. TabDragKind tab_drag_kind_ = TabDragKind::kNone; 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 9dfe37257498..033cd8c1acc7 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 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2076,7 +2076,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2106,7 +2106,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra // CrOS cleanup is done. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc index e7b033e3edcb..0d768808b6ec 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2023-04-28 17:01:32 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -54,7 +54,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" @@ -9,7 +9,7 @@ #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -572,7 +572,7 @@ OpaqueBrowserFrameView::FrameButtonStyle +@@ -568,7 +568,7 @@ OpaqueBrowserFrameView::FrameButtonStyle OpaqueBrowserFrameView::GetFrameButtonStyle() const { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ return FrameButtonStyle::kMdButton; #else return FrameButtonStyle::kImageButton; -@@ -595,7 +595,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh +@@ -591,7 +591,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh return false; } @@ -27,7 +27,7 @@ ui::WindowTiledEdges OpaqueBrowserFrameView::GetTiledEdges() const { return frame()->tiled_edges(); } -@@ -796,7 +796,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons +@@ -789,7 +789,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons } void OpaqueBrowserFrameView::WindowIconPressed() { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h index bf2a29776ba9..363974da65d3 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2023-04-05 11:05:06 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h -@@ -117,7 +117,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient +@@ -116,7 +116,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient const gfx::Rect& bounding_rect) const override; bool IsTranslucentWindowOpacitySupported() const override; bool ShouldDrawRestoredFrameShadow() const override; @@ -9,7 +9,7 @@ ui::WindowTiledEdges GetTiledEdges() const override; #endif int WebAppButtonHeight() const override; -@@ -234,7 +234,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient +@@ -233,7 +233,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient // Background painter for the window frame. std::unique_ptr<views::FrameBackground> frame_background_; 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 606a21ed66a1..a467348b64f1 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,6 +1,6 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc -@@ -56,7 +56,7 @@ +@@ -53,7 +53,7 @@ #include "ui/aura/window.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h" #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h" #endif -@@ -78,7 +78,7 @@ constexpr int kBackToTabImageSize = 16; +@@ -80,7 +80,7 @@ constexpr int kBackToTabImageSize = 16; // The height of the controls bar at the top of the window. constexpr int kTopControlsHeight = 30; @@ -18,7 +18,7 @@ // Frame border when window shadow is not drawn. constexpr int kFrameBorderThickness = 4; #endif -@@ -173,7 +173,7 @@ class WindowEventObserver : public ui::EventObserver { +@@ -175,7 +175,7 @@ class WindowEventObserver : public ui::EventObserver { gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds(); @@ -27,7 +27,7 @@ // Calculate input bounds for Linux. This is needed because the input bounds // is not necessary the same as the local bounds on Linux. if (pip_browser_frame_view_->ShouldDrawFrameShadow()) { -@@ -399,7 +399,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow +@@ -534,7 +534,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow } #endif @@ -36,7 +36,7 @@ frame_background_ = std::make_unique<views::FrameBackground>(); #endif -@@ -578,7 +578,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( +@@ -709,7 +709,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( for (ContentSettingImageView* view : content_setting_views_) view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground)); @@ -45,7 +45,7 @@ // On Linux the top bar background will be drawn in OnPaint(). top_bar_container_view_->SetBackground(views::CreateSolidBackground( color_provider->GetColor(kColorPipWindowTopBarBackground))); -@@ -634,7 +634,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg +@@ -772,7 +772,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg BrowserNonClientFrameView::RemovedFromWidget(); } @@ -54,7 +54,7 @@ gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -875,7 +875,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre +@@ -1016,7 +1016,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_) { -@@ -998,7 +998,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -1140,7 +1140,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 auto tiled_edges = frame()->tiled_edges(); -@@ -1019,7 +1019,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor +@@ -1161,7 +1161,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor } gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const { @@ -81,7 +81,7 @@ return FrameBorderInsets(); #elif BUILDFLAG(IS_CHROMEOS_ASH) return gfx::Insets(chromeos::kResizeInsideBoundsSize); -@@ -1040,7 +1040,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie +@@ -1182,7 +1182,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie top_height + border_thickness.bottom()); } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h index e8aab9b1efe4..7b0e8967b585 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h -@@ -23,7 +23,7 @@ +@@ -24,7 +24,7 @@ #include "ui/views/controls/image_view.h" #include "ui/views/widget/widget_observer.h" @@ -9,7 +9,16 @@ #include "ui/linux/window_frame_provider.h" #endif -@@ -86,7 +86,7 @@ class PictureInPictureBrowserFrameView +@@ -32,7 +32,7 @@ + // window, so to prevent cutting off important dialogs we resize the + // picture-in-picture window to fit them. While ChromeOS also uses Aura, it does + // not have this issue so we do not resize on ChromeOS. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #define RESIZE_DOCUMENT_PICTURE_IN_PICTURE_TO_DIALOG 1 + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) + +@@ -97,7 +97,7 @@ class PictureInPictureBrowserFrameView void Layout() override; void AddedToWidget() override; void RemovedFromWidget() override; @@ -18,7 +27,7 @@ gfx::Insets MirroredFrameBorderInsets() const override; gfx::Insets GetInputInsets() const override; SkRRect GetRestoredClipRegion() const override; -@@ -175,7 +175,7 @@ class PictureInPictureBrowserFrameView +@@ -186,7 +186,7 @@ class PictureInPictureBrowserFrameView // Called when mouse entered or exited the pip window. void OnMouseEnteredOrExitedWindow(bool entered); @@ -27,7 +36,7 @@ // Sets the window frame provider so that it will be used for drawing. void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider); -@@ -258,7 +258,7 @@ class PictureInPictureBrowserFrameView +@@ -349,7 +349,7 @@ class PictureInPictureBrowserFrameView // `top_bar_color_animation_`. absl::optional<SkColor> current_foreground_color_; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc index 19f0016eb657..240ee58e1a10 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 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -651,7 +651,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -652,7 +652,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc index 7f15b4e7238e..d86fc6d55d18 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 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc -@@ -49,7 +49,7 @@ namespace { +@@ -53,7 +53,7 @@ namespace { const int kModalDialogWidth = 448; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const int kEnterpriseConfirmationDialogWidth = 512; const int kEnterpriseConfirmationDialogHeight = 576; #endif -@@ -167,7 +167,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom +@@ -179,7 +179,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView( -@@ -442,7 +442,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati +@@ -454,7 +454,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 c6d8bc700ad5..3cfa8830347f 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,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h -@@ -74,7 +74,7 @@ class SigninViewControllerDelegateViews +@@ -73,7 +73,7 @@ class SigninViewControllerDelegateViews #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_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc index d5335b9b8d0e..283178d036af 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -593,7 +593,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -605,7 +605,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled()) return; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc index a6b5cb713220..98b3c483863e 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_style_views.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/views/tabs/tab_style_views.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/views/tabs/tab_style_views.cc -@@ -487,7 +487,7 @@ float GM2TabStyleViews::GetCurrentActiveOpacity() cons +@@ -490,7 +490,7 @@ float GM2TabStyleViews::GetCurrentActiveOpacity() cons if (!IsHoverAnimationActive()) { return base_opacity; } 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 0330b79c9fe8..ad0a6cbcf0b6 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 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc -@@ -416,7 +416,7 @@ std::string GetFileExtension(FileExtension file_extens +@@ -464,7 +464,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; -@@ -1862,7 +1862,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc +@@ -1933,7 +1933,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( -@@ -3106,7 +3106,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna +@@ -3249,7 +3249,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 -@@ -3121,7 +3121,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3264,7 +3264,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 -@@ -3131,7 +3131,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3274,7 +3274,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis void WebAppIntegrationTestDriver::CheckSiteHandlesFile( Site site, FileExtension file_extension) { @@ -45,7 +45,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3147,7 +3147,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile +@@ -3290,7 +3290,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile( Site site, FileExtension file_extension) { @@ -54,7 +54,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3939,7 +3939,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu +@@ -4073,7 +4073,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu base::FilePath shortcut_dir, const std::string& app_name, const AppId& app_id) { @@ -63,7 +63,7 @@ return override_registration_->test_override->GetShortcutPath( profile(), shortcut_dir, app_id, app_name); #else -@@ -4126,7 +4126,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre +@@ -4260,7 +4260,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre const 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); -@@ -4170,7 +4170,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr +@@ -4304,7 +4304,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_webauthn_sheet__models.cc b/www/chromium/files/patch-chrome_browser_ui_webauthn_sheet__models.cc index 9fada6f37245..4bed794426f4 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webauthn_sheet__models.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webauthn_sheet__models.cc @@ -1,8 +1,8 @@ ---- chrome/browser/ui/webauthn/sheet_models.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/webauthn/sheet_models.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/webauthn/sheet_models.cc -@@ -1496,7 +1496,11 @@ AuthenticatorMultiSourcePickerSheetModel:: - - using CredentialMech = AuthenticatorRequestDialogModel::Mechanism::Credential; +@@ -1499,7 +1499,11 @@ AuthenticatorMultiSourcePickerSheetModel:: + using ICloudKeychainMech = + AuthenticatorRequestDialogModel::Mechanism::ICloudKeychain; bool has_local_passkeys = +#if (_LIBCPP_VERSION >= 160000) std::ranges::any_of(dialog_model->mechanisms(), [](const auto& mech) { @@ -10,5 +10,5 @@ + base::ranges::any_of(dialog_model->mechanisms(), [](const auto& mech) { +#endif return absl::holds_alternative<CredentialMech>(mech.type) && - absl::get<CredentialMech>(mech.type).value() != + absl::get<CredentialMech>(mech.type).value().source != device::AuthenticatorType::kPhone; 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 f5a24505b8bc..0c63011e71a7 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,7 +1,7 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -213,7 +213,7 @@ - #include "chrome/browser/ui/webui/app_launcher_page_ui.h" +@@ -210,7 +210,7 @@ + #include "chrome/browser/ui/webui/chromeos/chrome_url_disabled/chrome_url_disabled_ui.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" #endif -@@ -239,17 +239,17 @@ +@@ -236,17 +236,17 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -30,7 +30,7 @@ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #endif -@@ -402,7 +402,7 @@ bool IsAboutUI(const GURL& url) { +@@ -399,7 +399,7 @@ bool IsAboutUI(const GURL& url) { #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -39,7 +39,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -667,7 +667,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -660,7 +660,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUIMobileSetupHost) return &NewWebUI<ash::cellular_setup::MobileSetupUI>; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -48,7 +48,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -729,7 +729,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -722,7 +722,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -57,7 +57,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -796,27 +796,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -789,27 +789,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc index df3d3f9929f2..99565e728f60 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,6 +1,6 @@ ---- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/webui/management/management_ui_handler.cc -@@ -91,7 +91,7 @@ +@@ -94,7 +94,7 @@ #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -9,8 +9,8 @@ #include "chrome/browser/enterprise/signals/user_permission_service_factory.h" #include "components/device_signals/core/browser/user_permission_service.h" // nogncheck #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -183,12 +183,12 @@ enum class ReportingType { - kUserActivity +@@ -190,12 +190,12 @@ enum class ReportingType { + kLegacyTech, }; -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) @@ -24,7 +24,7 @@ const char kManagementDeviceSignalsDisclosure[] = "managementDeviceSignalsDisclosure"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -747,7 +747,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value +@@ -773,7 +773,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value GetReportingTypeValue(report_definition.reporting_type)); report_sources->Append(std::move(data)); } @@ -33,7 +33,7 @@ // Insert the device signals consent disclosure at the end of browser // reporting section. auto* user_permission_service = GetUserPermissionService(); -@@ -1031,7 +1031,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec +@@ -1061,7 +1061,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec kManagementOnPageVisitedVisibleData, &info); } @@ -42,7 +42,7 @@ if (capture_policy::IsGetAllScreensMediaAllowedForAnySite(profile)) { AddThreatProtectionPermission(kManagementScreenCaptureEvent, kManagementScreenCaptureData, &info); -@@ -1115,7 +1115,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS +@@ -1145,7 +1145,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS ->policy_service(); } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h index fb45a4dd8e6c..361e2f93b227 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h +++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/management/management_ui_handler.h.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/webui/management/management_ui_handler.h.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/webui/management/management_ui_handler.h @@ -24,14 +24,14 @@ #include "extensions/common/extension_id.h" @@ -17,7 +17,7 @@ extern const char kManagementDeviceSignalsDisclosure[]; #endif // #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -114,7 +114,7 @@ class StatusCollector; +@@ -117,7 +117,7 @@ class StatusCollector; class SystemLogUploader; } // namespace policy @@ -26,7 +26,7 @@ namespace device_signals { class UserPermissionService; } // namespace device_signals -@@ -174,7 +174,7 @@ class ManagementUIHandler : public content::WebUIMessa +@@ -177,7 +177,7 @@ class ManagementUIHandler : public content::WebUIMessa base::Value::List GetManagedWebsitesInfo(Profile* profile) const; base::Value::List GetApplicationsInfo(Profile* profile) const; virtual policy::PolicyService* GetPolicyService(); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc index aa3b79175b05..9a403d419cb4 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/realbox/realbox_handler.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/webui/realbox/realbox_handler.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/webui/realbox/realbox_handler.cc -@@ -144,7 +144,7 @@ constexpr char kMacShareIconResourceName[] = +@@ -146,7 +146,7 @@ constexpr char kMacShareIconResourceName[] = #elif BUILDFLAG(IS_WIN) constexpr char kWinShareIconResourceName[] = "//resources/cr_components/omnibox/icons/win_share.svg"; @@ -9,7 +9,7 @@ constexpr char kLinuxShareIconResourceName[] = "//resources/cr_components/omnibox/icons/share.svg"; #else -@@ -740,7 +740,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN +@@ -745,7 +745,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN 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 09f625142a0f..4140f20bad83 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,7 +1,7 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc @@ -135,7 +135,7 @@ - #include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h" + #include "ash/webui/settings/public/constants/routes.mojom.h" #endif -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) @@ -18,7 +18,7 @@ #include "ui/linux/linux_ui_factory.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -255,7 +255,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s +@@ -263,7 +263,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s base::FeatureList::IsEnabled( supervised_user::kClearingCookiesKeepsSupervisedUsersSignedIn)); @@ -27,7 +27,16 @@ bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt); #else bool allow_qt_theme = false; -@@ -416,7 +416,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -294,7 +294,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou + {"focusHighlightLabel", + IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION}, + #endif +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + {"overscrollHistoryNavigationTitle", + IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE}, + {"overscrollHistoryNavigationSubtitle", +@@ -433,7 +433,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, {"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT}, {"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT}, @@ -36,7 +45,7 @@ {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -426,7 +426,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -443,7 +443,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif @@ -45,7 +54,7 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -451,7 +451,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -468,7 +468,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc index 6d2c255f1068..358621e94919 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc -@@ -171,7 +171,7 @@ void ShortcutSubManager::Execute( +@@ -182,7 +182,7 @@ void ShortcutSubManager::Execute( return; } diff --git a/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc b/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc new file mode 100644 index 000000000000..245838e42b91 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc @@ -0,0 +1,11 @@ +--- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig 2023-10-11 18:22:24 UTC ++++ chrome/browser/web_applications/policy/web_app_policy_manager.cc +@@ -117,7 +117,7 @@ namespace web_app { + + BASE_FEATURE(kDesktopPWAsForceUnregisterOSIntegration, + "DesktopPWAsForceUnregisterOSIntegration", +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-chrome_browser_webauthn_authenticator__request__dialog__model.cc b/www/chromium/files/patch-chrome_browser_webauthn_authenticator__request__dialog__model.cc new file mode 100644 index 000000000000..a874f57156b4 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_webauthn_authenticator__request__dialog__model.cc @@ -0,0 +1,14 @@ +--- chrome/browser/webauthn/authenticator_request_dialog_model.cc.orig 2023-10-11 18:22:24 UTC ++++ chrome/browser/webauthn/authenticator_request_dialog_model.cc +@@ -495,7 +495,11 @@ void AuthenticatorRequestDialogModel:: + // extra step. Jump to Windows instead. + if (base::FeatureList::IsEnabled(device::kWebAuthnNewPasskeyUI) && + transport_availability_.has_win_native_api_authenticator && ++#if (_LIBCPP_VERSION >= 160000) + std::ranges::all_of(mechanisms_, [](const auto& mech) { ++#else ++ base::ranges::all_of(mechanisms_, [](const auto& mech) { ++#endif + return absl::holds_alternative<Mechanism::WindowsAPI>(mech.type) || + (absl::holds_alternative<Mechanism::Credential>(mech.type) && + absl::get<Mechanism::Credential>(mech.type).value().source == 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 4b62b1fc2452..b004aff3d041 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 2023-09-13 12:11:42 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -602,7 +602,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc +@@ -670,7 +670,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc g_observer->ConfiguringCable(request_type); } @@ -9,3 +9,15 @@ // No caBLEv1 on Linux. It tends to crash bluez. if (base::Contains(pairings_from_extension, device::CableDiscoveryData::Version::V1, +@@ -886,7 +886,11 @@ void ChromeAuthenticatorRequestDelegate::OnTransportAv + if (data.has_platform_authenticator_credential == + device::FidoRequestHandlerBase::RecognizedCredential:: + kHasRecognizedCredential && ++#if (_LIBCPP_VERSION >= 160000) + std::ranges::none_of(data.recognized_credentials, ++#else ++ base::ranges::none_of(data.recognized_credentials, ++#endif + IsCredentialFromPlatformAuthenticator)) { + data.has_platform_authenticator_credential = device:: + FidoRequestHandlerBase::RecognizedCredential::kNoRecognizedCredential; diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index 2162727e3361..e3d8a01a373a 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 2023-09-13 12:11:42 UTC +--- chrome/common/chrome_features.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/common/chrome_features.cc -@@ -77,7 +77,7 @@ BASE_FEATURE(kAsyncDns, +@@ -84,7 +84,7 @@ BASE_FEATURE(kAsyncDns, ); #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, -@@ -95,7 +95,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, +@@ -102,7 +102,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. -@@ -278,7 +278,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, +@@ -297,7 +297,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, // Enables or disables Desktop PWAs to be auto-started on OS login. BASE_FEATURE(kDesktopPWAsRunOnOsLogin, "DesktopPWAsRunOnOsLogin", @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -307,7 +307,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles, +@@ -326,7 +326,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles, base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ // Controls whether Chrome Apps are supported. See https://crbug.com/1221251. // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome // Apps will not launch and will be marked in the UI as deprecated. -@@ -340,7 +340,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati +@@ -359,7 +359,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati BASE_FEATURE(kDnsOverHttps, "DnsOverHttps", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -45,7 +45,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -356,7 +356,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa +@@ -375,7 +375,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa const base::FeatureParam<bool> kDnsOverHttpsShowUiParam { &kDnsOverHttps, "ShowUi", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -54,7 +54,7 @@ true #else false -@@ -825,7 +825,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, +@@ -863,7 +863,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, "KAnonymityServiceStorage", base::FEATURE_ENABLED_BY_DEFAULT); @@ -63,7 +63,7 @@ BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -838,7 +838,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -876,7 +876,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 33234ce0d9f8..5c9d65cbe4fe 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 2023-09-13 12:11:42 UTC +--- chrome/common/chrome_features.h.orig 2023-10-11 18:22:24 UTC +++ chrome/common/chrome_features.h -@@ -59,13 +59,13 @@ BASE_DECLARE_FEATURE(kAppShimNewCloseBehavior); +@@ -61,13 +61,13 @@ BASE_DECLARE_FEATURE(kAppShimNotificationAttribution); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAsyncDns); #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(kDesktopPWAsTabStripSettings); +@@ -201,7 +201,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsWebBundles); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -25,7 +25,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kKeepForceInstalledPreinstalledApps); -@@ -487,7 +487,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); +@@ -499,7 +499,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; -@@ -495,7 +495,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -507,7 +507,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index 98a615d10a07..033c4019a84f 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,6 +1,15 @@ ---- chrome/common/chrome_paths.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/common/chrome_paths.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/common/chrome_paths.cc -@@ -45,14 +45,14 @@ +@@ -30,7 +30,7 @@ + #include "base/apple/foundation_util.h" + #endif + +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) + #include "components/policy/core/common/policy_paths.h" + #endif + +@@ -49,14 +49,14 @@ namespace { @@ -18,7 +27,7 @@ #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -207,7 +207,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -211,7 +211,7 @@ bool PathProvider(int key, base::FilePath* result) { } break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -27,21 +36,16 @@ if (!GetUserDownloadsDirectorySafe(&cur)) { return false; } -@@ -500,10 +500,12 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -504,7 +504,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; } break; -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD) +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) case chrome::DIR_POLICY_FILES: { - #if BUILDFLAG(GOOGLE_CHROME_BRANDING) - cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); -+#elif BUILDFLAG(IS_FREEBSD) -+ cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chromium/policies")); - #else - cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); - #endif -@@ -515,7 +517,7 @@ bool PathProvider(int key, base::FilePath* result) { + cur = base::FilePath(policy::kPolicyPath); + break; +@@ -515,7 +515,7 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(IS_CHROMEOS_ASH) || \ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) || \ @@ -50,7 +54,7 @@ case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) { return false; -@@ -524,7 +526,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -524,7 +524,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -59,7 +63,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -571,7 +573,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -571,7 +571,7 @@ bool PathProvider(int key, base::FilePath* result) { break; #endif @@ -68,7 +72,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if BUILDFLAG(IS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -585,6 +587,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -585,6 +585,9 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath( FILE_PATH_LITERAL("/etc/opt/chrome/native-messaging-hosts")); diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index 7947950a89f2..7f0933eddc77 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/common/chrome_switches.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/common/chrome_switches.cc -@@ -853,14 +853,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -849,14 +849,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h index 20fb90faf538..f9398a73f794 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/chromium/files/patch-chrome_common_chrome__switches.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.h.orig 2023-09-13 12:11:42 UTC +--- chrome/common/chrome_switches.h.orig 2023-10-11 18:22:24 UTC +++ chrome/common/chrome_switches.h -@@ -270,12 +270,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -269,12 +269,12 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_common_media_cdm__registration.cc b/www/chromium/files/patch-chrome_common_media_cdm__registration.cc index 6cd0a0a656a2..adf6d3145679 100644 --- a/www/chromium/files/patch-chrome_common_media_cdm__registration.cc +++ b/www/chromium/files/patch-chrome_common_media_cdm__registration.cc @@ -1,16 +1,16 @@ ---- chrome/common/media/cdm_registration.cc.orig 2023-09-27 23:09:59 UTC +--- chrome/common/media/cdm_registration.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/common/media/cdm_registration.cc @@ -25,11 +25,11 @@ #if BUILDFLAG(ENABLE_WIDEVINE) #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FREEBSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "base/native_library.h" #include "chrome/common/chrome_paths.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/no_destructor.h" #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h" #include "components/cdm/common/cdm_manifest.h" @@ -19,7 +19,7 @@ #if (BUILDFLAG(BUNDLE_WIDEVINE_CDM) || \ BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) // Create a CdmInfo for a Widevine CDM, using |version|, |cdm_library_path|, and // |capability|. std::unique_ptr<content::CdmInfo> CreateWidevineCdmInfo( @@ -28,7 +28,7 @@ #if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) // On Linux/ChromeOS we have to preload the CDM since it uses the zygote // sandbox. On Windows and Mac, the bundled CDM is handled by the component // updater. @@ -37,7 +37,7 @@ #if BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) // This code checks to see if a component updated Widevine CDM can be found. If // there is one and it looks valid, return the CdmInfo for that CDM. Otherwise // return nullptr. @@ -46,7 +46,7 @@ kWidevineCdmType, base::Version(), base::FilePath()); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION) base::Version glibc_version(gnu_get_libc_version()); DCHECK(glibc_version.IsValid()); diff --git a/www/chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h b/www/chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h index 5d3c4fb47e75..3723e2265d12 100644 --- a/www/chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h +++ b/www/chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h @@ -1,11 +1,11 @@ ---- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig 2023-09-27 23:09:59 UTC +--- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig 2023-10-11 18:22:24 UTC +++ chrome/common/media/component_widevine_cdm_hint_file_linux.h @@ -15,7 +15,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) -+#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD)) ++#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) #error "This file only applies to desktop Linux and ChromeOS." #endif diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index 26adcc96d67d..4764ed4c2662 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.h +++ b/www/chromium/files/patch-chrome_common_pref__names.h @@ -1,15 +1,15 @@ ---- chrome/common/pref_names.h.orig 2023-09-13 12:11:42 UTC +--- chrome/common/pref_names.h.orig 2023-10-11 18:22:24 UTC +++ chrome/common/pref_names.h -@@ -1329,7 +1329,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u +@@ -1316,7 +1316,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Linux specific preference on whether we should match the system theme. - inline constexpr char kUsesSystemThemeDeprecated[] = - "extensions.theme.use_system"; -@@ -1451,7 +1451,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = + inline constexpr char kSystemTheme[] = "extensions.theme.system_theme"; + #endif +@@ -1442,7 +1442,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"; -@@ -2004,7 +2004,7 @@ inline constexpr char kDownloadLastCompleteTime[] = +@@ -1986,7 +1986,7 @@ inline constexpr char kDownloadLastCompleteTime[] = "download.last_complete_time"; #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 -@@ -2396,7 +2396,7 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s +@@ -2392,14 +2392,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data"; #endif // BUILDFLAG(IS_WIN) @@ -36,7 +36,15 @@ // A boolean pref to determine whether or not the network service is running // sandboxed. inline constexpr char kNetworkServiceSandboxEnabled[] = -@@ -2475,7 +2475,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM + "net.network_service_sandbox"; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Records whether the user has seen an HTTP auth "negotiate" header. + inline constexpr char kReceivedHttpAuthNegotiateHeader[] = + "net.received_http_auth_negotiate_headers"; +@@ -2477,7 +2477,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM inline constexpr char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -45,7 +53,7 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3545,7 +3545,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes +@@ -3551,7 +3551,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes inline constexpr char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -54,7 +62,7 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. inline constexpr char kAllowSystemNotifications[] = -@@ -3601,7 +3601,7 @@ inline constexpr char kCACertificateManagementAllowed[ +@@ -3607,7 +3607,7 @@ inline constexpr char kCACertificateManagementAllowed[ inline constexpr char kChromeRootStoreEnabled[] = "chrome_root_store_enabled"; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -63,7 +71,7 @@ inline constexpr char kEnforceLocalAnchorConstraintsEnabled[] = "enforce_local_anchor_constraints_enabled"; #endif -@@ -3928,7 +3928,7 @@ inline constexpr char kThrottleNonVisibleCrossOriginIf +@@ -3921,7 +3921,7 @@ inline constexpr char kThrottleNonVisibleCrossOriginIf inline constexpr char kNewBaseUrlInheritanceBehaviorAllowed[] = "new_base_url_inheritance_behavior_allowed"; diff --git a/www/chromium/files/patch-chrome_common_url__constants.cc b/www/chromium/files/patch-chrome_common_url__constants.cc index 93577c5fc2db..b43339860136 100644 --- a/www/chromium/files/patch-chrome_common_url__constants.cc +++ b/www/chromium/files/patch-chrome_common_url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/url_constants.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/common/url_constants.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/common/url_constants.cc -@@ -554,7 +554,7 @@ const char kPhoneHubPermissionLearnMoreURL[] = +@@ -560,7 +560,7 @@ const char kPhoneHubPermissionLearnMoreURL[] = "https://support.google.com/chromebook/?p=multidevice"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_common_url__constants.h b/www/chromium/files/patch-chrome_common_url__constants.h index 7156a6a8c2be..a66eec33de43 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 2023-09-13 12:11:42 UTC +--- chrome/common/url_constants.h.orig 2023-10-11 18:22:24 UTC +++ chrome/common/url_constants.h -@@ -531,7 +531,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; +@@ -537,7 +537,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; extern const char kPhoneHubPermissionLearnMoreURL[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc index b6cab0dab408..3477a59ea7f2 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/common/webui_url_constants.cc.orig 2023-10-11 18:22:24 UTC +++ chrome/common/webui_url_constants.cc -@@ -490,18 +490,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os:// +@@ -499,18 +499,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os:// const char kOsUIVersionURL[] = "os://version"; #endif @@ -22,7 +22,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -@@ -516,14 +516,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr +@@ -525,14 +525,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -39,7 +39,7 @@ const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; const char kChromeUIEnterpriseProfileWelcomeHost[] = -@@ -542,7 +542,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro +@@ -551,7 +551,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif @@ -48,7 +48,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; -@@ -622,7 +622,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan +@@ -631,7 +631,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -57,7 +57,7 @@ const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; const char kChromeUIWebAppSettingsHost[] = "app-settings"; #endif -@@ -856,7 +856,7 @@ const char* const kChromeDebugURLs[] = { +@@ -865,7 +865,7 @@ const char* const kChromeDebugURLs[] = { blink::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h index fe94797fa47c..9860f967eaf1 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 2023-09-13 12:11:42 UTC +--- chrome/common/webui_url_constants.h.orig 2023-10-11 18:22:24 UTC +++ chrome/common/webui_url_constants.h -@@ -411,24 +411,24 @@ extern const char kOsUIShortcutCustomizationAppURL[]; +@@ -419,24 +419,24 @@ extern const char kOsUIShortcutCustomizationAppURL[]; extern const char kOsUIVersionURL[]; #endif @@ -29,7 +29,7 @@ extern const char kChromeUIWebAppSettingsURL[]; extern const char kChromeUIWebAppSettingsHost[]; #endif -@@ -443,7 +443,7 @@ extern const char kChromeUILinuxProxyConfigHost[]; +@@ -451,7 +451,7 @@ extern const char kChromeUILinuxProxyConfigHost[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -38,7 +38,7 @@ extern const char kChromeUISandboxHost[]; #endif -@@ -455,7 +455,7 @@ extern const char kChromeUISearchEngineChoiceHost[]; +@@ -463,7 +463,7 @@ extern const char kChromeUISearchEngineChoiceHost[]; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || \ @@ -47,7 +47,7 @@ extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIEnterpriseProfileWelcomeHost[]; -@@ -471,7 +471,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -479,7 +479,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index 1db45f214674..4d968e1c21bd 100644 --- a/www/chromium/files/patch-chrome_test_BUILD.gn +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2023-09-13 12:11:42 UTC +--- chrome/test/BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ chrome/test/BUILD.gn -@@ -10857,7 +10857,7 @@ test("chrome_app_unittests") { +@@ -10971,7 +10971,7 @@ test("chrome_app_unittests") { "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", ] diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome_client__hints.h b/www/chromium/files/patch-chrome_test_chromedriver_chrome_client__hints.h deleted file mode 100644 index dba7051c5ddc..000000000000 --- a/www/chromium/files/patch-chrome_test_chromedriver_chrome_client__hints.h +++ /dev/null @@ -1,10 +0,0 @@ ---- chrome/test/chromedriver/chrome/client_hints.h.orig 2023-07-16 15:47:57 UTC -+++ chrome/test/chromedriver/chrome/client_hints.h -@@ -7,6 +7,7 @@ - - #include <third_party/abseil-cpp/absl/types/optional.h> - #include <string> -+#include <vector> - - struct BrandVersion { - // Browser brand. 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 35a45033e6d8..c52ed566f656 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 2023-09-13 12:11:42 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2023-10-11 18:22:24 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -448,7 +448,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -451,7 +451,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { diff --git a/www/chromium/files/patch-components_autofill__payments__strings.grdp b/www/chromium/files/patch-components_autofill__payments__strings.grdp index 2c8b11de9373..10bd7f0fa96f 100644 --- a/www/chromium/files/patch-components_autofill__payments__strings.grdp +++ b/www/chromium/files/patch-components_autofill__payments__strings.grdp @@ -1,6 +1,6 @@ ---- components/autofill_payments_strings.grdp.orig 2023-09-13 12:11:42 UTC +--- components/autofill_payments_strings.grdp.orig 2023-10-11 18:22:24 UTC +++ components/autofill_payments_strings.grdp -@@ -124,7 +124,7 @@ +@@ -130,7 +130,7 @@ <message name="IDS_AUTOFILL_FIX_FLOW_PROMPT_SAVE_CARD_LABEL" desc="Text to show on the button to save the card to Google when the fix flow dialog is shown after the Autofill save card prompt." formatter_data="android_java"> Save card </message> diff --git a/www/chromium/files/patch-components_autofill_core_browser_contact__info__sync__util.cc b/www/chromium/files/patch-components_autofill_core_browser_contact__info__sync__util.cc new file mode 100644 index 000000000000..5a618bddf42d --- /dev/null +++ b/www/chromium/files/patch-components_autofill_core_browser_contact__info__sync__util.cc @@ -0,0 +1,18 @@ +--- components/autofill/core/browser/contact_info_sync_util.cc.orig 2023-10-11 18:22:24 UTC ++++ components/autofill/core/browser/contact_info_sync_util.cc +@@ -174,9 +174,15 @@ class ContactInfoProfileSetter { + CHECK(observations.empty()); + for (const sync_pb::ContactInfoSpecifics::Observation& proto_observation : + proto_observations) { ++#if defined(__clang__) && (__clang_major__ >= 15) + observations.emplace_back(proto_observation.type(), + ProfileTokenQuality::FormSignatureHash( + proto_observation.form_hash())); ++#else ++ observations.emplace_back() = { static_cast<unsigned char>(proto_observation.type()), ++ ProfileTokenQuality::FormSignatureHash( ++ proto_observation.form_hash()) }; ++#endif + } + } + diff --git a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc index cd1dede20dc0..94a353147b9a 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/personal_data_manager.cc.orig 2023-09-13 12:11:42 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2023-10-11 18:22:24 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -2484,7 +2484,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2492,7 +2492,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ @@ -9,4 +9,4 @@ + BUILDFLAG(IS_BSD) // This option should only be shown for users that have not enabled the Sync // Feature and that have server credit cards available. - if (!sync_service_ || sync_service_->IsSyncFeatureEnabled() || + // TODO(crbug.com/1462552): Simplify once ConsentLevel::kSync and diff --git a/www/chromium/files/patch-components_autofill_core_browser_webdata_autofill__sync__bridge__util.cc b/www/chromium/files/patch-components_autofill_core_browser_webdata_autofill__sync__bridge__util.cc new file mode 100644 index 000000000000..c44bdeacb460 --- /dev/null +++ b/www/chromium/files/patch-components_autofill_core_browser_webdata_autofill__sync__bridge__util.cc @@ -0,0 +1,22 @@ +--- components/autofill/core/browser/webdata/autofill_sync_bridge_util.cc.orig 2023-10-11 18:22:24 UTC ++++ components/autofill/core/browser/webdata/autofill_sync_bridge_util.cc +@@ -553,11 +553,19 @@ ServerCvc AutofillWalletCvcStructDataFromWalletCredent + base::StringToInt64(wallet_credential_specifics.instrument_id(), + &instrument_id); + ++#if defined(__clang__) && (__clang_major__ >= 15) + return ServerCvc( + instrument_id, base::UTF8ToUTF16(wallet_credential_specifics.cvc()), + base::Time::UnixEpoch() + + base::Milliseconds(wallet_credential_specifics + .last_updated_time_unix_epoch_millis())); ++#else ++ return ServerCvc( { ++ instrument_id, base::UTF8ToUTF16(wallet_credential_specifics.cvc()), ++ base::Time::UnixEpoch() + ++ base::Milliseconds(wallet_credential_specifics ++ .last_updated_time_unix_epoch_millis()) }); ++#endif + } + + VirtualCardUsageData VirtualCardUsageDataFromUsageSpecifics( 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 d4c0e60df738..92af9c9f56d0 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2023-09-13 12:11:42 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2023-10-11 18:22:24 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -305,7 +305,7 @@ BASE_FEATURE(kAutofillEnablePaymentsMandatoryReauthOnB +@@ -281,7 +281,7 @@ BASE_FEATURE(kEnablePixPayments, bool ShouldShowImprovedUserConsentForCreditCardSave() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_commerce__strings.grdp b/www/chromium/files/patch-components_commerce__strings.grdp new file mode 100644 index 000000000000..adcb4fd99f6c --- /dev/null +++ b/www/chromium/files/patch-components_commerce__strings.grdp @@ -0,0 +1,11 @@ +--- components/commerce_strings.grdp.orig 2023-10-11 18:22:24 UTC ++++ components/commerce_strings.grdp +@@ -292,7 +292,7 @@ + <message name="IDS_PRICE_HISTORY_DESCRIPTION" desc="The description of the Price History section in the Shopping Insights side panel explaining how the prices are gathered."> + Typical prices are based on stores across the web over the past 90 days. + </message> +- <if expr="is_win or is_linux"> ++ <if expr="is_win or is_posix"> + <then> + <message name="IDS_PRICE_HISTORY_GRAPH_ACCESSIBILITY" desc="Accessibility string for the price history graph indicating how users can review the price changes on the graph."> + Browse mode, you can change to Forms mode to use the left/right arrow to review price changes on the graph diff --git a/www/chromium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc b/www/chromium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc index 501693a1511b..a4cb305fab8c 100644 --- a/www/chromium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc +++ b/www/chromium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc @@ -1,6 +1,6 @@ ---- components/device_signals/core/browser/user_permission_service_impl.cc.orig 2023-07-16 15:47:57 UTC +--- components/device_signals/core/browser/user_permission_service_impl.cc.orig 2023-10-11 18:22:24 UTC +++ components/device_signals/core/browser/user_permission_service_impl.cc -@@ -74,7 +74,7 @@ bool UserPermissionServiceImpl::ShouldCollectConsent() +@@ -92,7 +92,7 @@ bool UserPermissionServiceImpl::ShouldCollectConsent() consent_required_by_dependent_policy; } diff --git a/www/chromium/files/patch-components_embedder__support_user__agent__utils.cc b/www/chromium/files/patch-components_embedder__support_user__agent__utils.cc index 03890742a181..1aa0040a1144 100644 --- a/www/chromium/files/patch-components_embedder__support_user__agent__utils.cc +++ b/www/chromium/files/patch-components_embedder__support_user__agent__utils.cc @@ -1,6 +1,6 @@ ---- components/embedder_support/user_agent_utils.cc.orig 2023-09-13 12:11:42 UTC +--- components/embedder_support/user_agent_utils.cc.orig 2023-10-11 18:22:24 UTC +++ components/embedder_support/user_agent_utils.cc -@@ -540,6 +540,9 @@ std::string GetPlatformForUAMetadata() { +@@ -432,6 +432,9 @@ std::string GetPlatformForUAMetadata() { # else return "Chromium OS"; # endif 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 fe88a9392977..da760f4c5aac 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 2023-09-13 12:11:42 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2023-10-11 18:22:24 UTC +++ components/feature_engagement/public/feature_configurations.cc -@@ -40,7 +40,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe +@@ -46,7 +46,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe absl::optional<FeatureConfig> GetClientSideFeatureConfig( const base::Feature* feature) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ if (kIPHPasswordsAccountStorageFeature.name == feature->name) { absl::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -1320,7 +1320,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf +@@ -1336,7 +1336,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf #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 02f25d2628cb..0bb04cd6dcf2 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 2023-09-13 12:11:42 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2023-10-11 18:22:24 UTC +++ components/feature_engagement/public/feature_constants.cc @@ -21,7 +21,7 @@ BASE_FEATURE(kUseClientConfigIPH, BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ BASE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature, "IPH_AutofillFeedbackNewBadge", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -516,7 +516,8 @@ BASE_FEATURE(kIPHiOSPromoPostRestoreDefaultBrowserFeat +@@ -519,7 +519,8 @@ BASE_FEATURE(kIPHiOSPromoPasswordManagerWidgetFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ 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 a7fff5200b91..e5d1c99c26c8 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 2023-09-13 12:11:42 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2023-10-11 18:22:24 UTC +++ components/feature_engagement/public/feature_constants.h @@ -23,7 +23,7 @@ BASE_DECLARE_FEATURE(kUseClientConfigIPH); BASE_DECLARE_FEATURE(kIPHDummyFeature); @@ -9,7 +9,7 @@ BASE_DECLARE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature); BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature); BASE_DECLARE_FEATURE(kIPHCompanionSidePanelFeature); -@@ -210,7 +210,8 @@ BASE_DECLARE_FEATURE(kIPHiOSPromoPostRestoreDefaultBro +@@ -211,7 +211,8 @@ BASE_DECLARE_FEATURE(kIPHiOSPromoPasswordManagerWidget #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ 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 205b7975a7f9..a017e487f79e 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 2023-09-13 12:11:42 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2023-10-11 18:22:24 UTC +++ components/feature_engagement/public/feature_list.cc @@ -139,7 +139,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHiOSPromoPostRestoreDefaultBrowserFeature, + &kIPHiOSPromoPasswordManagerWidgetFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -9,7 +9,7 @@ &kIPHAutofillFeedbackNewBadgeFeature, &kIPHBatterySaverModeFeature, &kIPHCompanionSidePanelFeature, -@@ -185,7 +185,8 @@ const base::Feature* const kAllFeatures[] = { +@@ -186,7 +186,8 @@ const base::Feature* const kAllFeatures[] = { // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ 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 f7d66d736890..babfab694f35 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 2023-09-13 12:11:42 UTC +--- components/feature_engagement/public/feature_list.h.orig 2023-10-11 18:22:24 UTC +++ components/feature_engagement/public/feature_list.h -@@ -258,7 +258,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSPromoPostRestoreDefaultB +@@ -259,7 +259,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSPromoPasswordManagerWidg #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ DEFINE_VARIATION_PARAM(kIPHAutofillFeedbackNewBadgeFeature, "IPH_AutofillFeedbackNewBadge"); DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode"); -@@ -332,7 +332,8 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, +@@ -335,7 +335,8 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,16 +19,16 @@ DEFINE_VARIATION_PARAM(kIPHAutofillExternalAccountProfileSuggestionFeature, "IPH_AutofillExternalAccountProfileSuggestion"); DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardCVCSuggestionFeature, -@@ -538,7 +539,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHiOSShareToolbarItemFeature), +@@ -541,7 +542,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHiOSPromoPostRestoreDefaultBrowserFeature), + VARIATION_ENTRY(kIPHiOSPromoPasswordManagerWidgetFeature), #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(kIPHAutofillFeedbackNewBadgeFeature), VARIATION_ENTRY(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHCompanionSidePanelFeature), -@@ -585,7 +586,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -589,7 +590,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc b/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc index 60a9c4f31e02..484a835a0aba 100644 --- a/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc +++ b/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/feed_network_impl_unittest.cc.orig 2023-07-16 15:47:57 UTC +--- components/feed/core/v2/feed_network_impl_unittest.cc.orig 2023-10-11 18:22:24 UTC +++ components/feed/core/v2/feed_network_impl_unittest.cc -@@ -801,8 +801,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn +@@ -753,8 +753,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn EXPECT_EQ(feedwire::ClientInfo::CHROME_ANDROID, client_info.app_type()); EXPECT_EQ(feedwire::Version::RELEASE, client_info.app_version().build_type()); diff --git a/www/chromium/files/patch-components_management__strings.grdp b/www/chromium/files/patch-components_management__strings.grdp index 39dffb51f9a1..d078bd5e6688 100644 --- a/www/chromium/files/patch-components_management__strings.grdp +++ b/www/chromium/files/patch-components_management__strings.grdp @@ -1,6 +1,6 @@ ---- components/management_strings.grdp.orig 2023-09-13 12:11:42 UTC +--- components/management_strings.grdp.orig 2023-10-11 18:22:24 UTC +++ components/management_strings.grdp -@@ -343,7 +343,7 @@ +@@ -346,7 +346,7 @@ </if> <!-- Strings related to Chrome Enterprise Device Signals Sharing --> diff --git a/www/chromium/files/patch-components_metrics_metrics__log.cc b/www/chromium/files/patch-components_metrics_metrics__log.cc index 9a8e8df6cd30..abb88b80dc92 100644 --- a/www/chromium/files/patch-components_metrics_metrics__log.cc +++ b/www/chromium/files/patch-components_metrics_metrics__log.cc @@ -1,6 +1,6 @@ ---- components/metrics/metrics_log.cc.orig 2023-05-31 08:12:17 UTC +--- components/metrics/metrics_log.cc.orig 2023-10-11 18:22:24 UTC +++ components/metrics/metrics_log.cc -@@ -52,7 +52,7 @@ +@@ -53,7 +53,7 @@ #include "base/win/current_module.h" #endif @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #endif -@@ -130,7 +130,7 @@ void RecordCurrentTime( +@@ -139,7 +139,7 @@ void RecordCurrentTime( } } @@ -18,7 +18,7 @@ metrics::SystemProfileProto::OS::XdgSessionType ToProtoSessionType( base::nix::SessionType session_type) { switch (session_type) { -@@ -390,7 +390,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -399,7 +399,7 @@ void MetricsLog::RecordCoreSystemProfile( // OperatingSystemVersion refers to the ChromeOS release version. #if BUILDFLAG(IS_CHROMEOS_ASH) os->set_kernel_version(base::SysInfo::KernelVersion()); @@ -27,7 +27,7 @@ // Linux operating system version is copied over into kernel version to be // consistent. os->set_kernel_version(base::SysInfo::OperatingSystemVersion()); -@@ -407,7 +407,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -416,7 +416,7 @@ void MetricsLog::RecordCoreSystemProfile( os->set_build_number(base::SysInfo::GetIOSBuildNumber()); #endif diff --git a/www/chromium/files/patch-components_optimization__guide_core_tflite__model__executor.h b/www/chromium/files/patch-components_optimization__guide_core_tflite__model__executor.h index 268d30ccad8d..7abe7f03ad2e 100644 --- a/www/chromium/files/patch-components_optimization__guide_core_tflite__model__executor.h +++ b/www/chromium/files/patch-components_optimization__guide_core_tflite__model__executor.h @@ -1,6 +1,6 @@ ---- components/optimization_guide/core/tflite_model_executor.h.orig 2023-09-13 12:11:42 UTC +--- components/optimization_guide/core/tflite_model_executor.h.orig 2023-10-11 18:22:24 UTC +++ components/optimization_guide/core/tflite_model_executor.h -@@ -212,7 +212,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu +@@ -240,7 +240,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu void SendForBatchExecution( BatchExecutionCallback callback_on_complete, base::TimeTicks start_time, @@ -12,7 +12,7 @@ override { DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -234,7 +238,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu +@@ -262,7 +266,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu // Starts the synchronous execution of the model. Returns model outputs. // Model needs to be loaded. Synchronous calls do not load or unload model. std::vector<absl::optional<OutputType>> SendForBatchExecutionSync( @@ -24,7 +24,7 @@ override { DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -389,7 +397,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu +@@ -417,7 +425,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu // executes it on the model execution thread. void LoadModelFileAndBatchExecute( BatchExecutionCallback callback_on_complete, @@ -36,7 +36,7 @@ DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -406,7 +418,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu +@@ -434,7 +446,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu // Batch executes the loaded model for inputs. void BatchExecuteLoadedModel( @@ -48,7 +48,7 @@ std::vector<absl::optional<OutputType>>* outputs) { DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -466,7 +482,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu +@@ -494,7 +510,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu // Unloads the model if needed. void BatchExecuteLoadedModelAndRunCallback( BatchExecutionCallback callback_on_complete, diff --git a/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc b/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc index 6887c6d2dae6..f77a06b15130 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/login_database.cc.orig 2023-09-29 10:14:06 UTC +--- components/password_manager/core/browser/login_database.cc.orig 2023-10-11 18:22:24 UTC +++ components/password_manager/core/browser/login_database.cc -@@ -1046,7 +1046,7 @@ std::string GeneratePlaceholders(size_t count) { +@@ -1050,7 +1050,7 @@ std::string GeneratePlaceholders(size_t count) { return result; } @@ -9,7 +9,7 @@ // Fills |form| with necessary data required to be removed from the database // and returns it. PasswordForm GetFormForRemoval(sql::Statement& statement) { -@@ -1063,7 +1063,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme +@@ -1067,7 +1067,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme // Whether we should try to return the decryptable passwords while the // encryption service fails for some passwords. bool ShouldReturnPartialPasswords() { @@ -18,7 +18,7 @@ return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords); #else return false; -@@ -1918,7 +1918,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { +@@ -1959,7 +1959,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { } DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() { diff --git a/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc b/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc index 3990d09af54e..c396e8c75cbb 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/login_database_unittest.cc.orig 2023-09-13 12:11:42 UTC +--- components/password_manager/core/browser/login_database_unittest.cc.orig 2023-10-11 18:22:24 UTC +++ components/password_manager/core/browser/login_database_unittest.cc -@@ -2159,7 +2159,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd +@@ -2222,7 +2222,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd base::HistogramTester histogram_tester; ASSERT_TRUE(db.Init()); @@ -9,7 +9,7 @@ // Make sure that we can't get any logins when database is corrupted. // Disabling the checks in chromecast because encryption is unavailable. std::vector<std::unique_ptr<PasswordForm>> result; -@@ -2186,7 +2186,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd +@@ -2249,7 +2249,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd #endif // Check histograms. @@ -18,7 +18,7 @@ histogram_tester.ExpectUniqueSample( "PasswordManager.DeleteUndecryptableLoginsReturnValue", metrics_util::DeleteCorruptedPasswordsResult::kSuccessPasswordsDeleted, -@@ -2229,7 +2229,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL +@@ -2292,7 +2292,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL } #endif // BUILDFLAG(IS_MAC) diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc index 998adceb41b6..e0d46304b6a6 100644 --- a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc +++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc @@ -1,4 +1,4 @@ ---- components/password_manager/core/common/password_manager_features.cc.orig 2023-09-13 12:11:42 UTC +--- components/password_manager/core/common/password_manager_features.cc.orig 2023-10-11 18:22:24 UTC +++ components/password_manager/core/common/password_manager_features.cc @@ -18,7 +18,7 @@ BASE_FEATURE(kEnableOverwritingPlaceholderUsernames, "EnableOverwritingPlaceholderUsernames", @@ -9,9 +9,9 @@ // When enabled, initial sync will be forced during startup if the password // store has encryption service failures. BASE_FEATURE(kForceInitialSyncWhenDecryptionFails, -@@ -101,7 +101,7 @@ BASE_FEATURE(kRevampedPasswordManagementBubble, +@@ -99,7 +99,7 @@ BASE_FEATURE(kRecoverFromNeverSaveAndroid, + "RecoverFromNeverSaveAndroid_LAUNCHED", base::FEATURE_ENABLED_BY_DEFAULT); - #endif -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h index 61aa70053284..f4a84d948fbe 100644 --- a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h +++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h @@ -1,4 +1,4 @@ ---- components/password_manager/core/common/password_manager_features.h.orig 2023-09-13 12:11:42 UTC +--- components/password_manager/core/common/password_manager_features.h.orig 2023-10-11 18:22:24 UTC +++ components/password_manager/core/common/password_manager_features.h @@ -24,7 +24,7 @@ namespace password_manager::features { // alongside the definition of their values in the .cc file. @@ -9,10 +9,10 @@ BASE_DECLARE_FEATURE(kForceInitialSyncWhenDecryptionFails); #endif BASE_DECLARE_FEATURE(kForgotPasswordFormSupport); -@@ -45,7 +45,7 @@ BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid); - #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) // Desktop - BASE_DECLARE_FEATURE(kRevampedPasswordManagementBubble); +@@ -43,7 +43,7 @@ BASE_DECLARE_FEATURE(kPasswordGenerationExperiment); #endif + BASE_DECLARE_FEATURE(kPasswordsImportM2); + BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kSkipUndecryptablePasswords); diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc index a9e895d61815..c68eb3b35e57 100644 --- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc +++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc @@ -1,4 +1,4 @@ ---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2023-07-16 15:47:57 UTC +--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2023-10-11 18:22:24 UTC +++ components/policy/core/common/cloud/cloud_policy_util.cc @@ -20,7 +20,7 @@ #endif @@ -26,7 +26,7 @@ #include <algorithm> #include <utility> -@@ -82,7 +87,7 @@ namespace em = enterprise_management; +@@ -86,7 +91,7 @@ namespace em = enterprise_management; std::string GetMachineName() { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ @@ -35,7 +35,7 @@ char hostname[HOST_NAME_MAX]; if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. return hostname; -@@ -140,7 +145,7 @@ std::string GetMachineName() { +@@ -144,7 +149,7 @@ std::string GetMachineName() { std::string GetOSVersion() { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ @@ -44,7 +44,7 @@ return base::SysInfo::OperatingSystemVersion(); #elif BUILDFLAG(IS_WIN) base::win::OSInfo::VersionNumber version_number = -@@ -163,7 +168,7 @@ std::string GetOSArchitecture() { +@@ -167,7 +172,7 @@ std::string GetOSArchitecture() { } std::string GetOSUsername() { diff --git a/www/chromium/files/patch-components_policy_core_common_policy__paths.cc b/www/chromium/files/patch-components_policy_core_common_policy__paths.cc new file mode 100644 index 000000000000..fbff03e33e2a --- /dev/null +++ b/www/chromium/files/patch-components_policy_core_common_policy__paths.cc @@ -0,0 +1,11 @@ +--- components/policy/core/common/policy_paths.cc.orig 2023-10-11 18:22:24 UTC ++++ components/policy/core/common/policy_paths.cc +@@ -16,6 +16,8 @@ namespace policy { + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) || \ + BUILDFLAG(GOOGLE_CHROME_FOR_TESTING_BRANDING) + const char kPolicyPath[] = "/etc/opt/chrome/policies"; ++#elif BUILDFLAG(IS_FREEBSD) ++const char kPolicyPath[] = "/usr/local/etc/chromium/policies"; + #else + const char kPolicyPath[] = "/etc/chromium/policies"; + #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) || \ 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 2586df13b800..0f3e8e39f215 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,11 +1,11 @@ ---- components/supervised_user/core/browser/supervised_user_service.cc.orig 2023-09-13 12:11:42 UTC +--- components/supervised_user/core/browser/supervised_user_service.cc.orig 2023-10-11 18:22:24 UTC +++ components/supervised_user/core/browser/supervised_user_service.cc -@@ -73,7 +73,7 @@ void SupervisedUserService::Init() { - static_cast<supervised_user::FirstTimeInterstitialBannerState>( - user_prefs_->GetInteger(prefs::kFirstTimeInterstitialBannerState)); +@@ -206,7 +206,7 @@ FirstTimeInterstitialBannerState SupervisedUserService + const FirstTimeInterstitialBannerState original_state) { + FirstTimeInterstitialBannerState target_state = original_state; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_IOS) + BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) if (supervised_user::CanDisplayFirstTimeInterstitialBanner()) { - if (banner_state == - supervised_user::FirstTimeInterstitialBannerState::kUnknown && + if (original_state != FirstTimeInterstitialBannerState::kSetupComplete && + can_show_first_time_interstitial_banner_) { 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 343d037955f6..bb5a1bda2872 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 2023-09-13 12:11:42 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2023-10-11 18:22:24 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1450,7 +1450,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1485,7 +1485,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetDeviceQueue() ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, ycbcr_info); @@ -8,4 +8,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Textures that were allocated _on linux_ with ycbcr info came from // VaapiVideoDecoder, which exports using DRM format modifiers. - return GrBackendFormat::MakeVk(gr_ycbcr_info, + return GrBackendFormats::MakeVk(gr_ycbcr_info, diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc index 404175296f8d..43d15c72dd87 100644 --- a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc +++ b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc.orig 2023-09-13 12:11:42 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc.orig 2023-10-11 18:22:24 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc -@@ -1508,7 +1508,12 @@ void SkiaOutputSurfaceImplOnGpu::CopyOutputNV12( +@@ -1521,7 +1521,12 @@ void SkiaOutputSurfaceImplOnGpu::CopyOutputNV12( // Issue readbacks from the surfaces: for (size_t i = 0; i < CopyOutputResult::kNV12MaxPlanes; ++i) { 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 4a4b25d75024..766070febd4e 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 2023-08-17 07:33:31 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2023-10-11 18:22:24 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1216,7 +1216,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1218,7 +1218,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 e34297a54a57..2da2dd5fd74d 100644 --- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2023-09-13 12:11:42 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2023-10-11 18:22:24 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -@@ -109,7 +109,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -110,7 +110,7 @@ RootCompositorFrameSinkImpl::Create( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -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); -@@ -644,7 +644,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -709,7 +709,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw display_client_->DidCompleteSwapWithSize(pixel_size); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h index 4799d67f6837..2ca9ccaf29d6 100644 --- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -1,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2023-09-13 12:11:42 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2023-10-11 18:22:24 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -205,7 +205,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl +@@ -211,7 +211,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc b/www/chromium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc index 241962bf0958..e59c6eb3db27 100644 --- a/www/chromium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc +++ b/www/chromium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc @@ -1,6 +1,6 @@ ---- components/webauthn/core/browser/passkey_sync_bridge.cc.orig 2023-09-13 12:11:42 UTC +--- components/webauthn/core/browser/passkey_sync_bridge.cc.orig 2023-10-11 18:22:24 UTC +++ components/webauthn/core/browser/passkey_sync_bridge.cc -@@ -257,7 +257,11 @@ PasskeySyncBridge::GetPasskeysForRelyingPartyId( +@@ -258,7 +258,11 @@ PasskeySyncBridge::GetPasskeysForRelyingPartyId( bool PasskeySyncBridge::DeletePasskey(const std::string& credential_id) { // Find the credential with the given |credential_id|. const auto passkey_it = @@ -12,7 +12,7 @@ return passkey.second.credential_id() == credential_id; }); if (passkey_it == data_.end()) { -@@ -308,7 +312,11 @@ bool PasskeySyncBridge::UpdatePasskey(const std::strin +@@ -309,7 +313,11 @@ bool PasskeySyncBridge::UpdatePasskey(const std::strin PasskeyChange change) { // Find the credential with the given |credential_id|. const auto passkey_it = 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 3f75a6a592a0..35876c2a27b4 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 2023-09-13 12:11:42 UTC +--- content/app/content_main_runner_impl.cc.orig 2023-10-11 18:22:24 UTC +++ content/app/content_main_runner_impl.cc @@ -142,13 +142,13 @@ #include "content/browser/posix_file_descriptor_info_impl.h" @@ -64,7 +64,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -808,11 +822,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -830,11 +844,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -78,7 +78,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1007,8 +1020,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1029,8 +1042,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } @@ -99,7 +99,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1076,7 +1101,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1098,7 +1123,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { ->ReconfigureAfterFeatureListInit(process_type); } @@ -108,7 +108,7 @@ // If dynamic Mojo Core is being used, ensure that it's loaded very early in // the child/zygote process, before any sandbox is initialized. The library // is not fully initialized with IPC support until a ChildProcess is later -@@ -1111,6 +1136,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1133,6 +1158,11 @@ int NO_STACK_PROTECTOR 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 e590236f324d..8af2f0fb03f1 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 2023-09-13 12:11:42 UTC +--- content/browser/BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ content/browser/BUILD.gn -@@ -2434,6 +2434,13 @@ source_set("browser") { +@@ -2461,6 +2461,13 @@ source_set("browser") { deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] } diff --git a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc index 1faefd32911b..12ad6b42f994 100644 --- a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc +++ b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc @@ -1,6 +1,6 @@ ---- content/browser/child_process_launcher_helper_linux.cc.orig 2023-09-13 12:11:42 UTC +--- content/browser/child_process_launcher_helper_linux.cc.orig 2023-10-11 18:22:24 UTC +++ content/browser/child_process_launcher_helper_linux.cc -@@ -20,7 +20,9 @@ +@@ -21,7 +21,9 @@ #include "content/public/common/result_codes.h" #include "content/public/common/sandboxed_process_launcher_delegate.h" #include "content/public/common/zygote/sandbox_support_linux.h" @@ -10,7 +10,7 @@ #include "sandbox/policy/linux/sandbox_linux.h" namespace content { -@@ -45,14 +47,20 @@ ChildProcessLauncherHelper::GetFilesToMap() { +@@ -46,14 +48,20 @@ ChildProcessLauncherHelper::GetFilesToMap() { } bool ChildProcessLauncherHelper::IsUsingLaunchOptions() { @@ -31,7 +31,7 @@ // Convert FD mapping to FileHandleMappingVector options->fds_to_remap = files_to_register.GetMappingWithIDAdjustment( base::GlobalDescriptors::kBaseDescriptor); -@@ -64,7 +72,9 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche +@@ -65,7 +73,9 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche options->environment = delegate_->GetEnvironment(); } else { @@ -41,7 +41,7 @@ // Environment variables could be supported in the future, but are not // currently supported when launching with the zygote. DCHECK(delegate_->GetEnvironment().empty()); -@@ -81,6 +91,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -82,6 +92,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr int* launch_result) { *is_synchronous_launch = true; Process process; @@ -49,7 +49,7 @@ ZygoteCommunication* zygote_handle = GetZygoteForLaunch(); if (zygote_handle) { // TODO(crbug.com/569191): If chrome supported multiple zygotes they could -@@ -91,7 +102,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -92,7 +103,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr GetProcessType()); *launch_result = LAUNCH_RESULT_SUCCESS; @@ -57,7 +57,7 @@ if (handle) { // It could be a renderer process or an utility process. int oom_score = content::kMiscOomScore; -@@ -100,15 +110,17 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -101,15 +111,17 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr oom_score = content::kLowestRendererOomScore; ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore(handle, oom_score); } @@ -76,7 +76,7 @@ #if BUILDFLAG(IS_CHROMEOS) if (GetProcessType() == switches::kRendererProcess) { -@@ -130,10 +142,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper +@@ -131,10 +143,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper const ChildProcessLauncherHelper::Process& process, bool known_dead) { ChildProcessTerminationInfo info; @@ -91,7 +91,7 @@ info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(), &info.exit_code); } else { -@@ -157,13 +173,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer +@@ -160,13 +176,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer DCHECK(CurrentlyOnProcessLauncherTaskRunner()); process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. @@ -109,7 +109,7 @@ } void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread( -@@ -175,11 +195,13 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnL +@@ -178,11 +198,13 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnL } } diff --git a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc index dd74604dd8af..837cd7799ffe 100644 --- a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc +++ b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc @@ -1,6 +1,6 @@ ---- content/browser/compositor/viz_process_transport_factory.cc.orig 2023-08-17 07:33:31 UTC +--- content/browser/compositor/viz_process_transport_factory.cc.orig 2023-10-11 18:22:24 UTC +++ content/browser/compositor/viz_process_transport_factory.cc -@@ -110,7 +110,7 @@ class HostDisplayClient : public viz::HostDisplayClien +@@ -108,7 +108,7 @@ class HostDisplayClient : public viz::HostDisplayClien // viz::HostDisplayClient: // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc b/www/chromium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc new file mode 100644 index 000000000000..8446cfa542e5 --- /dev/null +++ b/www/chromium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc @@ -0,0 +1,11 @@ +--- content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig 2023-10-11 18:22:24 UTC ++++ content/browser/file_system_access/file_system_access_local_path_watcher.cc +@@ -56,7 +56,7 @@ void FileSystemAccessLocalPathWatcher::Initialize( + base::FilePathWatcher::WatchOptions watch_options { + .type = scope().IsRecursive() ? base::FilePathWatcher::Type::kRecursive + : base::FilePathWatcher::Type::kNonRecursive, +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Note: `report_modified_path` is also present on Android + // and Fuchsia. Update this switch if support for watching + // the local file system is added on those platforms. 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 565b6bc20a14..d849b25f29ae 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 2023-09-13 12:11:42 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2023-10-11 18:22:24 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1753,7 +1753,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1780,7 +1780,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode); } diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.cc index e47c65d72195..cf1bbe726009 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_frame_host_impl.cc.orig 2023-09-13 12:11:42 UTC +--- content/browser/renderer_host/render_frame_host_impl.cc.orig 2023-10-11 18:22:24 UTC +++ content/browser/renderer_host/render_frame_host_impl.cc -@@ -8509,7 +8509,11 @@ void RenderFrameHostImpl::SendFencedFrameReportingBeac +@@ -8672,7 +8672,11 @@ void RenderFrameHostImpl::SendFencedFrameReportingBeac for (const blink::FencedFrame::ReportingDestination& destination : destinations) { SendFencedFrameReportingBeaconInternal( @@ -12,7 +12,7 @@ /*from_renderer=*/true, attribution_reporting_runtime_features, GetFrameTreeNodeId()); } -@@ -8545,7 +8549,11 @@ void RenderFrameHostImpl::SendFencedFrameReportingBeac +@@ -8708,7 +8712,11 @@ void RenderFrameHostImpl::SendFencedFrameReportingBeac } SendFencedFrameReportingBeaconInternal( @@ -24,7 +24,7 @@ blink::FencedFrame::ReportingDestination::kBuyer, /*from_renderer=*/true, attribution_reporting_runtime_features, GetFrameTreeNodeId()); -@@ -8617,8 +8625,13 @@ void RenderFrameHostImpl::MaybeSendFencedFrameReportin +@@ -8779,8 +8787,13 @@ void RenderFrameHostImpl::MaybeSendFencedFrameReportin for (blink::FencedFrame::ReportingDestination destination : info->destinations) { initiator_rfh->SendFencedFrameReportingBeaconInternal( 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 2c477546239a..ea70c6fc6f09 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,4 +1,4 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-09-13 12:11:42 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-10-11 18:22:24 UTC +++ content/browser/renderer_host/render_process_host_impl.cc @@ -220,7 +220,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" @@ -9,7 +9,7 @@ #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -1218,7 +1218,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -951,7 +951,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; -@@ -1361,7 +1361,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1094,7 +1094,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } @@ -27,7 +27,7 @@ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -1450,7 +1450,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1183,7 +1183,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public std::unique_ptr<service_manager::BinderRegistry> binders_; mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; @@ -36,7 +36,7 @@ mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory> video_encode_accelerator_factory_remote_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -3514,7 +3514,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( +@@ -3261,7 +3261,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( base::TimeTicks::UnixEpoch().since_origin().InMicroseconds())); } @@ -45,7 +45,7 @@ // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support // for NV12 GPU memory buffer. if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() && -@@ -3575,6 +3575,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3321,6 +3321,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, 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 f9c5bc60d8a5..e69614cb89fc 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,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2023-09-13 12:11:42 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2023-10-11 18:22:24 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -539,7 +539,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -540,7 +540,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); 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 7a8e0881d2aa..81f96fa3ab88 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,4 +1,4 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2023-07-16 15:47:57 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2023-10-11 18:22:24 UTC +++ content/browser/renderer_host/render_view_host_impl.cc @@ -273,7 +273,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); @@ -6,6 +6,6 @@ display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - prefs->system_font_family_name = gfx::Font().GetFontName(); - #elif BUILDFLAG(IS_FUCHSIA) - // Make Blink's "focus ring" invisible. The focus ring is a hairline border + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); + if (command_line->HasSwitch(switches::kSystemFontFamily)) { + prefs->system_font_family_name = 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 e31b2474b99a..6a7ff92a65ec 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,4 +1,4 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-09-13 12:11:42 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-10-11 18:22:24 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -121,7 +121,7 @@ #include "ui/gfx/gdi_util.h" @@ -9,7 +9,7 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/linux/linux_ui.h" -@@ -464,7 +464,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -461,7 +461,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); @@ -18,7 +18,7 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1692,7 +1692,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1720,7 +1720,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return GetTextInputManager() && GetTextInputManager()->should_do_learning(); } @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2537,7 +2537,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2565,7 +2565,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2713,7 +2713,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2748,7 +2748,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; @@ -44,4 +44,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; - if (!event.skip_in_browser && linux_ui && event.os_event && + if (!event.skip_if_unhandled && linux_ui && event.os_event && 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 bf9ebaaefa3c..a2dfa4800129 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 2023-09-13 12:11:42 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2023-10-11 18:22:24 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.h -@@ -256,7 +256,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -257,7 +257,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/chromium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc b/www/chromium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc index 77428c98bc2e..f4cf20ca7c92 100644 --- a/www/chromium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc +++ b/www/chromium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc @@ -1,6 +1,6 @@ ---- content/browser/service_worker/service_worker_context_wrapper.cc.orig 2023-09-13 12:11:42 UTC +--- content/browser/service_worker/service_worker_context_wrapper.cc.orig 2023-10-11 18:22:24 UTC +++ content/browser/service_worker/service_worker_context_wrapper.cc -@@ -1406,7 +1406,12 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingW +@@ -1409,7 +1409,12 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingW return; } 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 add81545ade9..a1710806939c 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 2023-09-13 12:11:42 UTC +--- content/browser/utility_process_host.cc.orig 2023-10-11 18:22:24 UTC +++ content/browser/utility_process_host.cc @@ -59,7 +59,7 @@ #include "content/browser/v8_snapshot_files.h" @@ -36,7 +36,7 @@ gpu_client_(nullptr, base::OnTaskRunnerDeleter(nullptr)), #endif client_(std::move(client)) { -@@ -420,7 +420,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -418,7 +418,7 @@ bool UtilityProcessHost::StartProcess() { file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload()); #endif // BUILDFLAG(IS_POSIX) @@ -45,7 +45,7 @@ // The network service should have access to the parent directories // necessary for its usage. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { -@@ -431,7 +431,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -429,7 +429,7 @@ bool UtilityProcessHost::StartProcess() { } #endif // BUILDFLAG(IS_LINUX) diff --git a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc index 4df446055430..412773cc9985 100644 --- a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc +++ b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc @@ -1,4 +1,4 @@ ---- content/browser/web_contents/web_contents_view_aura.cc.orig 2023-09-13 12:11:42 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2023-10-11 18:22:24 UTC +++ content/browser/web_contents/web_contents_view_aura.cc @@ -178,7 +178,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr<aura::Window> window_; @@ -18,7 +18,7 @@ // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over // a shortcut so we add it first. -@@ -1337,7 +1337,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1340,7 +1340,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* // Linux window managers like to handle raise-on-click themselves. If we // raise-on-click manually, this may override user settings that prevent // focus-stealing. diff --git a/www/chromium/files/patch-content_browser_webid_idp__network__request__manager.cc b/www/chromium/files/patch-content_browser_webid_idp__network__request__manager.cc new file mode 100644 index 000000000000..3689270c3b03 --- /dev/null +++ b/www/chromium/files/patch-content_browser_webid_idp__network__request__manager.cc @@ -0,0 +1,14 @@ +--- content/browser/webid/idp_network_request_manager.cc.orig 2023-10-11 18:22:24 UTC ++++ content/browser/webid/idp_network_request_manager.cc +@@ -604,7 +604,11 @@ void OnTokenRequestParsed( + if (response_error) { + int error_code = response_error->FindInt(kErrorCodeKey).value_or(0); + GURL error_url = ExtractUrl(*response_error, kErrorUrlKey); ++#if defined(__clang__) && (__clang_major__ >= 16) + token_result.error = TokenError(error_code, error_url); ++#else ++ token_result.error = TokenError(TokenError{error_code, error_url}); ++#endif + } + } + diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index b46e6a20d824..65f59d9ae84e 100644 --- a/www/chromium/files/patch-content_common_BUILD.gn +++ b/www/chromium/files/patch-content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/common/BUILD.gn.orig 2023-09-13 12:11:42 UTC +--- content/common/BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ content/common/BUILD.gn -@@ -433,6 +433,9 @@ if (is_linux || is_chromeos) { +@@ -435,6 +435,9 @@ if (is_linux || is_chromeos) { public = [ "set_process_title_linux.h" ] sources = [ "set_process_title_linux.cc" ] deps = [ "//base" ] @@ -10,7 +10,7 @@ } } -@@ -478,7 +481,7 @@ mojom("mojo_bindings") { +@@ -480,7 +483,7 @@ mojom("mojo_bindings") { if (enable_ipc_logging) { enabled_features += [ "ipc_logging" ] } diff --git a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h deleted file mode 100644 index ed9632502882..000000000000 --- a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h +++ /dev/null @@ -1,11 +0,0 @@ ---- content/public/common/common_param_traits_macros.h.orig 2023-02-08 09:03:45 UTC -+++ content/public/common/common_param_traits_macros.h -@@ -113,7 +113,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::RendererPreferences) - IPC_STRUCT_TRAITS_MEMBER(accept_languages) - IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed) - IPC_STRUCT_TRAITS_MEMBER(caret_browsing_enabled) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - IPC_STRUCT_TRAITS_MEMBER(system_font_family_name) - #endif - #if BUILDFLAG(IS_WIN) 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 03e9091b8632..0131b96eeff6 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_features.cc.orig 2023-09-13 12:11:42 UTC +--- content/public/common/content_features.cc.orig 2023-10-11 18:22:24 UTC +++ content/public/common/content_features.cc -@@ -52,7 +52,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, +@@ -53,7 +53,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, "AudioServiceOutOfProcess", // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -64,7 +64,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, +@@ -65,7 +65,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, // kAudioServiceOutOfProcess feature is enabled. BASE_FEATURE(kAudioServiceSandbox, "AudioServiceSandbox", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -507,7 +507,7 @@ BASE_FEATURE(kNetworkQualityEstimatorWebHoldback, +@@ -553,7 +553,7 @@ BASE_FEATURE(kNetworkQualityEstimatorWebHoldback, // (activated by kUserAgentClientHint) BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT); @@ -27,7 +27,7 @@ // Supports proxying thread type changes of renderer processes to browser // process and having browser process handle adjusting thread properties (nice // value, c-group, latency sensitivity...) for renderers which have sandbox -@@ -1408,7 +1408,7 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1463,7 +1463,7 @@ BASE_FEATURE(kWebAssemblyTiering, BASE_FEATURE(kWebAssemblyTrapHandler, "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -36,7 +36,7 @@ defined(ARCH_CPU_X86_64)) || \ (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -1466,7 +1466,11 @@ BASE_FEATURE(kWebUICodeCache, +@@ -1515,7 +1515,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__features.h b/www/chromium/files/patch-content_public_common_content__features.h index aeb1e51b8996..058369d29af5 100644 --- a/www/chromium/files/patch-content_public_common_content__features.h +++ b/www/chromium/files/patch-content_public_common_content__features.h @@ -1,6 +1,6 @@ ---- content/public/common/content_features.h.orig 2023-09-13 12:11:42 UTC +--- content/public/common/content_features.h.orig 2023-10-11 18:22:24 UTC +++ content/public/common/content_features.h -@@ -108,7 +108,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> +@@ -120,7 +120,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> kFledgeLimitNumAuctionsParam; CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollOffsets); CONTENT_EXPORT BASE_DECLARE_FEATURE(kGreaseUACH); 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 acc232b80ede..651c7bb4bd61 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 2023-09-13 12:11:42 UTC +--- content/public/common/content_switches.cc.orig 2023-10-11 18:22:24 UTC +++ content/public/common/content_switches.cc -@@ -372,6 +372,8 @@ const char kEnableIsolatedWebAppsInRenderer[] = +@@ -367,6 +367,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. -@@ -1005,7 +1007,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -992,7 +994,7 @@ const char kEnableAutomation[] = "enable-automation"; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h index febdc3266407..2ff103705810 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.h.orig 2023-08-17 07:33:31 UTC +--- content/public/common/content_switches.h.orig 2023-10-11 18:22:24 UTC +++ content/public/common/content_switches.h -@@ -118,6 +118,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe +@@ -116,6 +116,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[]; CONTENT_EXPORT extern const char kEnableLCDText[]; CONTENT_EXPORT extern const char kEnableLogging[]; @@ -8,7 +8,7 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -268,7 +269,7 @@ CONTENT_EXPORT extern const char kUserLevelMemoryPress +@@ -265,7 +266,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-content_renderer_BUILD.gn b/www/chromium/files/patch-content_renderer_BUILD.gn index 1c1671e61257..c022ff736f21 100644 --- a/www/chromium/files/patch-content_renderer_BUILD.gn +++ b/www/chromium/files/patch-content_renderer_BUILD.gn @@ -1,6 +1,6 @@ ---- content/renderer/BUILD.gn.orig 2023-09-13 12:11:42 UTC +--- content/renderer/BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ content/renderer/BUILD.gn -@@ -200,6 +200,13 @@ target(link_target_type, "renderer") { +@@ -201,6 +201,13 @@ target(link_target_type, "renderer") { ] } 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 c1c14accf074..b1cd36b26583 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 2023-09-13 12:11:42 UTC +--- content/renderer/render_thread_impl.cc.orig 2023-10-11 18:22:24 UTC +++ content/renderer/render_thread_impl.cc @@ -204,6 +204,8 @@ @@ -9,8 +9,8 @@ #else #include <malloc.h> #endif -@@ -1055,7 +1057,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: - kGpuStreamPriorityMedia); +@@ -1054,7 +1056,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: + kGpuStreamIdMedia, kGpuStreamPriorityMedia); const bool enable_video_decode_accelerator = -#if BUILDFLAG(IS_LINUX) @@ -18,7 +18,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && #endif // BUILDFLAG(IS_LINUX) !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1064,7 +1066,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1063,7 +1065,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: gpu::kGpuFeatureStatusEnabled); const bool enable_video_encode_accelerator = @@ -27,7 +27,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) && -@@ -1839,7 +1841,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create +@@ -1835,7 +1837,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 1b5acea86888..efac13c64b61 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 2023-09-13 12:11:42 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2023-10-11 18:22:24 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -113,7 +113,7 @@ +@@ -114,7 +114,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" #endif -@@ -181,13 +181,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -182,13 +182,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( sudden_termination_disables_(0), is_locked_to_site_(false), main_thread_scheduler_(main_thread_scheduler) { @@ -25,7 +25,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -196,7 +196,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -197,7 +197,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -34,7 +34,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -254,7 +254,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -255,7 +255,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl #endif blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index be484c595b80..fcf4e11838fe 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 2023-09-13 12:11:42 UTC +--- content/shell/BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ content/shell/BUILD.gn -@@ -1024,7 +1024,7 @@ group("content_shell_crash_test") { +@@ -1027,7 +1027,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc index 730ba794847d..09347fba6f2c 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2023-04-28 17:01:32 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2023-10-11 18:22:24 UTC +++ content/shell/browser/shell_browser_main_parts.cc -@@ -50,7 +50,7 @@ +@@ -51,7 +51,7 @@ #include "net/base/network_change_notifier.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif -@@ -67,7 +67,7 @@ +@@ -68,7 +68,7 @@ #include "chromeos/lacros/dbus/lacros_dbus_thread_manager.h" #endif @@ -18,7 +18,7 @@ #include "ui/linux/linux_ui.h" // nogncheck #include "ui/linux/linux_ui_factory.h" // nogncheck #endif -@@ -138,7 +138,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( +@@ -139,7 +139,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( } int ShellBrowserMainParts::PreEarlyInitialization() { @@ -27,7 +27,7 @@ ui::InitializeInputMethodForTesting(); #endif #if BUILDFLAG(IS_ANDROID) -@@ -167,7 +167,7 @@ void ShellBrowserMainParts::ToolkitInitialized() { +@@ -168,7 +168,7 @@ void ShellBrowserMainParts::ToolkitInitialized() { if (switches::IsRunWebTestsSwitchPresent()) return; @@ -36,7 +36,7 @@ ui::LinuxUi::SetInstance(ui::GetDefaultLinuxUi()); #endif } -@@ -214,7 +214,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() { +@@ -215,7 +215,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() { ShellDevToolsManagerDelegate::StopHttpHandler(); browser_context_.reset(); off_the_record_browser_context_.reset(); diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn index 3910d5185e7a..29be38c6c4d7 100644 --- a/www/chromium/files/patch-content_test_BUILD.gn +++ b/www/chromium/files/patch-content_test_BUILD.gn @@ -1,6 +1,6 @@ ---- content/test/BUILD.gn.orig 2023-09-13 12:11:42 UTC +--- content/test/BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ content/test/BUILD.gn -@@ -2217,7 +2217,7 @@ static_library("run_all_unittests") { +@@ -2226,7 +2226,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -9,7 +9,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -3288,7 +3288,7 @@ test("content_unittests") { +@@ -3302,7 +3302,7 @@ test("content_unittests") { deps += [ "//third_party/boringssl" ] } diff --git a/www/chromium/files/patch-content_utility_utility__main.cc b/www/chromium/files/patch-content_utility_utility__main.cc index f85fc41fef95..eb2db6eaeb82 100644 --- a/www/chromium/files/patch-content_utility_utility__main.cc +++ b/www/chromium/files/patch-content_utility_utility__main.cc @@ -1,6 +1,6 @@ ---- content/utility/utility_main.cc.orig 2023-08-17 07:33:31 UTC +--- content/utility/utility_main.cc.orig 2023-10-11 18:22:24 UTC +++ content/utility/utility_main.cc -@@ -31,7 +31,7 @@ +@@ -34,7 +34,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" #include "third_party/icu/source/i18n/unicode/timezone.h" @@ -9,7 +9,7 @@ #include "base/file_descriptor_store.h" #include "base/files/file_util.h" #include "base/pickle.h" -@@ -39,7 +39,9 @@ +@@ -42,7 +42,9 @@ #include "content/utility/speech/speech_recognition_sandbox_hook_linux.h" #include "gpu/config/gpu_info_collector.h" #include "media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h" @@ -19,7 +19,7 @@ #include "services/audio/audio_sandbox_hook_linux.h" #include "services/network/network_sandbox_hook_linux.h" // gn check is not smart enough to realize that this include only applies to -@@ -51,10 +53,14 @@ +@@ -54,10 +56,14 @@ #endif #endif @@ -35,7 +35,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) #include "chromeos/ash/components/assistant/buildflags.h" #include "chromeos/ash/services/ime/ime_sandbox_hook.h" -@@ -66,7 +72,7 @@ +@@ -69,7 +75,7 @@ #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if (BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \ @@ -44,7 +44,7 @@ #include "components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h" // nogncheck #endif -@@ -92,7 +98,7 @@ namespace content { +@@ -95,7 +101,7 @@ namespace content { namespace { @@ -53,7 +53,7 @@ std::vector<std::string> GetNetworkContextsParentDirectories() { base::MemoryMappedFile::Region region; base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD( -@@ -120,7 +126,7 @@ std::vector<std::string> GetNetworkContextsParentDirec +@@ -123,7 +129,7 @@ std::vector<std::string> GetNetworkContextsParentDirec bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox sandbox_type) { const bool obtain_gpu_info = @@ -62,7 +62,7 @@ sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding; -@@ -236,7 +242,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -239,7 +245,7 @@ int UtilityMain(MainFunctionParams parameters) { } } @@ -71,7 +71,7 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -265,7 +271,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -268,7 +274,7 @@ int UtilityMain(MainFunctionParams parameters) { pre_sandbox_hook = base::BindOnce(&screen_ai::ScreenAIPreSandboxHook); break; #endif @@ -80,7 +80,7 @@ case sandbox::mojom::Sandbox::kHardwareVideoDecoding: pre_sandbox_hook = base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); -@@ -292,6 +298,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -295,6 +301,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -88,7 +88,7 @@ if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { sandbox::policy::SandboxLinux::Options sandbox_options; -@@ -300,6 +307,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -303,6 +310,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } @@ -97,6 +97,6 @@ + sandbox_type, std::move(pre_sandbox_hook), + sandbox::policy::SandboxLinux::Options()); +#endif - #elif BUILDFLAG(IS_WIN) - g_utility_target_services = parameters.sandbox_info->target_services; + // Start the HangWatcher now that the sandbox is engaged, if it hasn't + // already been started. diff --git a/www/chromium/files/patch-device_fido_get__assertion__request__handler.cc b/www/chromium/files/patch-device_fido_get__assertion__request__handler.cc new file mode 100644 index 000000000000..a75ce8c7ce52 --- /dev/null +++ b/www/chromium/files/patch-device_fido_get__assertion__request__handler.cc @@ -0,0 +1,26 @@ +--- device/fido/get_assertion_request_handler.cc.orig 2023-10-11 18:22:24 UTC ++++ device/fido/get_assertion_request_handler.cc +@@ -370,7 +370,11 @@ bool AllowListOnlyHybridOrInternal(const CtapGetAssert + + bool AllowListIncludedTransport(const CtapGetAssertionRequest& request, + FidoTransportProtocol transport) { ++#if (_LIBCPP_VERSION >= 160000) + return std::ranges::any_of( ++#else ++ return base::ranges::any_of( ++#endif + request.allow_list, + [transport](const PublicKeyCredentialDescriptor& cred) { + return cred.transports.empty() || +@@ -441,7 +445,11 @@ void GetAssertionRequestHandler::PreselectAccount( + PublicKeyCredentialDescriptor credential) { + DCHECK(!preselected_credential_); + DCHECK(request_.allow_list.empty() || ++#if (_LIBCPP_VERSION >= 160000) + std::ranges::any_of( ++#else ++ base::ranges::any_of( ++#endif + request_.allow_list, + [&credential](const PublicKeyCredentialDescriptor& desc) { + return desc.id == credential.id; diff --git a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc index 89f2deb108a4..f8459b174feb 100644 --- a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc +++ b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc @@ -1,4 +1,4 @@ ---- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2023-05-31 08:12:17 UTC +--- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2023-10-11 18:22:24 UTC +++ extensions/browser/api/networking_private/networking_private_delegate_factory.cc @@ -14,7 +14,7 @@ #include "extensions/browser/api/networking_private/networking_private_chromeos.h" @@ -9,12 +9,12 @@ #include "extensions/browser/api/networking_private/networking_private_linux.h" #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) #include "components/wifi/wifi_service.h" -@@ -66,7 +66,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS - delegate = new NetworkingPrivateChromeOS(browser_context); +@@ -67,7 +67,7 @@ NetworkingPrivateDelegateFactory::BuildServiceInstance + delegate = std::make_unique<NetworkingPrivateChromeOS>(browser_context); #elif BUILDFLAG(IS_CHROMEOS_LACROS) - delegate = new NetworkingPrivateLacros(browser_context); + delegate = std::make_unique<NetworkingPrivateLacros>(browser_context); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - delegate = new NetworkingPrivateLinux(); + delegate = std::make_unique<NetworkingPrivateLinux>(); #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) std::unique_ptr<wifi::WiFiService> wifi_service(wifi::WiFiService::Create()); diff --git a/www/chromium/files/patch-extensions_common_command.cc b/www/chromium/files/patch-extensions_common_command.cc index 5ca0a50f9144..c19d238128d3 100644 --- a/www/chromium/files/patch-extensions_common_command.cc +++ b/www/chromium/files/patch-extensions_common_command.cc @@ -1,6 +1,6 @@ ---- extensions/common/command.cc.orig 2022-11-30 08:12:58 UTC +--- extensions/common/command.cc.orig 2023-10-11 18:22:24 UTC +++ extensions/common/command.cc -@@ -280,7 +280,7 @@ std::string Command::CommandPlatform() { +@@ -282,7 +282,7 @@ std::string Command::CommandPlatform() { return values::kKeybindingPlatformMac; #elif BUILDFLAG(IS_CHROMEOS) return values::kKeybindingPlatformChromeOs; 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 8270ec0c4ec7..ce621f8a8f70 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 2023-09-13 12:11:42 UTC +--- gpu/command_buffer/service/dawn_context_provider.cc.orig 2023-10-11 18:22:24 UTC +++ gpu/command_buffer/service/dawn_context_provider.cc -@@ -53,7 +53,7 @@ wgpu::BackendType GetDefaultBackendType() { +@@ -145,7 +145,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__image_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc index 7baa896cd256..1bbb59571f72 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,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-09-13 12:11:42 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-10-11 18:22:24 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc -@@ -46,7 +46,7 @@ +@@ -47,7 +47,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/scoped_binders.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" #endif -@@ -656,7 +656,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma +@@ -673,7 +673,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma const wgpu::Device& wgpuDevice, wgpu::BackendType backend_type, std::vector<wgpu::TextureFormat> view_formats) { 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 index 7f6022c0f7af..285353b262cd 100644 --- 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 @@ -1,4 +1,4 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-09-13 12:11:42 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-10-11 18:22:24 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc @@ -89,7 +89,7 @@ base::flat_map<VkFormat, VkImageUsageFlags> CreateImag } // namespace @@ -9,7 +9,7 @@ SHARED_IMAGE_USAGE_WEBGPU | SHARED_IMAGE_USAGE_WEBGPU_SWAP_CHAIN_TEXTURE | SHARED_IMAGE_USAGE_WEBGPU_STORAGE_TEXTURE | #endif -@@ -257,7 +257,7 @@ bool ExternalVkImageBackingFactory::IsSupported( +@@ -258,7 +258,7 @@ bool ExternalVkImageBackingFactory::IsSupported( return false; } 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 49e894f2390c..b712f9b9b662 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,11 +1,20 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-09-13 12:11:42 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-10-11 18:22:24 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1193,7 +1193,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1194,7 +1194,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( + force_fallback_adapter = true; + } - if (gr_context_type_ != GrContextType::kVulkan && - use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - callback(WGPURequestAdapterStatus_Unavailable, nullptr, - "WebGPU on Linux requires command-line flag " - "--enable-features=Vulkan", + if (!shared_context_state_->GrContextIsVulkan() && + !shared_context_state_->IsGraphiteDawnVulkan() && + use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) { +@@ -1849,7 +1849,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( + } + + #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \ +- !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_LINUX) ++ !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + if (usage & wgpu::TextureUsage::StorageBinding) { + LOG(ERROR) << "AssociateMailbox: wgpu::TextureUsage::StorageBinding is NOT " + "supported yet on this platform."; diff --git a/www/chromium/files/patch-gpu_vulkan_semaphore__handle.cc b/www/chromium/files/patch-gpu_vulkan_semaphore__handle.cc new file mode 100644 index 000000000000..1d04f34d1f70 --- /dev/null +++ b/www/chromium/files/patch-gpu_vulkan_semaphore__handle.cc @@ -0,0 +1,20 @@ +--- gpu/vulkan/semaphore_handle.cc.orig 2023-10-11 18:22:24 UTC ++++ gpu/vulkan/semaphore_handle.cc +@@ -39,7 +39,7 @@ SemaphoreHandle::SemaphoreHandle(gfx::GpuFenceHandle f + // https://fuchsia.dev/reference/fidl/fuchsia.ui.scenic. + Init(VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_ZIRCON_EVENT_BIT_FUCHSIA, + std::move(fence_handle.owned_event)); +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + Init(VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR, + std::move(fence_handle.owned_fd)); + #elif BUILDFLAG(IS_POSIX) +@@ -64,7 +64,7 @@ gfx::GpuFenceHandle SemaphoreHandle::ToGpuFenceHandle( + // VkSemaphore, which can then be used to submit present work, see + // https://fuchsia.dev/reference/fidl/fuchsia.ui.scenic. + fence_handle.owned_event = TakeHandle(); +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + if (type_ == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR) { + fence_handle.owned_fd = TakeHandle(); + } else { diff --git a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc index 375a1cb7d97c..5ebbe7026f8c 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_browser_main_parts_posix.cc.orig 2023-04-28 17:01:32 UTC +--- headless/lib/browser/headless_browser_main_parts_posix.cc.orig 2023-10-11 18:22:24 UTC +++ headless/lib/browser/headless_browser_main_parts_posix.cc -@@ -19,13 +19,13 @@ +@@ -21,13 +21,13 @@ #include "content/public/browser/browser_thread.h" #include "headless/lib/browser/headless_browser_impl.h" @@ -16,7 +16,7 @@ #include "device/bluetooth/dbus/bluez_dbus_manager.h" #endif -@@ -123,7 +123,7 @@ class BrowserShutdownHandler { +@@ -161,7 +161,7 @@ class BrowserShutdownHandler { } // namespace @@ -25,7 +25,7 @@ constexpr char kProductName[] = "HeadlessChrome"; #endif -@@ -131,9 +131,9 @@ void HeadlessBrowserMainParts::PostCreateMainMessageLo +@@ -169,9 +169,9 @@ void HeadlessBrowserMainParts::PostCreateMainMessageLo BrowserShutdownHandler::Install(base::BindOnce( &HeadlessBrowserImpl::ShutdownWithExitCode, browser_->GetWeakPtr())); diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc index c3b7872dfe3d..d8bd755c6609 100644 --- a/www/chromium/files/patch-media_base_media__switches.cc +++ b/www/chromium/files/patch-media_base_media__switches.cc @@ -1,15 +1,15 @@ ---- media/base/media_switches.cc.orig 2023-09-13 12:11:42 UTC +--- media/base/media_switches.cc.orig 2023-10-11 18:22:24 UTC +++ media/base/media_switches.cc -@@ -15,7 +15,7 @@ - #include "gpu/config/gpu_finch_features.h" - #include "media/media_buildflags.h" +@@ -17,7 +17,7 @@ + #include "ui/gl/gl_features.h" + #include "ui/gl/gl_utils.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "base/cpu.h" #endif -@@ -652,7 +652,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, +@@ -673,7 +673,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -675,7 +675,7 @@ BASE_FEATURE(kGlobalMediaControlsCrOSUpdatedUI, +@@ -696,7 +696,7 @@ BASE_FEATURE(kGlobalMediaControlsCrOSUpdatedUI, // If enabled, users can request Media Remoting without fullscreen-in-tab. BASE_FEATURE(kMediaRemotingWithoutFullscreen, "MediaRemotingWithoutFullscreen", @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -687,7 +687,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, +@@ -708,7 +708,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -731,7 +731,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -752,7 +752,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -45,7 +45,7 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. BASE_FEATURE(kVaapiVideoDecodeLinux, -@@ -811,7 +811,7 @@ BASE_FEATURE(kVaapiVp9kSVCHWEncoding, +@@ -832,7 +832,7 @@ BASE_FEATURE(kVaapiVp9kSVCHWEncoding, "VaapiVp9kSVCHWEncoding", base::FEATURE_ENABLED_BY_DEFAULT); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) @@ -54,7 +54,7 @@ // Enables the new V4L2StatefulVideoDecoder instead of V4L2VideoDecoder. BASE_FEATURE(kV4L2FlatStatelessVideoDecoder, "V4L2FlatStatelessVideoDecoder", -@@ -1317,7 +1317,7 @@ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideo +@@ -1348,7 +1348,7 @@ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideo }; #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) diff --git a/www/chromium/files/patch-media_base_media__switches.h b/www/chromium/files/patch-media_base_media__switches.h index a76e126ee1ce..a2755ec64f9e 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 2023-09-13 12:11:42 UTC +--- media/base/media_switches.h.orig 2023-10-11 18:22:24 UTC +++ media/base/media_switches.h -@@ -301,7 +301,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor +@@ -305,7 +305,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseElementInsteadOf MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseMediaHistoryStore); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseR16Texture); @@ -9,7 +9,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux); -@@ -319,7 +319,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa +@@ -323,7 +323,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9kSVCHWEncoding); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) @@ -18,7 +18,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatelessVideoDecoder); MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatefulVideoDecoder); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -439,7 +439,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV +@@ -443,7 +443,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding); #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 59d40647238a..de770388a6b5 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 2023-09-13 12:11:42 UTC +--- media/base/video_frame.cc.orig 2023-10-11 18:22:24 UTC +++ media/base/video_frame.cc @@ -80,7 +80,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; @@ -45,7 +45,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -901,7 +901,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -902,7 +902,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( } } @@ -54,7 +54,7 @@ DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1309,7 +1309,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( +@@ -1310,7 +1310,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( : mailbox_holders_[texture_index]; } @@ -63,7 +63,7 @@ const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1422,7 +1422,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1423,7 +1423,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, storage_type_(storage_type), visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), natural_size_(natural_size), diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index 9bbb86ad2f31..8cf14a246255 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,7 +1,7 @@ ---- media/base/video_frame.h.orig 2023-09-13 12:11:42 UTC +--- media/base/video_frame.h.orig 2023-10-11 18:22:24 UTC +++ media/base/video_frame.h @@ -44,7 +44,7 @@ - #include "base/mac/scoped_cftyperef.h" + #include "base/apple/scoped_cftyperef.h" #endif // BUILDFLAG(IS_APPLE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) 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 fbe5e9d9b1ee..363f47e2ee9c 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 2023-09-13 12:11:42 UTC +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2023-10-11 18:22:24 UTC +++ media/capture/video/linux/v4l2_capture_delegate.cc @@ -4,8 +4,10 @@ @@ -32,7 +32,22 @@ // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the // format is introduced to kernel. -@@ -260,7 +264,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control +@@ -46,6 +50,14 @@ using media::mojom::MeteringMode; + #define V4L2_PIX_FMT_INVZ v4l2_fourcc('I', 'N', 'V', 'Z') + #endif + ++#ifndef V4L2_COLORSPACE_OPRGB ++#define V4L2_COLORSPACE_OPRGB V4L2_COLORSPACE_ADOBERGB ++#endif ++ ++#ifndef V4L2_XFER_FUNC_OPRGB ++#define V4L2_XFER_FUNC_OPRGB V4L2_XFER_FUNC_ADOBERGB ++#endif ++ + namespace media { + + namespace { +@@ -260,7 +272,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control // static bool V4L2CaptureDelegate::IsControllableControl( int control_id, @@ -41,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 -@@ -316,7 +320,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate( +@@ -316,7 +328,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate( is_capturing_(false), timeout_count_(0), rotation_(rotation) { @@ -50,7 +65,7 @@ use_gpu_buffer_ = switches::IsVideoCaptureUseGpuMemoryBufferEnabled(); #endif // BUILDFLAG(IS_LINUX) } -@@ -443,7 +447,7 @@ void V4L2CaptureDelegate::AllocateAndStart( +@@ -443,7 +455,7 @@ void V4L2CaptureDelegate::AllocateAndStart( client_->OnStarted(); @@ -59,7 +74,7 @@ if (use_gpu_buffer_) { v4l2_gpu_helper_ = std::make_unique<V4L2CaptureDelegateGpuHelper>( std::move(gmb_support_test_)); -@@ -793,7 +797,7 @@ void V4L2CaptureDelegate::SetGPUEnvironmentForTesting( +@@ -793,7 +805,7 @@ void V4L2CaptureDelegate::SetGPUEnvironmentForTesting( V4L2CaptureDelegate::~V4L2CaptureDelegate() = default; @@ -68,7 +83,7 @@ int num_retries = 0; for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries; ++num_retries) { -@@ -803,7 +807,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* +@@ -803,7 +815,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* return num_retries != kMaxIOCtrlRetries; } @@ -77,7 +92,7 @@ return HANDLE_EINTR(v4l2_->ioctl(device_fd_.get(), request, argp)); } -@@ -814,6 +818,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co +@@ -814,6 +826,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co } void V4L2CaptureDelegate::ReplaceControlEventSubscriptions() { @@ -85,7 +100,7 @@ constexpr uint32_t kControlIds[] = {V4L2_CID_AUTO_EXPOSURE_BIAS, V4L2_CID_AUTO_WHITE_BALANCE, V4L2_CID_BRIGHTNESS, -@@ -841,6 +846,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript +@@ -841,6 +854,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript << ", {type = V4L2_EVENT_CTRL, id = " << control_id << "}"; } } @@ -93,7 +108,7 @@ } mojom::RangePtr V4L2CaptureDelegate::RetrieveUserControlRange(int control_id) { -@@ -1021,7 +1027,11 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1021,7 +1035,11 @@ void V4L2CaptureDelegate::DoCapture() { pollfd device_pfd = {}; device_pfd.fd = device_fd_.get(); @@ -105,7 +120,7 @@ const int result = HANDLE_EINTR(v4l2_->poll(&device_pfd, 1, kCaptureTimeoutMs)); -@@ -1059,6 +1069,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1059,6 +1077,7 @@ void V4L2CaptureDelegate::DoCapture() { timeout_count_ = 0; } @@ -113,7 +128,7 @@ // Dequeue events if the driver has filled in some. if (device_pfd.revents & POLLPRI) { bool controls_changed = false; -@@ -1093,6 +1104,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1093,6 +1112,7 @@ void V4L2CaptureDelegate::DoCapture() { client_->OnCaptureConfigurationChanged(); } } @@ -121,12 +136,21 @@ // Deenqueue, send and reenqueue a buffer if the driver has filled one in. if (device_pfd.revents & POLLIN) { -@@ -1147,7 +1159,7 @@ void V4L2CaptureDelegate::DoCapture() { - // matrix = v4l2_format->fmt.pix.ycbcr_enc; - // transfer = v4l2_format->fmt.pix.xfer_func; +@@ -1146,7 +1166,7 @@ void V4L2CaptureDelegate::DoCapture() { + // workable on Linux. + // See http://crbug.com/959919. -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (use_gpu_buffer_) { v4l2_gpu_helper_->OnIncomingCapturedData( client_.get(), buffer_tracker->start(), +@@ -1219,7 +1239,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureEr + client_->OnError(error, from_here, reason); + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + gfx::ColorSpace V4L2CaptureDelegate::BuildColorSpaceFromv4l2() { + v4l2_colorspace v4l2_primary = (v4l2_colorspace)video_fmt_.fmt.pix.colorspace; + v4l2_quantization v4l2_range = diff --git a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h index 89f9b66b3007..180ba5ba6418 100644 --- a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h +++ b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h @@ -1,4 +1,4 @@ ---- media/capture/video/linux/v4l2_capture_delegate.h.orig 2023-09-13 12:11:42 UTC +--- media/capture/video/linux/v4l2_capture_delegate.h.orig 2023-10-11 18:22:24 UTC +++ media/capture/video/linux/v4l2_capture_delegate.h @@ -35,7 +35,7 @@ class Location; @@ -31,7 +31,16 @@ // Check whether the control is controllable (and not changed automatically). bool IsControllableControl(int control_id); -@@ -157,7 +157,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { +@@ -133,7 +133,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { + const base::Location& from_here, + const std::string& reason); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Systems which describe a "color space" usually map that to one or more of + // {primary, matrix, transfer, range}. BuildColorSpaceFromv4l2() will use the + // matched value as first priority. Otherwise, if there is no best matching +@@ -167,7 +167,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { // Clockwise rotation in degrees. This value should be 0, 90, 180, or 270. int rotation_; diff --git a/www/chromium/files/patch-media_cdm_library__cdm_cdm__paths.gni b/www/chromium/files/patch-media_cdm_library__cdm_cdm__paths.gni index 751a1249d677..320326272b15 100644 --- a/www/chromium/files/patch-media_cdm_library__cdm_cdm__paths.gni +++ b/www/chromium/files/patch-media_cdm_library__cdm_cdm__paths.gni @@ -1,11 +1,11 @@ ---- media/cdm/library_cdm/cdm_paths.gni.orig 2023-09-04 16:51:48 UTC +--- media/cdm/library_cdm/cdm_paths.gni.orig 2023-10-11 18:22:24 UTC +++ media/cdm/library_cdm/cdm_paths.gni -@@ -23,6 +23,8 @@ if (is_chromeos) { - component_os = "mac" - } else if (is_fuchsia) { - component_os = "fuchsia" -+} else if (is_freebsd) { -+ component_os = "linux" - } else { - assert(false, "unsupported_platform") - } +@@ -15,7 +15,7 @@ assert(enable_library_cdms) + # Explicitly define what we use to avoid confusion. + if (is_chromeos) { + component_os = "cros" +-} else if (is_linux) { ++} else if (is_linux || is_bsd) { + component_os = "linux" + } else if (is_win) { + component_os = "win" diff --git a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc index 18d0984101a9..c9c52c1d568c 100644 --- a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc +++ b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-09-13 12:11:42 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-10-11 18:22:24 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -1002,14 +1002,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1026,14 +1026,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } } @@ -17,7 +17,7 @@ // Linux w/ V4L2 should not use a custom allocator // Only tested with video_decode_accelerator_tests // TODO(wenst@) Test with full Chromium Browser -@@ -1140,7 +1140,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1170,7 +1170,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( << " VideoFrames"; auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_); diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc index 42e5c0b9c504..07ba49caf7ef 100644 --- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc +++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc @@ -1,6 +1,42 @@ ---- media/gpu/vaapi/vaapi_wrapper.cc.orig 2023-09-13 12:11:42 UTC +--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2023-10-11 18:22:24 UTC +++ media/gpu/vaapi/vaapi_wrapper.cc -@@ -1610,7 +1610,7 @@ VADisplayStateHandle VADisplayStateSingleton::GetHandl +@@ -70,7 +70,7 @@ + using media_gpu_vaapi::kModuleVa_prot; + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/files/file_util.h" + #include "base/strings/string_split.h" + #endif +@@ -1441,7 +1441,7 @@ bool IsVBREncodingSupported(VAProfile va_profile) { + return VASupportedProfiles::Get().IsProfileSupported(mode, va_profile); + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Some VA-API drivers (vdpau-va-driver) will crash if used with VA/DRM on + // NVIDIA GPUs. This function checks if such drivers are present. + bool IsBrokenNvidiaVaapiDriverPresent() { +@@ -1502,7 +1502,7 @@ void VADisplayStateSingleton::PreSandboxInitialization + VADisplayStateSingleton& va_display_state = GetInstance(); + base::AutoLock lock(va_display_state.lock_); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::string va_driver_name; + auto env = base::Environment::Create(); + if (env->GetVar("LIBVA_DRIVER_NAME", &va_driver_name) && +@@ -1539,7 +1539,7 @@ void VADisplayStateSingleton::PreSandboxInitialization + if (base::EqualsCaseInsensitiveASCII(version_name, "vgem")) { + continue; + } +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Skip NVIDIA GPUs if the VA-API driver used for them is known for crashing + // with VA/DRM. + if (is_nvidia_va_drm_broken && +@@ -1572,7 +1572,7 @@ VADisplayStateHandle VADisplayStateSingleton::GetHandl return {}; } @@ -9,7 +45,7 @@ // TODO(crbug.com/1116701): add vaapi support for other Ozone platforms on // Linux. See comment in OzonePlatform::PlatformProperties::supports_vaapi // for more details. This will also require revisiting everything that's -@@ -2454,7 +2454,7 @@ scoped_refptr<VASurface> VaapiWrapper::CreateVASurface +@@ -2403,7 +2403,7 @@ scoped_refptr<VASurface> VaapiWrapper::CreateVASurface return nullptr; } diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni index 5bc17788ac8f..d879f03dd5be 100644 --- a/www/chromium/files/patch-media_media__options.gni +++ b/www/chromium/files/patch-media_media__options.gni @@ -1,6 +1,6 @@ ---- media/media_options.gni.orig 2023-07-16 15:47:57 UTC +--- media/media_options.gni.orig 2023-10-11 18:22:24 UTC +++ media/media_options.gni -@@ -177,12 +177,15 @@ declare_args() { +@@ -181,12 +181,15 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false @@ -17,7 +17,7 @@ (!is_castos || (target_cpu == "x86" || target_cpu == "x64") || is_cast_audio_only)) { use_alsa = true -@@ -198,6 +201,10 @@ declare_args() { +@@ -202,6 +205,10 @@ declare_args() { if (!use_cras && !is_castos && !is_asan && !is_tsan) { use_pulseaudio = true } 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 213d9304cd06..fac46f5a5393 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-09-13 12:11:42 UTC +--- 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 -@@ -746,7 +746,7 @@ const gfx::GpuMemoryBufferId& StructTraits< +@@ -837,7 +837,7 @@ const gfx::GpuMemoryBufferId& StructTraits< return input.id; } @@ -9,7 +9,7 @@ // static gfx::NativePixmapHandle StructTraits< media::stable::mojom::NativeGpuMemoryBufferHandleDataView, -@@ -767,7 +767,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor +@@ -858,7 +858,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor output->type = gfx::NATIVE_PIXMAP; diff --git a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h index dfabedd0fa11..d38bcbe04b9b 100644 --- a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h +++ b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h @@ -1,6 +1,6 @@ ---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2023-07-16 15:47:57 UTC +--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2023-10-11 18:22:24 UTC +++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h -@@ -678,7 +678,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem +@@ -693,7 +693,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem static const gfx::GpuMemoryBufferId& id( const gfx::GpuMemoryBufferHandle& input); 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 2f832d600603..12cf9d7955a7 100644 --- a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,4 +1,4 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2023-09-13 12:11:42 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2023-10-11 18:22:24 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc @@ -727,7 +727,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } @@ -9,8 +9,8 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1195,7 +1195,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo - is_webgpu_compatible = (gpu_memory_buffer != nullptr); +@@ -1199,7 +1199,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo + } #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -18,7 +18,7 @@ is_webgpu_compatible = (gpu_memory_buffer != nullptr); if (is_webgpu_compatible) { is_webgpu_compatible &= -@@ -1214,7 +1214,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1218,7 +1218,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | gpu::SHARED_IMAGE_USAGE_SCANOUT; diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index 1ddc128c0286..3941c268ff33 100644 --- a/www/chromium/files/patch-net_BUILD.gn +++ b/www/chromium/files/patch-net_BUILD.gn @@ -1,4 +1,4 @@ ---- net/BUILD.gn.orig 2023-09-13 12:11:42 UTC +--- net/BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ net/BUILD.gn @@ -122,7 +122,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1242,6 +1242,19 @@ component("net") { +@@ -1244,6 +1244,19 @@ component("net") { deps += [ "//third_party/xdg_shared_mime_info" ] } @@ -29,7 +29,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1397,7 +1410,7 @@ component("net") { +@@ -1399,7 +1412,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", -@@ -2891,7 +2904,7 @@ test("net_unittests") { +@@ -2894,7 +2907,7 @@ test("net_unittests") { ] } @@ -47,7 +47,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -2959,6 +2972,10 @@ test("net_unittests") { +@@ -2962,6 +2975,10 @@ test("net_unittests") { "//url:buildflags", ] @@ -58,7 +58,7 @@ if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -3041,7 +3058,7 @@ test("net_unittests") { +@@ -3044,7 +3061,7 @@ test("net_unittests") { ] } @@ -67,7 +67,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3176,7 +3193,7 @@ test("net_unittests") { +@@ -3179,7 +3196,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/chromium/files/patch-net_cert_pki_general__names.h b/www/chromium/files/patch-net_cert_pki_general__names.h new file mode 100644 index 000000000000..9308c6c0b2b4 --- /dev/null +++ b/www/chromium/files/patch-net_cert_pki_general__names.h @@ -0,0 +1,10 @@ +--- net/cert/pki/general_names.h.orig 2023-10-11 18:22:24 UTC ++++ net/cert/pki/general_names.h +@@ -7,6 +7,7 @@ + + #include <memory> + #include <vector> ++#include <string> + + #include "net/base/net_export.h" + #include "net/cert/pki/cert_error_id.h" diff --git a/www/chromium/files/patch-net_filter_zstd__source__stream.cc b/www/chromium/files/patch-net_filter_zstd__source__stream.cc new file mode 100644 index 000000000000..b90a6c388b7d --- /dev/null +++ b/www/chromium/files/patch-net_filter_zstd__source__stream.cc @@ -0,0 +1,10 @@ +--- net/filter/zstd_source_stream.cc.orig 2023-10-11 18:22:24 UTC ++++ net/filter/zstd_source_stream.cc +@@ -6,6 +6,7 @@ + + #include <algorithm> + #include <utility> ++#include <unordered_map> + + #define ZSTD_STATIC_LINKING_ONLY + diff --git a/www/chromium/files/patch-net_http_http__auth__handler__negotiate.cc b/www/chromium/files/patch-net_http_http__auth__handler__negotiate.cc new file mode 100644 index 000000000000..9b3ecc491ead --- /dev/null +++ b/www/chromium/files/patch-net_http_http__auth__handler__negotiate.cc @@ -0,0 +1,11 @@ +--- net/http/http_auth_handler_negotiate.cc.orig 2023-10-11 18:22:24 UTC ++++ net/http/http_auth_handler_negotiate.cc +@@ -121,7 +121,7 @@ int HttpAuthHandlerNegotiate::Factory::CreateAuthHandl + #elif BUILDFLAG(IS_POSIX) + if (is_unsupported_) + return ERR_UNSUPPORTED_AUTH_SCHEME; +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Note: Don't set is_unsupported_ = true here. AllowGssapiLibraryLoad() + // might change to true during a session. + if (!http_auth_preferences() || diff --git a/www/chromium/files/patch-net_http_http__auth__preferences.cc b/www/chromium/files/patch-net_http_http__auth__preferences.cc new file mode 100644 index 000000000000..8a288a931897 --- /dev/null +++ b/www/chromium/files/patch-net_http_http__auth__preferences.cc @@ -0,0 +1,11 @@ +--- net/http/http_auth_preferences.cc.orig 2023-10-11 18:22:24 UTC ++++ net/http/http_auth_preferences.cc +@@ -39,7 +39,7 @@ std::string HttpAuthPreferences::AuthAndroidNegotiateA + } + #endif // BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool HttpAuthPreferences::AllowGssapiLibraryLoad() const { + return allow_gssapi_library_load_; + } diff --git a/www/chromium/files/patch-net_http_http__auth__preferences.h b/www/chromium/files/patch-net_http_http__auth__preferences.h new file mode 100644 index 000000000000..41432aecd8fd --- /dev/null +++ b/www/chromium/files/patch-net_http_http__auth__preferences.h @@ -0,0 +1,29 @@ +--- net/http/http_auth_preferences.h.orig 2023-10-11 18:22:24 UTC ++++ net/http/http_auth_preferences.h +@@ -50,7 +50,7 @@ class NET_EXPORT HttpAuthPreferences { + #if BUILDFLAG(IS_ANDROID) + virtual std::string AuthAndroidNegotiateAccountType() const; + #endif +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + virtual bool AllowGssapiLibraryLoad() const; + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) + virtual bool CanUseDefaultCredentials( +@@ -86,7 +86,7 @@ class NET_EXPORT HttpAuthPreferences { + } + #endif // BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void set_allow_gssapi_library_load(bool allow_gssapi_library_load) { + allow_gssapi_library_load_ = allow_gssapi_library_load; + } +@@ -137,7 +137,7 @@ class NET_EXPORT HttpAuthPreferences { + std::string auth_android_negotiate_account_type_; + #endif // BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool allow_gssapi_library_load_ = true; + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) + diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc index e5d51d9313de..7786b8c01664 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context_builder.cc.orig 2023-09-13 12:11:42 UTC +--- net/url_request/url_request_context_builder.cc.orig 2023-10-11 18:22:24 UTC +++ net/url_request/url_request_context_builder.cc -@@ -445,7 +445,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -446,7 +446,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { diff --git a/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc b/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc index 086e8ee4f248..729b4b24d976 100644 --- a/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc +++ b/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc @@ -1,15 +1,15 @@ ---- printing/mojom/printing_context_mojom_traits.cc.orig 2023-04-05 11:05:06 UTC +--- printing/mojom/printing_context_mojom_traits.cc.orig 2023-10-11 18:22:24 UTC +++ printing/mojom/printing_context_mojom_traits.cc -@@ -15,7 +15,7 @@ - #include "ui/gfx/geometry/mojom/geometry_mojom_traits.h" - #include "ui/gfx/geometry/size.h" +@@ -19,7 +19,7 @@ + #include "base/numerics/safe_conversions.h" + #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "mojo/public/mojom/base/values.mojom.h" #endif -@@ -150,7 +150,7 @@ bool StructTraits< +@@ -161,7 +161,7 @@ bool StructTraits< } out->set_pages_per_sheet(data.pages_per_sheet()); @@ -18,3 +18,12 @@ DCHECK(out->advanced_settings().empty()); if (!data.ReadAdvancedSettings(&out->advanced_settings())) return false; +@@ -239,7 +239,7 @@ bool StructTraits< + return false; + } + +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // The dictionary must contain three strings. + base::Value* value = system_print_dialog_data.Find( + printing::kLinuxSystemPrintDialogDataPrinter); diff --git a/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.h b/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.h index 5e565acae23a..833201017e95 100644 --- a/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.h +++ b/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.h @@ -1,6 +1,6 @@ ---- printing/mojom/printing_context_mojom_traits.h.orig 2022-06-17 14:20:10 UTC +--- printing/mojom/printing_context_mojom_traits.h.orig 2023-10-11 18:22:24 UTC +++ printing/mojom/printing_context_mojom_traits.h -@@ -158,7 +158,7 @@ struct StructTraits<printing::mojom::PrintSettingsData +@@ -166,7 +166,7 @@ struct StructTraits<printing::mojom::PrintSettingsData return s.pages_per_sheet(); } diff --git a/www/chromium/files/patch-printing_print__settings.cc b/www/chromium/files/patch-printing_print__settings.cc index 3c47fb54dc27..073188648cf0 100644 --- a/www/chromium/files/patch-printing_print__settings.cc +++ b/www/chromium/files/patch-printing_print__settings.cc @@ -1,6 +1,6 @@ ---- printing/print_settings.cc.orig 2023-09-13 12:11:42 UTC +--- printing/print_settings.cc.orig 2023-10-11 18:22:24 UTC +++ printing/print_settings.cc -@@ -309,7 +309,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet +@@ -320,7 +320,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet #endif is_modifiable_ = settings.is_modifiable_; pages_per_sheet_ = settings.pages_per_sheet_; @@ -9,7 +9,7 @@ for (const auto& item : settings.advanced_settings_) advanced_settings_.emplace(item.first, item.second.Clone()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -336,7 +336,7 @@ bool PrintSettings::operator==(const PrintSettings& ot +@@ -350,7 +350,7 @@ bool PrintSettings::operator==(const PrintSettings& ot #endif is_modifiable_, requested_custom_margins_in_points_, pages_per_sheet_ @@ -18,7 +18,7 @@ , advanced_settings_ #endif -@@ -361,7 +361,7 @@ bool PrintSettings::operator==(const PrintSettings& ot +@@ -374,7 +374,7 @@ bool PrintSettings::operator==(const PrintSettings& ot other.is_modifiable_, other.requested_custom_margins_in_points_, other.pages_per_sheet_ @@ -27,7 +27,7 @@ , other.advanced_settings_ #endif -@@ -400,7 +400,7 @@ void PrintSettings::Clear() { +@@ -414,7 +414,7 @@ void PrintSettings::Clear() { #endif is_modifiable_ = true; pages_per_sheet_ = 1; diff --git a/www/chromium/files/patch-printing_print__settings.h b/www/chromium/files/patch-printing_print__settings.h index a0551d11eeed..f584a3f20ad4 100644 --- a/www/chromium/files/patch-printing_print__settings.h +++ b/www/chromium/files/patch-printing_print__settings.h @@ -1,15 +1,24 @@ ---- printing/print_settings.h.orig 2023-09-13 12:11:42 UTC +--- printing/print_settings.h.orig 2023-10-11 18:22:24 UTC +++ printing/print_settings.h -@@ -21,7 +21,7 @@ - #include "ui/gfx/geometry/rect.h" - #include "ui/gfx/geometry/size.h" +@@ -25,7 +25,7 @@ + #include "base/values.h" + #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include <map> #include "base/values.h" -@@ -74,7 +74,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -51,7 +51,7 @@ inline constexpr char kMacSystemPrintDialogDataPrintSe + "print_settings"; + #endif // BUILDFLAG(IS_MAC) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + inline constexpr char kLinuxSystemPrintDialogDataPrinter[] = "printer_name"; + inline constexpr char kLinuxSystemPrintDialogDataPrintSettings[] = + "print_settings"; +@@ -101,7 +101,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { std::string vendor_id; }; @@ -18,7 +27,7 @@ using AdvancedSettings = std::map<std::string, base::Value>; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -246,7 +246,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -276,7 +276,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { pages_per_sheet_ = pages_per_sheet; } @@ -27,7 +36,7 @@ AdvancedSettings& advanced_settings() { return advanced_settings_; } const AdvancedSettings& advanced_settings() const { return advanced_settings_; -@@ -381,7 +381,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -429,7 +429,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { // Number of pages per sheet. int pages_per_sheet_; diff --git a/www/chromium/files/patch-printing_print__settings__conversion.cc b/www/chromium/files/patch-printing_print__settings__conversion.cc index 0e7ac95bb07f..19ba0f070bb4 100644 --- a/www/chromium/files/patch-printing_print__settings__conversion.cc +++ b/www/chromium/files/patch-printing_print__settings__conversion.cc @@ -1,6 +1,6 @@ ---- printing/print_settings_conversion.cc.orig 2023-04-05 11:05:06 UTC +--- printing/print_settings_conversion.cc.orig 2023-10-11 18:22:24 UTC +++ printing/print_settings_conversion.cc -@@ -277,7 +277,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet +@@ -287,7 +287,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet settings->set_is_modifiable(is_modifiable.value()); } diff --git a/www/chromium/files/patch-printing_printing__context__linux.cc b/www/chromium/files/patch-printing_printing__context__linux.cc index 0def5104307d..b6d023b96e0e 100644 --- a/www/chromium/files/patch-printing_printing__context__linux.cc +++ b/www/chromium/files/patch-printing_printing__context__linux.cc @@ -1,7 +1,7 @@ ---- printing/printing_context_linux.cc.orig 2023-04-05 11:05:06 UTC +--- printing/printing_context_linux.cc.orig 2023-10-11 18:22:24 UTC +++ printing/printing_context_linux.cc -@@ -19,7 +19,7 @@ - #include "printing/units.h" +@@ -23,7 +23,7 @@ + #endif // Avoid using LinuxUi on Fuchsia. -#if BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -68,7 +68,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett +@@ -72,7 +72,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett ResetSettings(); @@ -18,7 +18,7 @@ if (!ui::LinuxUi::instance()) return mojom::ResultCode::kSuccess; -@@ -84,7 +84,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett +@@ -88,7 +88,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett } gfx::Size PrintingContextLinux::GetPdfPaperSizeDeviceUnits() { @@ -27,7 +27,7 @@ if (ui::LinuxUi::instance()) return ui::LinuxUi::instance()->GetPdfPaperSize(this); #endif -@@ -97,7 +97,7 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterS +@@ -101,7 +101,7 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterS DCHECK(!printer_settings.show_system_dialog); DCHECK(!in_print_job_); diff --git a/www/chromium/files/patch-sandbox_policy_features.cc b/www/chromium/files/patch-sandbox_policy_features.cc index ffabad02602a..bbd0a7dfb751 100644 --- a/www/chromium/files/patch-sandbox_policy_features.cc +++ b/www/chromium/files/patch-sandbox_policy_features.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/features.cc.orig 2023-05-31 08:12:17 UTC +--- sandbox/policy/features.cc.orig 2023-10-11 18:22:24 UTC +++ sandbox/policy/features.cc -@@ -15,7 +15,11 @@ namespace sandbox::policy::features { +@@ -19,7 +19,11 @@ namespace sandbox::policy::features { // (Only causes an effect when feature kNetworkServiceInProcess is disabled.) BASE_FEATURE(kNetworkServiceSandbox, "NetworkServiceSandbox", diff --git a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc index 738a52d5ee02..b7ee6f77bcd5 100644 --- a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc +++ b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc @@ -1,6 +1,6 @@ ---- services/device/geolocation/location_arbitrator.cc.orig 2023-09-13 12:11:42 UTC +--- services/device/geolocation/location_arbitrator.cc.orig 2023-10-11 18:22:24 UTC +++ services/device/geolocation/location_arbitrator.cc -@@ -186,7 +186,7 @@ LocationArbitrator::NewNetworkLocationProvider( +@@ -188,7 +188,7 @@ LocationArbitrator::NewNetworkLocationProvider( std::unique_ptr<LocationProvider> LocationArbitrator::NewSystemLocationProvider() { diff --git a/www/chromium/files/patch-services_device_public_cpp_generic__sensor_sensor__reading.h b/www/chromium/files/patch-services_device_public_cpp_generic__sensor_sensor__reading.h new file mode 100644 index 000000000000..15f7372e77ea --- /dev/null +++ b/www/chromium/files/patch-services_device_public_cpp_generic__sensor_sensor__reading.h @@ -0,0 +1,11 @@ +--- services/device/public/cpp/generic_sensor/sensor_reading.h.orig 2023-10-11 18:22:24 UTC ++++ services/device/public/cpp/generic_sensor/sensor_reading.h +@@ -5,6 +5,8 @@ + #ifndef SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_SENSOR_READING_H_ + #define SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_SENSOR_READING_H_ + ++#include <cstdint> ++ + #include <type_traits> + + namespace device { diff --git a/www/chromium/files/patch-services_device_public_mojom_BUILD.gn b/www/chromium/files/patch-services_device_public_mojom_BUILD.gn index e0fc229eb6a1..0afd028fbb1c 100644 --- a/www/chromium/files/patch-services_device_public_mojom_BUILD.gn +++ b/www/chromium/files/patch-services_device_public_mojom_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/public/mojom/BUILD.gn.orig 2023-09-13 12:11:42 UTC +--- services/device/public/mojom/BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ services/device/public/mojom/BUILD.gn -@@ -96,7 +96,7 @@ mojom("device_service") { +@@ -97,7 +97,7 @@ mojom("device_service") { enable_js_fuzzing = false enabled_features = [] diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index b44c25ef4751..63c30dad5acf 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 2023-09-13 12:11:42 UTC +--- services/network/BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ services/network/BUILD.gn -@@ -385,7 +385,6 @@ if (is_linux || is_chromeos) { +@@ -392,7 +392,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 new file mode 100644 index 000000000000..1523aa1b1a77 --- /dev/null +++ b/www/chromium/files/patch-services_network_network__context.cc @@ -0,0 +1,20 @@ +--- services/network/network_context.cc.orig 2023-10-11 18:22:24 UTC ++++ services/network/network_context.cc +@@ -447,7 +447,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: + NetworkContext::NetworkContextHttpAuthPreferences:: + ~NetworkContextHttpAuthPreferences() = default; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad() + const { + if (network_service_) { +@@ -2301,7 +2301,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( + http_auth_dynamic_network_service_params->android_negotiate_account_type); + #endif // BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + http_auth_merged_preferences_.set_allow_gssapi_library_load( + http_auth_dynamic_network_service_params->allow_gssapi_library_load); + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) diff --git a/www/chromium/files/patch-services_network_network__context.h b/www/chromium/files/patch-services_network_network__context.h new file mode 100644 index 000000000000..540ea65e8b0a --- /dev/null +++ b/www/chromium/files/patch-services_network_network__context.h @@ -0,0 +1,11 @@ +--- services/network/network_context.h.orig 2023-10-11 18:22:24 UTC ++++ services/network/network_context.h +@@ -667,7 +667,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext + public: + explicit NetworkContextHttpAuthPreferences(NetworkService* network_service); + ~NetworkContextHttpAuthPreferences() override; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool AllowGssapiLibraryLoad() const override; + #endif // BUILDFLAG(IS_LINUX) + private: diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc index 93dfe7011187..40e1959f5446 100644 --- a/www/chromium/files/patch-services_network_network__service.cc +++ b/www/chromium/files/patch-services_network_network__service.cc @@ -1,4 +1,4 @@ ---- services/network/network_service.cc.orig 2023-09-13 12:11:42 UTC +--- services/network/network_service.cc.orig 2023-10-11 18:22:24 UTC +++ services/network/network_service.cc @@ -96,7 +96,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" @@ -9,3 +9,21 @@ BUILDFLAG(IS_CHROMEOS_LACROS) #include "components/os_crypt/sync/key_storage_config_linux.h" +@@ -1003,7 +1003,7 @@ void NetworkService::SetExplicitlyAllowedPorts( + net::SetExplicitlyAllowedPorts(ports); + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void NetworkService::SetGssapiLibraryLoadObserver( + mojo::PendingRemote<mojom::GssapiLibraryLoadObserver> + gssapi_library_load_observer) { +@@ -1085,7 +1085,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo + ); + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void NetworkService::OnBeforeGssapiLibraryLoad() { + if (gssapi_library_load_observer_.is_bound()) { + gssapi_library_load_observer_->OnBeforeGssapiLibraryLoad(); diff --git a/www/chromium/files/patch-services_network_network__service.h b/www/chromium/files/patch-services_network_network__service.h new file mode 100644 index 000000000000..47fbfe151389 --- /dev/null +++ b/www/chromium/files/patch-services_network_network__service.h @@ -0,0 +1,29 @@ +--- services/network/network_service.h.orig 2023-10-11 18:22:24 UTC ++++ services/network/network_service.h +@@ -235,7 +235,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService + mojo::PendingReceiver<mojom::NetworkServiceTest> receiver) override; + void SetFirstPartySets(net::GlobalFirstPartySets sets) override; + void SetExplicitlyAllowedPorts(const std::vector<uint16_t>& ports) override; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void SetGssapiLibraryLoadObserver( + mojo::PendingRemote<mojom::GssapiLibraryLoadObserver> + gssapi_library_load_observer) override; +@@ -266,7 +266,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService + std::unique_ptr<net::HttpAuthHandlerFactory> CreateHttpAuthHandlerFactory( + NetworkContext* network_context); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // This is called just before a GSSAPI library may be loaded. + void OnBeforeGssapiLibraryLoad(); + #endif // BUILDFLAG(IS_LINUX) +@@ -507,7 +507,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService + // leaking stale listeners between tests. + std::unique_ptr<net::NetworkChangeNotifier> mock_network_change_notifier_; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + mojo::Remote<mojom::GssapiLibraryLoadObserver> gssapi_library_load_observer_; + #endif // BUILDFLAG(IS_LINUX) + diff --git a/www/chromium/files/patch-services_network_public_cpp_features.cc b/www/chromium/files/patch-services_network_public_cpp_features.cc new file mode 100644 index 000000000000..2a3e4379ae29 --- /dev/null +++ b/www/chromium/files/patch-services_network_public_cpp_features.cc @@ -0,0 +1,11 @@ +--- services/network/public/cpp/features.cc.orig 2023-10-11 18:22:24 UTC ++++ services/network/public/cpp/features.cc +@@ -383,7 +383,7 @@ BASE_FEATURE(kPrivateNetworkAccessPermissionPrompt, + // that can be adequately sandboxed. + BASE_FEATURE(kOutOfProcessSystemDnsResolution, + "OutOfProcessSystemDnsResolution", +-#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-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc index 8f67fb94068f..24905dee8383 100644 --- a/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc +++ b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc @@ -1,4 +1,4 @@ ---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2023-07-16 15:47:57 UTC +--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2023-10-11 18:22:24 UTC +++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc @@ -53,7 +53,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO uint32_t shared_resident_kb) { @@ -18,7 +18,7 @@ os_dump->private_footprint_swap_kb = internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024; #endif -@@ -220,7 +220,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -217,7 +217,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // On most platforms each process can dump data about their own process // so ask each process to do so Linux is special see below. @@ -27,7 +27,7 @@ request->pending_responses.insert({client_info.pid, ResponseType::kOSDump}); client->RequestOSMemoryDump(request->memory_map_option(), {base::kNullProcessId}, -@@ -235,7 +235,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -232,7 +232,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // In some cases, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -36,7 +36,7 @@ std::vector<base::ProcessId> pids; mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = base::kNullProcessId; -@@ -281,7 +281,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion +@@ -278,7 +278,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion const OsCallback& os_callback) { // On Linux, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -45,7 +45,7 @@ mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = 0; for (const auto& client_info : clients) { -@@ -331,7 +331,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( +@@ -328,7 +328,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( // each client process provides 1 OS dump, % the case where the client is // disconnected mid dump. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; @@ -54,7 +54,7 @@ for (auto& kv : extra_os_dumps) { auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first; DCHECK(results.find(pid) == results.end()); -@@ -392,7 +392,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* +@@ -389,7 +389,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* // crash). In the latter case (OS_LINUX) we expect the full map to come // from the browser process response. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; diff --git a/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc b/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc index 58f2f24b45b5..9bd196ee4d56 100644 --- a/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc +++ b/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc @@ -1,4 +1,4 @@ ---- services/video_capture/video_capture_service_impl.cc.orig 2023-09-13 12:11:42 UTC +--- services/video_capture/video_capture_service_impl.cc.orig 2023-10-11 18:22:24 UTC +++ services/video_capture/video_capture_service_impl.cc @@ -40,7 +40,7 @@ #include "services/video_capture/lacros/device_factory_adapter_lacros.h" @@ -18,7 +18,7 @@ // Intended usage of this class is to create viz::Gpu in utility process and // connect to viz::GpuClient of browser process, which will call to Gpu service. // Also, this class holds the viz::ContextProvider to listen and monitor Gpu -@@ -289,7 +289,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende +@@ -288,7 +288,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende if (!gpu_dependencies_context_) gpu_dependencies_context_ = std::make_unique<GpuDependenciesContext>(); @@ -27,7 +27,7 @@ if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { if (!viz_gpu_context_provider_) { viz_gpu_context_provider_ = -@@ -385,7 +385,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH +@@ -384,7 +384,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH } #endif diff --git a/www/chromium/files/patch-third__party_abseil-cpp_absl_base_config.h b/www/chromium/files/patch-third__party_abseil-cpp_absl_base_config.h index 3ce20f8e6c7c..b44895b6cc47 100644 --- a/www/chromium/files/patch-third__party_abseil-cpp_absl_base_config.h +++ b/www/chromium/files/patch-third__party_abseil-cpp_absl_base_config.h @@ -1,6 +1,6 @@ ---- third_party/abseil-cpp/absl/base/config.h.orig 2023-08-17 07:33:31 UTC +--- third_party/abseil-cpp/absl/base/config.h.orig 2023-10-11 18:22:24 UTC +++ third_party/abseil-cpp/absl/base/config.h -@@ -444,7 +444,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -450,7 +450,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != #ifdef ABSL_HAVE_SCHED_YIELD #error ABSL_HAVE_SCHED_YIELD cannot be directly set #elif defined(__linux__) || defined(__ros__) || defined(__native_client__) || \ @@ -9,7 +9,7 @@ #define ABSL_HAVE_SCHED_YIELD 1 #endif -@@ -459,7 +459,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -465,7 +465,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != // platforms. #ifdef ABSL_HAVE_SEMAPHORE_H #error ABSL_HAVE_SEMAPHORE_H cannot be directly set diff --git a/www/chromium/files/patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc b/www/chromium/files/patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc deleted file mode 100644 index 698e0ea29267..000000000000 --- a/www/chromium/files/patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc.orig 2023-09-13 12:11:42 UTC -+++ third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc -@@ -19,7 +19,7 @@ - #endif - - #if defined(HAS_STRPTIME) && HAS_STRPTIME --#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) -+#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) && !defined(__FreeBSD__) - #define _XOPEN_SOURCE 500 // Exposes definitions for SUSv2 (UNIX 98). - #endif - #endif diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index ac691735a8ac..14eaf6d46fcf 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 2023-09-13 12:11:42 UTC +--- third_party/angle/BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ third_party/angle/BUILD.gn -@@ -321,7 +321,6 @@ config("extra_warnings") { +@@ -325,7 +325,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,7 +8,7 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -492,7 +491,7 @@ template("angle_common_lib") { +@@ -496,7 +495,7 @@ template("angle_common_lib") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -647,6 +646,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -651,6 +650,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp index 90041b8684b2..adb50284ec40 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,4 +1,4 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2023-09-13 12:11:42 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2023-10-11 18:22:24 UTC +++ third_party/angle/src/libANGLE/Display.cpp @@ -60,7 +60,7 @@ # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" @@ -18,16 +18,16 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -452,7 +452,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -457,7 +457,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di #if defined(ANGLE_ENABLE_OPENGL) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayWGL(state); -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) # if defined(ANGLE_USE_GBM) - if (platformType == 0 || - platformType == EGL_PLATFORM_VULKAN_DISPLAY_MODE_HEADLESS_ANGLE) -@@ -501,7 +501,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di + if (platformType == 0) + { +@@ -508,7 +508,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateVulkanWin32Display(state); } break; @@ -36,7 +36,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable()) { -@@ -2125,7 +2125,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2148,7 +2148,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp index 0b32884488af..e9a1110eb55c 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/formatutils.cpp.orig 2023-05-31 08:12:17 UTC +--- third_party/angle/src/libANGLE/formatutils.cpp.orig 2023-10-11 18:22:24 UTC +++ third_party/angle/src/libANGLE/formatutils.cpp -@@ -1473,7 +1473,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa +@@ -1475,7 +1475,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa AddYUVFormat(&map, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported); AddYUVFormat(&map, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported); diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc index d56bedde88dc..54958084d79e 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2023-05-31 08:12:17 UTC +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2023-10-11 18:22:24 UTC +++ third_party/blink/renderer/controller/blink_initializer.cc @@ -78,12 +78,12 @@ #include "third_party/blink/renderer/controller/private_memory_footprint_provider.h" @@ -15,7 +15,7 @@ #include "third_party/blink/renderer/controller/highest_pmf_reporter.h" #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h" #endif -@@ -231,7 +231,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder +@@ -227,7 +227,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder main_thread_task_runner); #endif @@ -24,7 +24,7 @@ binders.Add<mojom::blink::MemoryUsageMonitorLinux>( ConvertToBaseRepeatingCallback( CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)), -@@ -270,7 +270,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform +@@ -266,7 +266,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index 2143cd5498f2..7cc2b9fc86db 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-09-13 12:11:42 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-10-11 18:22:24 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -421,7 +421,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { @@ -9,7 +9,7 @@ if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3318,7 +3318,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3323,7 +3323,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_html_canvas_canvas__async__blob__creator.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc index 27c5cdf1225c..43b49bb2150d 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2022-05-19 14:06:27 UTC +--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2023-10-11 18:22:24 UTC +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -@@ -45,7 +45,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin +@@ -48,7 +48,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin /* The value is based on user statistics on Nov 2017. */ #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_ng_grid_ng__grid__layout__algorithm.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_ng_grid_ng__grid__layout__algorithm.cc index 5841b8b212f8..f09c4b19606b 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_layout_ng_grid_ng__grid__layout__algorithm.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_layout_ng_grid_ng__grid__layout__algorithm.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.orig 2023-09-13 12:11:42 UTC +--- third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.orig 2023-10-11 18:22:24 UTC +++ third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc -@@ -3431,7 +3431,13 @@ void NGGridLayoutAlgorithm::PlaceGridItems( +@@ -3452,7 +3452,13 @@ void NGGridLayoutAlgorithm::PlaceGridItems( DCHECK(out_row_break_between); const auto& container_space = ConstraintSpace(); @@ -14,7 +14,7 @@ const auto* cached_layout_subtree = container_space.GridLayoutSubtree(); const auto container_writing_direction = -@@ -3595,7 +3601,13 @@ void NGGridLayoutAlgorithm::PlaceGridItemsForFragmenta +@@ -3616,7 +3622,13 @@ void NGGridLayoutAlgorithm::PlaceGridItemsForFragmenta // TODO(ikilpatrick): Update |SetHasSeenAllChildren| and early exit if true. const auto& constraint_space = ConstraintSpace(); diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_paint_object__paint__properties__sparse.h b/www/chromium/files/patch-third__party_blink_renderer_core_paint_object__paint__properties__sparse.h index 85c036aa6a02..a8abda97c205 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_paint_object__paint__properties__sparse.h +++ b/www/chromium/files/patch-third__party_blink_renderer_core_paint_object__paint__properties__sparse.h @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/paint/object_paint_properties_sparse.h.orig 2023-08-17 07:33:31 UTC +--- third_party/blink/renderer/core/paint/object_paint_properties_sparse.h.orig 2023-10-11 18:22:24 UTC +++ third_party/blink/renderer/core/paint/object_paint_properties_sparse.h -@@ -269,8 +269,8 @@ class CORE_EXPORT ObjectPaintPropertiesSparse : public +@@ -272,8 +272,8 @@ class CORE_EXPORT ObjectPaintPropertiesSparse : public NodeList& nodes, NodeId node_id, const ParentType& parent, diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc index 56a681174e8a..8d3dcb7e7d8a 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2023-09-13 12:11:42 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2023-10-11 18:22:24 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -119,7 +119,7 @@ namespace blink { +@@ -118,7 +118,7 @@ namespace blink { namespace { diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index 9fd4054a13b1..763d719b17ea 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2022-10-24 13:33:33 UTC +--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2023-10-11 18:22:24 UTC +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc @@ -155,7 +155,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const // is true for at least GTK and QT apps). @@ -9,7 +9,7 @@ return false; #else return true; -@@ -329,7 +329,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr +@@ -355,7 +355,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr const WebMouseEvent& event) { // 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_modules_media_audio_audio__renderer__mixer__manager__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc index 9927f7a04bda..22599ce7310c 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2023-04-28 17:01:32 UTC +--- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2023-10-11 18:22:24 UTC +++ third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc -@@ -722,7 +722,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten +@@ -724,7 +724,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten mixer->get_output_params_for_testing().sample_rate()); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index eb9897ba905a..6756ed86ec67 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 2023-09-13 12:11:42 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2023-10-11 18:22:24 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6287,7 +6287,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6321,7 +6321,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc index 49f0d11caf19..9a3b620f0def 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2023-09-13 12:11:42 UTC +--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2023-10-11 18:22:24 UTC +++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc -@@ -698,7 +698,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( +@@ -746,7 +746,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( // on linux platform. // TODO(crbug.com/1424119): using a webgpu mailbox texture on the OpenGLES // backend is failing for unknown reasons. 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 015916efc2bb..38b86ed87ae2 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 2023-09-13 12:11:42 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -1923,7 +1923,7 @@ static_library("test_support") { +@@ -1931,7 +1931,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_peerconnection_rtc__video__encoder__factory.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc index b11b502f641c..baafdd37d4c3 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2023-03-09 06:31:50 UTC +--- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2023-10-11 18:22:24 UTC +++ third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc -@@ -197,12 +197,12 @@ SupportedFormats GetSupportedFormatsInternal( +@@ -198,12 +198,12 @@ SupportedFormats GetSupportedFormatsInternal( supported_formats.scalability_modes.push_back(profile.scalability_modes); supported_formats.sdp_formats.push_back(std::move(*format)); 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 663a37918d10..a2a9ae7da391 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 2023-09-13 12:11:42 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-10-11 18:22:24 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2658,7 +2658,7 @@ +@@ -2781,7 +2781,7 @@ name: "PaymentHandlerMinimalHeaderUX", origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX", origin_trial_allows_third_party: true, @@ -9,7 +9,7 @@ }, { name: "PaymentInstruments", -@@ -3654,7 +3654,7 @@ +@@ -3803,7 +3803,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -18,7 +18,7 @@ }, { name: "URLPatternCompareComponent", -@@ -3848,12 +3848,12 @@ +@@ -4006,12 +4006,12 @@ status: "experimental", base_feature: "none", origin_trial_feature_name: "WebAppUrlHandling", diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc index 388c86309566..427cca02a1d8 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig 2023-09-13 12:11:42 UTC +--- third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig 2023-10-11 18:22:24 UTC +++ third_party/blink/renderer/platform/video_capture/video_capture_impl.cc -@@ -612,7 +612,7 @@ bool VideoCaptureImpl::VideoFrameBufferPreparer::BindV +@@ -621,7 +621,7 @@ bool VideoCaptureImpl::VideoFrameBufferPreparer::BindV } const unsigned texture_target = diff --git a/www/chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py b/www/chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py index 94a8bf8ecfec..e5e1e695b8d8 100644 --- a/www/chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py +++ b/www/chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py @@ -1,6 +1,6 @@ ---- third_party/boringssl/src/util/generate_build_files.py.orig 2023-09-13 12:11:42 UTC +--- third_party/boringssl/src/util/generate_build_files.py.orig 2023-10-11 18:22:24 UTC +++ third_party/boringssl/src/util/generate_build_files.py -@@ -792,10 +792,10 @@ def main(platforms): +@@ -766,10 +766,10 @@ def main(platforms): ] # Generate err_data.c @@ -15,7 +15,7 @@ crypto_c_files.append('err_data.c') crypto_c_files.sort() -@@ -806,11 +806,11 @@ def main(platforms): +@@ -780,11 +780,11 @@ def main(platforms): crypto_test_files = [] if EMBED_TEST_DATA: # Generate crypto_test_data.cc diff --git a/www/chromium/files/patch-third__party_cpuinfo_cpuinfo.gni b/www/chromium/files/patch-third__party_cpuinfo_cpuinfo.gni index f6fb40365266..c4eabc395be3 100644 --- a/www/chromium/files/patch-third__party_cpuinfo_cpuinfo.gni +++ b/www/chromium/files/patch-third__party_cpuinfo_cpuinfo.gni @@ -1,4 +1,4 @@ ---- third_party/cpuinfo/cpuinfo.gni.orig 2023-07-16 15:47:57 UTC +--- third_party/cpuinfo/cpuinfo.gni.orig 2023-10-11 18:22:24 UTC +++ third_party/cpuinfo/cpuinfo.gni @@ -7,7 +7,7 @@ use_cpuinfo = current_cpu != "ppc64" && current_cpu != "ppc64le" && @@ -6,6 +6,6 @@ # cpuinfo is not supported on fuchsia. - !is_fuchsia && + !is_fuchsia && !is_bsd && - # cpuinfo is crashy on the Windows Arm64 chips. - !(is_win && current_cpu == "arm64") && # There's a few arm architectures that are not supported by cpuinfo, + # especially amongst ChromeOS devices. + # See //third_party/cpuinfo/src/src/arm/linux/cp.h. diff --git a/www/chromium/files/patch-third__party_ffmpeg_configure b/www/chromium/files/patch-third__party_ffmpeg_configure index ad9597026a58..6d9e38cd99b1 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_configure +++ b/www/chromium/files/patch-third__party_ffmpeg_configure @@ -1,4 +1,4 @@ ---- third_party/ffmpeg/configure.orig 2023-09-13 18:23:44 UTC +--- third_party/ffmpeg/configure.orig 2023-10-12 11:37:12 UTC +++ third_party/ffmpeg/configure @@ -5613,6 +5613,7 @@ case $target_os in disable symver diff --git a/www/chromium/files/patch-third__party_libsync_src_sync.c b/www/chromium/files/patch-third__party_libsync_src_sync.c index 728cfeeea4fa..2b2e42ff7fde 100644 --- a/www/chromium/files/patch-third__party_libsync_src_sync.c +++ b/www/chromium/files/patch-third__party_libsync_src_sync.c @@ -1,16 +1,16 @@ ---- third_party/libsync/src/sync.c.orig 2023-02-08 09:03:45 UTC +--- third_party/libsync/src/sync.c.orig 2023-10-11 18:22:24 UTC +++ third_party/libsync/src/sync.c -@@ -17,7 +17,9 @@ +@@ -17,8 +17,8 @@ */ #include <fcntl.h> -+#if !defined(__OpenBSD__) - #include <malloc.h> -+#endif +-#include <malloc.h> #include <stdint.h> ++#include <stdlib.h> #include <string.h> #include <errno.h> -@@ -29,6 +31,12 @@ + #include <poll.h> +@@ -29,6 +29,12 @@ #include <sync/sync.h> diff --git a/www/chromium/files/patch-third__party_pdfium_pdfium.gni b/www/chromium/files/patch-third__party_pdfium_pdfium.gni index dc5658c14d98..921da979dfe8 100644 --- a/www/chromium/files/patch-third__party_pdfium_pdfium.gni +++ b/www/chromium/files/patch-third__party_pdfium_pdfium.gni @@ -1,4 +1,4 @@ ---- third_party/pdfium/pdfium.gni.orig 2023-09-13 12:11:42 UTC +--- third_party/pdfium/pdfium.gni.orig 2023-10-11 18:22:24 UTC +++ third_party/pdfium/pdfium.gni @@ -46,7 +46,7 @@ declare_args() { # PDFium will use PartitionAlloc partitions to separate strings, scalars, @@ -7,5 +7,5 @@ - pdf_use_partition_alloc = pdf_use_partition_alloc_override + pdf_use_partition_alloc = pdf_use_partition_alloc_override && use_partition_alloc_as_malloc - # Build PDFium to use Skia (experimental) for all PDFium graphics. - # If enabled, coexists in build with AGG graphics and the default + # Temporary config allowing chromium to switch its location of the + # partition_alloc library. https://crbug.com/1467773 diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc index c47dd9b4688d..f17a0c7a4d86 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2023-09-13 12:11:42 UTC +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2023-10-11 18:22:24 UTC +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -3203,7 +3203,8 @@ bool TracingServiceImpl::SnapshotClocks( +@@ -3213,7 +3213,8 @@ bool TracingServiceImpl::SnapshotClocks( #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \ !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ diff --git a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h index ec3259045ad8..27109ba252f1 100644 --- a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h +++ b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h @@ -1,6 +1,6 @@ ---- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2023-09-13 12:11:42 UTC +--- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2023-10-11 18:22:24 UTC +++ third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h -@@ -303,7 +303,15 @@ static inline char *loader_platform_executable_path(ch +@@ -304,7 +304,15 @@ static inline char *loader_platform_executable_path(ch return buffer; } @@ -15,5 +15,5 @@ +} +#elif defined(__Fuchsia__) static inline char *loader_platform_executable_path(char *buffer, size_t size) { return NULL; } - #elif defined(__QNXNTO__) + #elif defined(__QNX__) diff --git a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl__instance__device.cpp b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl__instance__device.cpp deleted file mode 100644 index f6f4447a6c7b..000000000000 --- a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl__instance__device.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_instance_device.cpp.orig 2023-09-13 12:11:42 UTC -+++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_instance_device.cpp -@@ -26,12 +26,12 @@ bool StatelessValidation::ValidateApiVersion(uint32_t - skip |= LogError(instance, "VUID-VkApplicationInfo-apiVersion-04010", - "Invalid CreateInstance->pCreateInfo->pApplicationInfo.apiVersion number (0x%08x). " - "Using VK_API_VERSION_%" PRIu32 "_%" PRIu32 ".", -- api_version, effective_api_version.major(), effective_api_version.minor()); -+ api_version, effective_api_version.vk_major(), effective_api_version.vk_minor()); - } else { - skip |= LogWarning(instance, kVUIDUndefined, - "Unrecognized CreateInstance->pCreateInfo->pApplicationInfo.apiVersion number (0x%08x). " - "Assuming VK_API_VERSION_%" PRIu32 "_%" PRIu32 ".", -- api_version, effective_api_version.major(), effective_api_version.minor()); -+ api_version, effective_api_version.vk_major(), effective_api_version.vk_minor()); - } - } - return skip; diff --git a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_utils_vk__layer__utils.h b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_utils_vk__layer__utils.h deleted file mode 100644 index d0444e52e9ba..000000000000 --- a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_utils_vk__layer__utils.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/vk_layer_utils.h.orig 2023-07-16 15:47:57 UTC -+++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/vk_layer_utils.h -@@ -69,7 +69,7 @@ static inline std::string StringAPIVersion(APIVersion - if (!version.valid()) { - return "<unrecognized>"; - } -- version_name << version.major() << "." << version.minor() << "." << version.patch() << " (0x" << std::setfill('0') -+ version_name << version.vk_major() << "." << version.vk_minor() << "." << version.vk_patch() << " (0x" << std::setfill('0') - << std::setw(8) << std::hex << version.value() << ")"; - return version_name.str(); - } diff --git a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk__extension__helper.h b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk__extension__helper.h deleted file mode 100644 index 43df29c0f526..000000000000 --- a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk__extension__helper.h +++ /dev/null @@ -1,15 +0,0 @@ ---- third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h.orig 2023-09-13 12:11:42 UTC -+++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h -@@ -87,9 +87,9 @@ class APIVersion { - - bool valid() const { return api_version_ != VVL_UNRECOGNIZED_API_VERSION; } - uint32_t value() const { return api_version_; } -- uint32_t major() const { return VK_API_VERSION_MAJOR(api_version_); } -- uint32_t minor() const { return VK_API_VERSION_MINOR(api_version_); } -- uint32_t patch() const { return VK_API_VERSION_PATCH(api_version_); } -+ uint32_t vk_major() const { return VK_API_VERSION_MAJOR(api_version_); } -+ uint32_t vk_minor() const { return VK_API_VERSION_MINOR(api_version_); } -+ uint32_t vk_patch() const { return VK_API_VERSION_PATCH(api_version_); } - - bool operator<(APIVersion api_version) const { return api_version_ < api_version.api_version_; } - bool operator<=(APIVersion api_version) const { return api_version_ <= api_version.api_version_; } diff --git a/www/chromium/files/patch-third__party_widevine_cdm_widevine.gni b/www/chromium/files/patch-third__party_widevine_cdm_widevine.gni index 8c0c0ff81bf4..0be939ed2d2b 100644 --- a/www/chromium/files/patch-third__party_widevine_cdm_widevine.gni +++ b/www/chromium/files/patch-third__party_widevine_cdm_widevine.gni @@ -1,9 +1,10 @@ ---- third_party/widevine/cdm/widevine.gni.orig 2023-09-04 17:14:29 UTC +--- third_party/widevine/cdm/widevine.gni.orig 2023-10-11 18:22:24 UTC +++ third_party/widevine/cdm/widevine.gni -@@ -27,6 +27,7 @@ library_widevine_cdm_available = +@@ -27,6 +27,8 @@ library_widevine_cdm_available = (is_chromeos && (target_cpu == "x64" || target_cpu == "arm" || target_cpu == "arm64")) || (target_os == "linux" && target_cpu == "x64") || ++ (target_os == "openbsd" && target_cpu == "x64") || + (target_os == "freebsd" && target_cpu == "x64") || (target_os == "mac" && (target_cpu == "x64" || target_cpu == "arm64")) || (target_os == "win" && diff --git a/www/chromium/files/patch-tools_protoc__wrapper_protoc__wrapper.py b/www/chromium/files/patch-tools_protoc__wrapper_protoc__wrapper.py index 1f9924232244..10b0f1008a08 100644 --- a/www/chromium/files/patch-tools_protoc__wrapper_protoc__wrapper.py +++ b/www/chromium/files/patch-tools_protoc__wrapper_protoc__wrapper.py @@ -1,6 +1,6 @@ ---- tools/protoc_wrapper/protoc_wrapper.py.orig 2023-03-09 06:31:50 UTC +--- tools/protoc_wrapper/protoc_wrapper.py.orig 2023-10-11 18:22:24 UTC +++ tools/protoc_wrapper/protoc_wrapper.py -@@ -175,15 +175,19 @@ def main(argv): +@@ -179,15 +179,19 @@ def main(argv): if not options.exclude_imports: protoc_cmd += ["--include_imports"] diff --git a/www/chromium/files/patch-ui_base_ui__base__features.cc b/www/chromium/files/patch-ui_base_ui__base__features.cc index 363cc8753910..123462f5200e 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/chromium/files/patch-ui_base_ui__base__features.cc @@ -1,7 +1,7 @@ ---- ui/base/ui_base_features.cc.orig 2023-09-13 12:11:42 UTC +--- ui/base/ui_base_features.cc.orig 2023-10-11 18:22:24 UTC +++ ui/base/ui_base_features.cc -@@ -113,7 +113,7 @@ BASE_FEATURE(kAlwaysConfirmComposition, - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -135,7 +135,7 @@ bool AreF11AndF12ShortcutsEnabled() { + } #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ BASE_FEATURE(kRedundantImeCompositionClearing, "RedundantImeCompositionClearing", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -212,7 +212,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, +@@ -234,7 +234,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -319,7 +319,7 @@ bool IsForcedColorsEnabled() { +@@ -346,7 +346,7 @@ bool IsForcedColorsEnabled() { // milestones. BASE_FEATURE(kEyeDropper, "EyeDropper", @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -531,7 +531,7 @@ ChromeRefresh2023Level GetChromeRefresh2023Level() { +@@ -565,7 +565,7 @@ ChromeRefresh2023Level GetChromeRefresh2023Level() { return level; } diff --git a/www/chromium/files/patch-ui_base_ui__base__features.h b/www/chromium/files/patch-ui_base_ui__base__features.h index 9592c99ecb39..9a75244ae7a4 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.h +++ b/www/chromium/files/patch-ui_base_ui__base__features.h @@ -1,7 +1,7 @@ ---- ui/base/ui_base_features.h.orig 2023-09-13 12:11:42 UTC +--- ui/base/ui_base_features.h.orig 2023-10-11 18:22:24 UTC +++ ui/base/ui_base_features.h -@@ -133,7 +133,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) - BASE_DECLARE_FEATURE(kAlwaysConfirmComposition); +@@ -138,7 +138,7 @@ BASE_DECLARE_FEATURE(kSupportF11AndF12KeyShortcuts); + COMPONENT_EXPORT(UI_BASE_FEATURES) bool AreF11AndF12ShortcutsEnabled(); #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) BASE_DECLARE_FEATURE(kRedundantImeCompositionClearing); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -@@ -266,7 +266,7 @@ enum class ChromeRefresh2023Level { +@@ -273,7 +273,7 @@ enum class ChromeRefresh2023Level { COMPONENT_EXPORT(UI_BASE_FEATURES) ChromeRefresh2023Level GetChromeRefresh2023Level(); diff --git a/www/chromium/files/patch-ui_base_ui__base__switches.cc b/www/chromium/files/patch-ui_base_ui__base__switches.cc new file mode 100644 index 000000000000..10cdf4702755 --- /dev/null +++ b/www/chromium/files/patch-ui_base_ui__base__switches.cc @@ -0,0 +1,18 @@ +--- ui/base/ui_base_switches.cc.orig 2023-10-11 18:22:24 UTC ++++ ui/base/ui_base_switches.cc +@@ -31,13 +31,13 @@ const char kShowMacOverlayBorders[] = "show-mac-overla + const char kEnableResourcesFileSharing[] = "enable-resources-file-sharing"; + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Specifies system font family name. Improves determenism when rendering + // pages in headless mode. + const char kSystemFontFamily[] = "system-font-family"; + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Specify the toolkit used to construct the Linux GUI. + const char kUiToolkitFlag[] = "ui-toolkit"; + #endif diff --git a/www/chromium/files/patch-ui_base_ui__base__switches.h b/www/chromium/files/patch-ui_base_ui__base__switches.h new file mode 100644 index 000000000000..35466f255482 --- /dev/null +++ b/www/chromium/files/patch-ui_base_ui__base__switches.h @@ -0,0 +1,16 @@ +--- ui/base/ui_base_switches.h.orig 2023-10-11 18:22:24 UTC ++++ ui/base/ui_base_switches.h +@@ -27,11 +27,11 @@ COMPONENT_EXPORT(UI_BASE) extern const char kShowMacOv + COMPONENT_EXPORT(UI_BASE) extern const char kEnableResourcesFileSharing[]; + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(UI_BASE) extern const char kSystemFontFamily[]; + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(UI_BASE) extern const char kUiToolkitFlag[]; + #endif + diff --git a/www/chromium/files/patch-ui_color_color__id.h b/www/chromium/files/patch-ui_color_color__id.h index a83d42115e0c..ae8706e1dbfd 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 2023-09-13 12:11:42 UTC +--- ui/color/color_id.h.orig 2023-10-11 18:22:24 UTC +++ ui/color/color_id.h -@@ -543,7 +543,7 @@ +@@ -567,7 +567,7 @@ E_CPONLY(kColorNativeColor6) \ E_CPONLY(kColorNativeBaseColor) \ E_CPONLY(kColorNativeSecondaryColor) diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index ae064db3a0fc..77f2c23dd6a3 100644 --- a/www/chromium/files/patch-ui_gfx_BUILD.gn +++ b/www/chromium/files/patch-ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gfx/BUILD.gn.orig 2023-09-13 12:11:42 UTC +--- ui/gfx/BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ ui/gfx/BUILD.gn -@@ -644,7 +644,7 @@ source_set("memory_buffer_sources") { +@@ -645,7 +645,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/chromium/files/patch-ui_gfx_codec_png__codec.cc b/www/chromium/files/patch-ui_gfx_codec_png__codec.cc index 1b6c66a469ab..1f47a3f99d25 100644 --- a/www/chromium/files/patch-ui_gfx_codec_png__codec.cc +++ b/www/chromium/files/patch-ui_gfx_codec_png__codec.cc @@ -1,7 +1,7 @@ ---- ui/gfx/codec/png_codec.cc.orig 2023-05-31 08:12:17 UTC +--- ui/gfx/codec/png_codec.cc.orig 2023-10-11 18:22:24 UTC +++ ui/gfx/codec/png_codec.cc -@@ -11,7 +11,7 @@ - #include "base/memory/raw_ptr_exclusion.h" +@@ -12,7 +12,7 @@ + #include "base/metrics/histogram_macros.h" #include "base/notreached.h" #include "base/strings/string_util.h" -#include "third_party/libpng/png.h" diff --git a/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc b/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc deleted file mode 100644 index 3d99954b8fbc..000000000000 --- a/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc +++ /dev/null @@ -1,25 +0,0 @@ ---- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2022-02-07 13:39:41 UTC -+++ ui/gfx/linux/client_native_pixmap_dmabuf.cc -@@ -5,7 +5,9 @@ - #include "ui/gfx/linux/client_native_pixmap_dmabuf.h" - - #include <fcntl.h> -+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) - #include <linux/version.h> -+#endif - #include <stddef.h> - #include <sys/ioctl.h> - #include <sys/mman.h> -@@ -27,11 +29,7 @@ - #include "ui/gfx/buffer_format_util.h" - #include "ui/gfx/switches.h" - --#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) --#include <linux/dma-buf.h> --#else --#include <linux/types.h> -- -+#if defined(__OpenBSD__) || defined(__FreeBSD__) - struct dma_buf_sync { - __u64 flags; - }; diff --git a/www/chromium/files/patch-ui_gfx_linux_dmabuf__uapi.h b/www/chromium/files/patch-ui_gfx_linux_dmabuf__uapi.h new file mode 100644 index 000000000000..1f1a5f458d0f --- /dev/null +++ b/www/chromium/files/patch-ui_gfx_linux_dmabuf__uapi.h @@ -0,0 +1,36 @@ +--- ui/gfx/linux/dmabuf_uapi.h.orig 2023-10-12 11:15:05 UTC ++++ ui/gfx/linux/dmabuf_uapi.h +@@ -5,12 +5,11 @@ + #ifndef UI_GFX_LINUX_DMABUF_UAPI_H_ + #define UI_GFX_LINUX_DMABUF_UAPI_H_ + +-#include <linux/version.h> ++#include <sys/types.h> + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) +-#include <linux/dma-buf.h> +-#else +-#include <linux/types.h> ++typedef int32_t __s32; ++typedef uint32_t __u32; ++typedef uint64_t __u64; + + struct dma_buf_sync { + __u64 flags; +@@ -26,9 +25,7 @@ constexpr __u64 DMA_BUF_SYNC_END = 1 << 2; + constexpr char DMA_BUF_BASE = 'b'; + constexpr unsigned long DMA_BUF_IOCTL_SYNC = + _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync); +-#endif + +-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0) + struct dma_buf_export_sync_file { + __u32 flags; + __s32 fd; +@@ -43,6 +40,5 @@ constexpr unsigned long DMA_BUF_IOCTL_EXPORT_SYNC_FILE + _IOWR(DMA_BUF_BASE, 2, struct dma_buf_export_sync_file); + constexpr unsigned long DMA_BUF_IOCTL_IMPORT_SYNC_FILE = + _IOW(DMA_BUF_BASE, 3, struct dma_buf_import_sync_file); +-#endif + + #endif // UI_GFX_LINUX_DMABUF_UAPI_H_ diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn index 0772eef24642..f012716ab2db 100644 --- a/www/chromium/files/patch-ui_gl_BUILD.gn +++ b/www/chromium/files/patch-ui_gl_BUILD.gn @@ -1,4 +1,4 @@ ---- ui/gl/BUILD.gn.orig 2023-09-13 12:11:42 UTC +--- ui/gl/BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ ui/gl/BUILD.gn @@ -151,8 +151,6 @@ component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] @@ -17,7 +17,7 @@ "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -373,7 +370,6 @@ component("gl") { +@@ -376,7 +373,6 @@ component("gl") { data_deps += [ "//third_party/angle:libEGL", "//third_party/angle:libGLESv2", @@ -25,7 +25,7 @@ ] if (enable_swiftshader) { data_deps += [ -@@ -574,7 +570,6 @@ test("gl_unittests") { +@@ -577,7 +573,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", diff --git a/www/chromium/files/patch-ui_gl_gl__switches.cc b/www/chromium/files/patch-ui_gl_gl__switches.cc index 497d0cfb6d41..509c03e9b1c8 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 2023-09-13 12:11:42 UTC +--- ui/gl/gl_switches.cc.orig 2023-10-11 18:22:24 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 -@@ -289,7 +289,7 @@ bool IsDefaultANGLEVulkan() { +@@ -294,7 +294,7 @@ bool IsDefaultANGLEVulkan() { base::android::SDK_VERSION_Q) return false; #endif // BUILDFLAG(IS_ANDROID) diff --git a/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc b/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc index 157fa2f70deb..d3d62a6a1fb2 100644 --- a/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc +++ b/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc @@ -1,6 +1,6 @@ ---- ui/gtk/printing/print_dialog_gtk.cc.orig 2023-03-09 06:31:50 UTC +--- ui/gtk/printing/print_dialog_gtk.cc.orig 2023-10-11 18:22:24 UTC +++ ui/gtk/printing/print_dialog_gtk.cc -@@ -403,7 +403,7 @@ void PrintDialogGtk::ShowDialog( +@@ -440,7 +440,7 @@ void PrintDialogGtk::ShowDialog( GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>( GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET | GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | diff --git a/www/chromium/files/patch-ui_native__theme_native__theme.h b/www/chromium/files/patch-ui_native__theme_native__theme.h index 504010e05e7b..a91b318f64f6 100644 --- a/www/chromium/files/patch-ui_native__theme_native__theme.h +++ b/www/chromium/files/patch-ui_native__theme_native__theme.h @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme.h.orig 2023-05-31 08:12:17 UTC +--- ui/native_theme/native_theme.h.orig 2023-10-11 18:22:24 UTC +++ ui/native_theme/native_theme.h -@@ -60,7 +60,7 @@ class NATIVE_THEME_EXPORT NativeTheme { +@@ -62,7 +62,7 @@ class NATIVE_THEME_EXPORT NativeTheme { kCheckbox, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_native__theme_native__theme__base.cc b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc index 824b7f68b007..db6b71e34c10 100644 --- a/www/chromium/files/patch-ui_native__theme_native__theme__base.cc +++ b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc @@ -1,11 +1,11 @@ ---- ui/native_theme/native_theme_base.cc.orig 2023-09-13 12:11:42 UTC +--- ui/native_theme/native_theme_base.cc.orig 2023-10-11 18:22:24 UTC +++ ui/native_theme/native_theme_base.cc -@@ -274,7 +274,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -275,7 +275,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, break; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) case kFrameTopArea: - PaintFrameTopArea(canvas, state, rect, extra.frame_top_area, - color_scheme); + PaintFrameTopArea(canvas, state, rect, + absl::get<FrameTopAreaExtraParams>(extra), diff --git a/www/chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc b/www/chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc index 46e76318d716..66d79ba7c926 100644 --- a/www/chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc +++ b/www/chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc @@ -1,6 +1,24 @@ ---- ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig 2023-09-13 12:11:42 UTC +--- ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig 2023-10-11 18:22:24 UTC +++ ui/ozone/platform/headless/vulkan_implementation_headless.cc -@@ -141,7 +141,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory +@@ -117,7 +117,7 @@ VulkanImplementationHeadless::ExportVkFenceToGpuFence( + + VkExternalSemaphoreHandleTypeFlagBits + VulkanImplementationHeadless::GetExternalSemaphoreHandleType() { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT; + #else + return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT; +@@ -127,7 +127,7 @@ VulkanImplementationHeadless::GetExternalSemaphoreHand + bool VulkanImplementationHeadless::CanImportGpuMemoryBuffer( + gpu::VulkanDeviceQueue* device_queue, + gfx::GpuMemoryBufferType memory_buffer_type) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const auto& enabled_extensions = device_queue->enabled_extensions(); + return gfx::HasExtension(enabled_extensions, + VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME) && +@@ -150,7 +150,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT; auto tiling = VK_IMAGE_TILING_OPTIMAL; diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc index f538cfd6ec93..327f73a9035c 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2023-09-13 12:11:42 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2023-10-11 18:22:24 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.cc -@@ -548,7 +548,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur +@@ -539,7 +539,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur const bool did_active_change = is_active_ != window_states.is_activated; is_active_ = window_states.is_activated; diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h index c0494d383947..5a7748e2ae02 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2023-09-13 12:11:42 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2023-10-11 18:22:24 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.h -@@ -256,7 +256,7 @@ class WaylandToplevelWindow : public WaylandWindow, +@@ -244,7 +244,7 @@ class WaylandToplevelWindow : public WaylandWindow, // Contains the previous state of the window. PlatformWindowState previous_state_ = PlatformWindowState::kUnknown; 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 ed081b6eb3df..73182eb23fd9 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,4 +1,4 @@ ---- ui/ozone/platform/wayland/host/wayland_window.cc.orig 2023-09-13 12:11:42 UTC +--- ui/ozone/platform/wayland/host/wayland_window.cc.orig 2023-10-11 18:22:24 UTC +++ ui/ozone/platform/wayland/host/wayland_window.cc @@ -233,7 +233,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused // Whenever the window gets the pointer focus back, the cursor shape must be @@ -18,7 +18,16 @@ auto async_cursor = WaylandAsyncCursor::FromPlatformCursor(platform_cursor); if (async_cursor_ == async_cursor) { -@@ -1070,12 +1070,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi +@@ -661,7 +661,7 @@ std::string WaylandWindow::WindowStates::ToString() co + } else { + base::TrimString(states, " ", &states); + } +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + states += "; tiled_edges: "; + std::string tiled = ""; + if (tiled_edges.left) { +@@ -1111,12 +1111,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 9c30c42842f3..c74b815fa5e7 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,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_window.h.orig 2023-09-13 12:11:42 UTC +--- ui/ozone/platform/wayland/host/wayland_window.h.orig 2023-10-11 18:22:24 UTC +++ ui/ozone/platform/wayland/host/wayland_window.h -@@ -38,7 +38,7 @@ +@@ -39,7 +39,7 @@ #include "ui/platform_window/platform_window_init_properties.h" #include "ui/platform_window/wm/wm_drag_handler.h" @@ -9,7 +9,7 @@ #include "ui/ozone/platform/wayland/host/wayland_async_cursor.h" #endif -@@ -240,7 +240,7 @@ class WaylandWindow : public PlatformWindow, +@@ -241,7 +241,7 @@ class WaylandWindow : public PlatformWindow, bool is_snapped_primary = false; bool is_snapped_secondary = false; bool is_floated = false; @@ -17,8 +17,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) WindowTiledEdges tiled_edges; #endif - }; -@@ -487,7 +487,7 @@ class WaylandWindow : public PlatformWindow, + +@@ -492,7 +492,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 -@@ -546,7 +546,7 @@ class WaylandWindow : public PlatformWindow, +@@ -551,7 +551,7 @@ class WaylandWindow : public PlatformWindow, wl::Object<zaura_surface> aura_surface_; diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc index 122658f4f714..aba99ae962eb 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc @@ -1,11 +1,11 @@ ---- ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig 2023-09-13 12:11:42 UTC +--- ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig 2023-10-11 18:22:24 UTC +++ ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc -@@ -284,7 +284,7 @@ void XDGToplevelWrapperImpl::ConfigureTopLevel( +@@ -308,7 +308,7 @@ void XDGToplevelWrapperImpl::OnToplevelConfigure(void* CheckIfWlArrayHasValue(states, XDG_TOPLEVEL_STATE_ACTIVATED), }; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - if (xdg_toplevel_get_version(xdg_toplevel) >= + if (xdg_toplevel_get_version(toplevel) >= XDG_TOPLEVEL_STATE_TILED_LEFT_SINCE_VERSION) { // All four tiled states have the same since version, so it is enough to 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 eba55a0ca12d..93077eaa7c04 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 2023-09-13 12:11:42 UTC +--- ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig 2023-10-11 18:22:24 UTC +++ ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc -@@ -225,6 +225,10 @@ void ZWPTextInputWrapperV1::SetSurroundingText( +@@ -226,6 +226,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"; -@@ -237,6 +241,7 @@ void ZWPTextInputWrapperV1::SetSurroundingText( +@@ -238,6 +242,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_ozone_platform_wayland_ozone__platform__wayland.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc index dc12521d78ed..dc2270cd55dd 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc @@ -1,4 +1,4 @@ ---- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2023-09-13 12:11:42 UTC +--- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2023-10-11 18:22:24 UTC +++ ui/ozone/platform/wayland/ozone_platform_wayland.cc @@ -66,13 +66,13 @@ #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h" @@ -16,7 +16,7 @@ #include "ui/ozone/platform/wayland/host/linux_ui_delegate_wayland.h" #endif -@@ -246,7 +246,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -262,7 +262,7 @@ class OzonePlatformWayland : public OzonePlatform, buffer_manager_connector_ = std::make_unique<WaylandBufferManagerConnector>( connection_->buffer_manager_host()); @@ -25,7 +25,7 @@ cursor_factory_ = std::make_unique<WaylandCursorFactory>(connection_.get()); #else cursor_factory_ = std::make_unique<BitmapCursorFactory>(); -@@ -256,7 +256,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -272,7 +272,7 @@ class OzonePlatformWayland : public OzonePlatform, supported_buffer_formats_ = connection_->buffer_manager_host()->GetSupportedBufferFormats(); @@ -34,7 +34,7 @@ linux_ui_delegate_ = std::make_unique<LinuxUiDelegateWayland>(connection_.get()); #endif -@@ -489,7 +489,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -510,7 +510,7 @@ class OzonePlatformWayland : public OzonePlatform, DrmRenderNodePathFinder path_finder_; #endif diff --git a/www/chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc b/www/chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc index b528762d5700..8778bcd0afd9 100644 --- a/www/chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc +++ b/www/chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2023-08-17 07:33:31 UTC +--- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2023-10-11 18:22:24 UTC +++ ui/ozone/platform/x11/ozone_platform_x11.cc -@@ -197,7 +197,7 @@ class OzonePlatformX11 : public OzonePlatform, +@@ -196,7 +196,7 @@ class OzonePlatformX11 : public OzonePlatform, properties->supports_global_application_menus = true; properties->app_modal_dialogs_use_event_blocker = true; properties->fetch_buffer_formats_for_gmb_on_gpu = true; 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 ccfffd18cf5c..3fecc9fe8a77 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2023-09-13 12:11:42 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2023-10-11 18:22:24 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -78,7 +78,7 @@ +@@ -79,7 +79,7 @@ #include "base/win/win_util.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/linux/linux_ui.h" #endif -@@ -172,7 +172,7 @@ bool IsControlKeyModifier(int flags) { +@@ -173,7 +173,7 @@ bool IsControlKeyModifier(int flags) { // Control-modified key combination, but we cannot extend it to other platforms // as Control has different meanings and behaviors. // https://crrev.com/2580483002/#msg46 @@ -18,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -741,7 +741,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -742,7 +742,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -27,7 +27,7 @@ auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; if (!handled && linux_ui && -@@ -923,7 +923,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -924,7 +924,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; -@@ -1928,7 +1928,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1929,7 +1929,7 @@ bool Textfield::ShouldDoLearning() { return false; } @@ -45,7 +45,7 @@ // TODO(https://crbug.com/952355): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2441,14 +2441,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2442,14 +2442,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.h b/www/chromium/files/patch-ui_views_controls_textfield_textfield.h index 6dd00c85834a..5e5d32ce3d12 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.h +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.h @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.h.orig 2023-08-17 07:33:31 UTC +--- ui/views/controls/textfield/textfield.h.orig 2023-10-11 18:22:24 UTC +++ ui/views/controls/textfield/textfield.h -@@ -43,7 +43,7 @@ +@@ -44,7 +44,7 @@ #include "ui/views/view.h" #include "ui/views/word_lookup_client.h" @@ -9,7 +9,7 @@ #include <vector> #endif -@@ -451,7 +451,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -452,7 +452,7 @@ class VIEWS_EXPORT Textfield : public View, // Set whether the text should be used to improve typing suggestions. void SetShouldDoLearning(bool value) { should_do_learning_ = value; } diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index 6c9ab72163dd..37165f6ee01e 100644 --- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2023-08-17 07:33:31 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2023-10-11 18:22:24 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -43,7 +43,7 @@ +@@ -44,7 +44,7 @@ #include "ui/wm/core/window_util.h" #include "ui/wm/public/window_move_client.h" @@ -9,7 +9,7 @@ #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h" #endif -@@ -264,7 +264,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget: +@@ -265,7 +265,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget: if (params.type == Widget::InitParams::TYPE_WINDOW) GetContentWindow()->SetProperty(aura::client::kAnimationsDisabledKey, true); @@ -18,7 +18,7 @@ const bool requires_accelerated_widget = params.requires_accelerated_widget; #else const bool requires_accelerated_widget = false; -@@ -345,7 +345,7 @@ std::unique_ptr<aura::client::DragDropClient> +@@ -346,7 +346,7 @@ std::unique_ptr<aura::client::DragDropClient> DesktopWindowTreeHostPlatform::CreateDragDropClient() { ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window())); std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client = @@ -27,7 +27,7 @@ std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler); #else std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler); -@@ -1072,7 +1072,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg +@@ -1081,7 +1081,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/chromium/files/patch-ui_views_widget_widget.cc b/www/chromium/files/patch-ui_views_widget_widget.cc index d05973322642..d37dbec568a5 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 2023-09-13 12:11:42 UTC +--- ui/views/widget/widget.cc.orig 2023-10-11 18:22:24 UTC +++ ui/views/widget/widget.cc @@ -54,7 +54,7 @@ #include "ui/views/window/custom_frame_view.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -2026,7 +2026,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2041,7 +2041,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 5b91b1ac7ad9..349a78399ff5 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 2023-09-13 12:11:42 UTC +--- ui/views/window/dialog_delegate.cc.orig 2023-10-11 18:22:24 UTC +++ ui/views/window/dialog_delegate.cc -@@ -83,7 +83,7 @@ Widget* DialogDelegate::CreateDialogWidget( +@@ -78,7 +78,7 @@ Widget* DialogDelegate::CreateDialogWidget( // static bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) { diff --git a/www/chromium/files/patch-ui_views_window_frame__background.cc b/www/chromium/files/patch-ui_views_window_frame__background.cc index 5c9450ab1a68..e57d7c7dbf7d 100644 --- a/www/chromium/files/patch-ui_views_window_frame__background.cc +++ b/www/chromium/files/patch-ui_views_window_frame__background.cc @@ -1,4 +1,4 @@ ---- ui/views/window/frame_background.cc.orig 2022-02-28 16:54:41 UTC +--- ui/views/window/frame_background.cc.orig 2023-10-11 18:22:24 UTC +++ ui/views/window/frame_background.cc @@ -110,7 +110,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv int width) const { @@ -7,5 +7,5 @@ -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ BUILDFLAG(ENABLE_DESKTOP_AURA) - ui::NativeTheme::ExtraParams params; - params.frame_top_area.use_custom_frame = use_custom_frame_; + ui::NativeTheme::FrameTopAreaExtraParams frame_top_area; + frame_top_area.use_custom_frame = use_custom_frame_; diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index f30f452c62d4..dfcbe5f2fddd 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 2023-09-17 18:22:45 UTC +--- v8/BUILD.gn.orig 2023-10-11 18:22:24 UTC +++ v8/BUILD.gn -@@ -1404,6 +1404,14 @@ config("toolchain") { +@@ -1417,6 +1417,14 @@ config("toolchain") { } else if (target_os == "chromeos") { defines += [ "V8_HAVE_TARGET_OS" ] defines += [ "V8_TARGET_OS_CHROMEOS" ] @@ -15,32 +15,20 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -2331,6 +2339,11 @@ template("run_mksnapshot") { - "--turbo-log-builtins-count-input", - v8_log_builtins_block_count_input, +@@ -2358,6 +2366,12 @@ template("run_mksnapshot") { ] -+ if (v8_current_cpu == "x86") { -+ args -= [ -+ "--abort-on-bad-builtin-profile-data", -+ ] -+ } } - if (v8_enable_builtins_profiling) { -@@ -2353,6 +2366,12 @@ template("run_mksnapshot") { - if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) { - args += [ "--reorder-builtins" ] - } ++ if (v8_current_cpu == "x86") { ++ args -= [ ++ "--abort-on-bad-builtin-profile-data", ++ ] ++ } + -+ if (v8_current_cpu == "x86") { -+ args -= [ -+ "--abort-on-bad-builtin-profile-data", -+ ] -+ } + if (v8_enable_builtins_profiling) { + args += [ "--turbo-profiling" ] } - - # This is needed to distinguish between generating code for the simulator -@@ -6081,7 +6100,7 @@ v8_component("v8_libbase") { +@@ -6111,7 +6125,7 @@ v8_component("v8_libbase") { } } @@ -49,7 +37,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -6092,6 +6111,18 @@ v8_component("v8_libbase") { +@@ -6122,6 +6136,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc index 24d415c75f9f..89ded7771958 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 2023-09-13 12:11:42 UTC +--- v8/src/api/api.cc.orig 2023-10-11 18:22:24 UTC +++ v8/src/api/api.cc @@ -141,7 +141,7 @@ #include "src/wasm/wasm-serialization.h" @@ -9,7 +9,7 @@ #include <signal.h> #include <unistd.h> -@@ -6336,7 +6336,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6352,7 +6352,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } 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 index 904267774cc7..c1bb6472d938 100644 --- a/www/chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc +++ b/www/chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc @@ -1,4 +1,4 @@ ---- v8/src/builtins/x64/builtins-x64.cc.orig 2023-09-13 12:11:42 UTC +--- v8/src/builtins/x64/builtins-x64.cc.orig 2023-10-11 18:22:24 UTC +++ v8/src/builtins/x64/builtins-x64.cc @@ -44,6 +44,8 @@ namespace internal { #define __ ACCESS_MASM(masm) @@ -18,26 +18,17 @@ // Store the current pc as the handler offset. It's used later to create the // handler table. -@@ -4015,6 +4017,8 @@ void GenericJSToWasmWrapperHelper(MacroAssembler* masm - RestoreParentSuspender(masm, rbx, rcx); - } - __ bind(&suspend); +@@ -3327,6 +3329,9 @@ void SwitchBackAndReturnPromise(MacroAssembler* masm, + void GenerateExceptionHandlingLandingPad(MacroAssembler* masm, + Label* return_promise) { + int catch_handler = __ pc_offset(); + + __ endbr64(); - // No need to process the return value if the stack is suspended, there is a - // single 'externref' value (the promise) which doesn't require conversion. - -@@ -4281,6 +4285,9 @@ void GenericJSToWasmWrapperHelper(MacroAssembler* masm - // thrown exception. - if (stack_switch) { - int catch_handler = __ pc_offset(); -+ -+ __ endbr64(); + - // Restore rsp to free the reserved stack slots for the sections. - __ leaq(rsp, MemOperand(rbp, kLastSpillOffset)); + // Restore rsp to free the reserved stack slots for the sections. + __ leaq(rsp, MemOperand(rbp, StackSwitchFrameConstants::kLastSpillOffset)); -@@ -4567,6 +4574,7 @@ void Builtins::Generate_WasmSuspend(MacroAssembler* ma +@@ -3658,6 +3663,7 @@ void Builtins::Generate_WasmSuspend(MacroAssembler* ma LoadJumpBuffer(masm, jmpbuf, true); __ Trap(); __ bind(&resume); @@ -45,7 +36,7 @@ __ LeaveFrame(StackFrame::STACK_SWITCH); __ ret(0); } -@@ -4711,6 +4719,7 @@ void Generate_WasmResumeHelper(MacroAssembler* masm, w +@@ -3790,6 +3796,7 @@ void Generate_WasmResumeHelper(MacroAssembler* masm, w } __ Trap(); __ bind(&suspend); diff --git a/www/chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h b/www/chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h index 4be82c82613e..b0b89406b133 100644 --- a/www/chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h +++ b/www/chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h @@ -1,6 +1,6 @@ ---- v8/src/codegen/x64/macro-assembler-x64.h.orig 2023-09-13 12:11:42 UTC +--- v8/src/codegen/x64/macro-assembler-x64.h.orig 2023-10-11 18:22:24 UTC +++ v8/src/codegen/x64/macro-assembler-x64.h -@@ -642,11 +642,14 @@ class V8_EXPORT_PRIVATE MacroAssembler +@@ -646,11 +646,14 @@ class V8_EXPORT_PRIVATE MacroAssembler // Define a function entrypoint. This doesn't emit any code for this // architecture, as control-flow integrity is not supported for it. diff --git a/www/chromium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc b/www/chromium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc index a47c1e79a81b..8904c63feeae 100644 --- a/www/chromium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc +++ b/www/chromium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc @@ -1,6 +1,6 @@ ---- v8/src/compiler/backend/x64/code-generator-x64.cc.orig 2023-09-13 12:11:42 UTC +--- v8/src/compiler/backend/x64/code-generator-x64.cc.orig 2023-10-11 18:22:24 UTC +++ v8/src/compiler/backend/x64/code-generator-x64.cc -@@ -6795,11 +6795,11 @@ void CodeGenerator::AssembleArchTableSwitch(Instructio +@@ -6828,11 +6828,11 @@ void CodeGenerator::AssembleArchTableSwitch(Instructio // target = table + (target - table) __ addq(input, kScratchRegister); // Jump to the target. diff --git a/www/chromium/files/patch-v8_src_diagnostics_perf-jit.cc b/www/chromium/files/patch-v8_src_diagnostics_perf-jit.cc index d6d2809f73e6..3c55690e02aa 100644 --- a/www/chromium/files/patch-v8_src_diagnostics_perf-jit.cc +++ b/www/chromium/files/patch-v8_src_diagnostics_perf-jit.cc @@ -1,7 +1,7 @@ ---- v8/src/diagnostics/perf-jit.cc.orig 2022-06-17 14:20:10 UTC +--- v8/src/diagnostics/perf-jit.cc.orig 2023-10-11 18:22:24 UTC +++ v8/src/diagnostics/perf-jit.cc -@@ -30,7 +30,7 @@ - #include "src/common/assert-scope.h" +@@ -31,7 +31,7 @@ + #include "src/flags/flags.h" // Only compile the {LinuxPerfJitLogger} on Linux. -#if V8_OS_LINUX diff --git a/www/chromium/files/patch-v8_src_execution_isolate.cc b/www/chromium/files/patch-v8_src_execution_isolate.cc index 3c4758cd1bcd..3c38e1775e01 100644 --- a/www/chromium/files/patch-v8_src_execution_isolate.cc +++ b/www/chromium/files/patch-v8_src_execution_isolate.cc @@ -1,4 +1,4 @@ ---- v8/src/execution/isolate.cc.orig 2023-09-13 12:11:42 UTC +--- v8/src/execution/isolate.cc.orig 2023-10-11 18:22:24 UTC +++ v8/src/execution/isolate.cc @@ -147,6 +147,10 @@ #include "src/execution/simulator-base.h" @@ -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_[]; -@@ -4021,6 +4025,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -4034,6 +4038,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { uint32_t code_size = DefaultEmbeddedBlobCodeSize(); const uint8_t* data = DefaultEmbeddedBlobData(); uint32_t data_size = DefaultEmbeddedBlobDataSize(); |