diff options
| author | Robert Nagy <robert@openbsd.org> | 2022-09-25 10:55:03 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2022-09-28 08:01:47 +0000 |
| commit | c0f99428c35709cbda75aecf4ae9cd3735a2210d (patch) | |
| tree | b4d356ba161c827b0dcceb0ce8ce41cc07513636 | |
| parent | abe4eae5c809b82028300031577720e51790b3dd (diff) | |
| download | ports-c0f99428c35709cbda75aecf4ae9cd3735a2210d.tar.gz ports-c0f99428c35709cbda75aecf4ae9cd3735a2210d.zip | |
www/chromium: update to 106.0.5249.61
Security: 18529cb0-3e9c-11ed-9bc7-3065ec8fd3ec
(cherry picked from commit c080558054e014c94435ab11f399e518324abe31)
268 files changed, 1457 insertions, 1111 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 8e6211dde377..ee6df1585add 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,5 +1,5 @@ PORTNAME= chromium -PORTVERSION= 105.0.5195.125 +PORTVERSION= 106.0.5249.61 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:external @@ -93,7 +93,6 @@ GN_ARGS+= clang_use_chrome_plugins=false \ enable_js_type_check=false \ enable_nacl=false \ enable_remoting=false \ - enable_wmax_tokens=false \ fatal_linker_warnings=false \ icu_use_data_file=false \ is_clang=true \ diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 17762f0c30a1..aea55df9118e 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1663188936 -SHA256 (chromium-105.0.5195.125.tar.xz) = 201b5c44668a415e3e05c0a806ab43a0904024340531332fc3ce39eb0cf10a66 -SIZE (chromium-105.0.5195.125.tar.xz) = 1597584952 -SHA256 (chrome-linux-105.0.5195.125-llvm13.profdata.tar.xz) = a7180aec05ab138c250b36bce4e4c1aef7d3874ee16a7c1c09d7f621025451e8 -SIZE (chrome-linux-105.0.5195.125-llvm13.profdata.tar.xz) = 24841916 -SHA256 (chromium-105.0.5195.125-testdata.tar.xz) = 9d9b1de3bc4808d00fde6d6fe97ba3557a7d45758c6c1c23b4175acda69f01ef -SIZE (chromium-105.0.5195.125-testdata.tar.xz) = 264246492 +TIMESTAMP = 1664291743 +SHA256 (chromium-106.0.5249.61.tar.xz) = f27acb929b12fc9e60b035c2f9f1879866eec7cfe1665dccf544048e9e931497 +SIZE (chromium-106.0.5249.61.tar.xz) = 1621965008 +SHA256 (chrome-linux-106.0.5249.61-llvm13.profdata.tar.xz) = 2de41aab46eefc2d4696bc64f7ce65f93de4422a5a01d82a0c56f9fc21e67e8d +SIZE (chrome-linux-106.0.5249.61-llvm13.profdata.tar.xz) = 25058192 +SHA256 (chromium-106.0.5249.61-testdata.tar.xz) = 48ec11b9bef3e742cc0c225fd301d456dd41fb4ff0df4503dd56bb52cdb92590 +SIZE (chromium-106.0.5249.61-testdata.tar.xz) = 263065588 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 a6357f969e30..94898e0b104e 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2022-08-31 12:19:35 UTC +--- BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ BUILD.gn @@ -53,7 +53,7 @@ declare_args() { root_extra_deps = [] @@ -9,7 +9,7 @@ # An official (maximally optimized!) component (optimized for build times) # build doesn't make sense and usually doesn't work. assert(!is_component_build) -@@ -85,7 +85,6 @@ group("gn_all") { +@@ -83,7 +83,6 @@ group("gn_all") { "//codelabs", "//components:components_unittests", "//components/gwp_asan:gwp_asan_unittests", @@ -17,7 +17,7 @@ "//net:net_unittests", "//sandbox:sandbox_unittests", "//services:services_unittests", -@@ -435,7 +434,7 @@ group("gn_all") { +@@ -441,7 +440,7 @@ group("gn_all") { ] } @@ -26,7 +26,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -624,6 +623,15 @@ group("gn_all") { +@@ -642,6 +641,15 @@ group("gn_all") { deps += [ "//gpu/tools/compositor_model_bench" ] } @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:crash_inspector", -@@ -672,7 +680,7 @@ group("gn_all") { +@@ -690,7 +698,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)" ] } -@@ -1187,7 +1195,7 @@ if (!is_ios) { +@@ -1202,7 +1210,7 @@ if (!is_ios) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -60,7 +60,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1196,7 +1204,7 @@ if (!is_ios) { +@@ -1211,7 +1219,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -69,7 +69,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1645,7 +1653,7 @@ group("chromium_builder_perf") { +@@ -1654,7 +1662,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 9ca1c2331d10..41a2ee639fb6 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 2022-08-31 12:19:35 UTC +--- base/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ base/BUILD.gn @@ -162,7 +162,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" -@@ -1014,7 +1014,7 @@ mixed_component("base") { +@@ -1031,7 +1031,7 @@ mixed_component("base") { "timer/hi_res_timer_manager_posix.cc", ] @@ -18,7 +18,7 @@ sources += [ "profiler/stack_copier_signal.cc", "profiler/stack_copier_signal.h", -@@ -1023,6 +1023,12 @@ mixed_component("base") { +@@ -1040,6 +1040,12 @@ mixed_component("base") { "profiler/thread_delegate_posix.h", ] } @@ -31,7 +31,7 @@ } if (is_win) { -@@ -1507,11 +1513,23 @@ mixed_component("base") { +@@ -1541,11 +1547,23 @@ mixed_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. @@ -56,7 +56,7 @@ if (use_allocator_shim) { sources += [ "allocator/allocator_shim.cc", -@@ -1539,7 +1557,7 @@ mixed_component("base") { +@@ -1573,7 +1591,7 @@ mixed_component("base") { ] configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ] } @@ -65,7 +65,7 @@ sources += [ "allocator/allocator_shim_override_cpp_symbols.h", "allocator/allocator_shim_override_glibc_weak_symbols.h", -@@ -1595,7 +1613,7 @@ mixed_component("base") { +@@ -1629,7 +1647,7 @@ mixed_component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -74,7 +74,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2183,6 +2201,42 @@ mixed_component("base") { +@@ -2211,6 +2229,42 @@ mixed_component("base") { } } @@ -117,7 +117,16 @@ # iOS if (is_ios) { sources -= [ -@@ -3496,7 +3550,7 @@ test("base_unittests") { +@@ -2310,7 +2364,7 @@ mixed_component("base") { + } + + if (dep_libevent) { +- deps += [ "//third_party/libevent" ] ++ public_deps += [ "//third_party/libevent" ] + } + + if (use_libevent) { +@@ -3545,7 +3599,7 @@ test("base_unittests") { } } @@ -126,7 +135,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3543,7 +3597,7 @@ test("base_unittests") { +@@ -3593,7 +3647,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -135,7 +144,7 @@ sources += [ "profiler/stack_copier_signal_unittest.cc", "profiler/thread_delegate_posix_unittest.cc", -@@ -3553,7 +3607,7 @@ test("base_unittests") { +@@ -3603,7 +3657,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -144,7 +153,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3741,7 +3795,7 @@ test("base_unittests") { +@@ -3791,7 +3845,7 @@ test("base_unittests") { } } diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h index 1d14687939fd..39bacb518604 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/page_allocator_constants.h.orig 2022-08-31 12:19:35 UTC +--- base/allocator/partition_allocator/page_allocator_constants.h.orig 2022-09-24 10:57:32 UTC +++ base/allocator/partition_allocator/page_allocator_constants.h -@@ -24,7 +24,7 @@ +@@ -25,7 +25,7 @@ // elimination. #define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const)) @@ -9,7 +9,7 @@ // This should work for all POSIX (if needed), but currently all other // supported OS/architecture combinations use either hard-coded values // (such as x86) or have means to determine these values without needing -@@ -79,7 +79,7 @@ PageAllocationGranularityShift() { +@@ -81,7 +81,7 @@ PageAllocationGranularityShift() { return 14; // 16kB #elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS) return static_cast<size_t>(vm_page_shift); @@ -18,7 +18,7 @@ // arm64 supports 4kb (shift = 12), 16kb (shift = 14), and 64kb (shift = 16) // page sizes. Retrieve from or initialize cache. size_t shift = page_characteristics.shift.load(std::memory_order_relaxed); -@@ -100,7 +100,7 @@ PageAllocationGranularity() { +@@ -102,7 +102,7 @@ PageAllocationGranularity() { // This is literally equivalent to |1 << PageAllocationGranularityShift()| // below, but was separated out for IS_APPLE to avoid << on a non-constexpr. return vm_page_size; @@ -27,7 +27,7 @@ // arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or // initialize cache. size_t size = page_characteristics.size.load(std::memory_order_relaxed); -@@ -139,7 +139,7 @@ SystemPageShift() { +@@ -141,7 +141,7 @@ SystemPageShift() { PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t SystemPageSize() { #if (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc index 5ba98fe032f3..b99b75c18061 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-08-31 12:19:35 UTC +--- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-09-24 10:57:32 UTC +++ base/allocator/partition_allocator/partition_address_space.cc -@@ -233,7 +233,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT +@@ -238,7 +238,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT setup_.configurable_pool_ = 0; } diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_time_time.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_time_time.cc deleted file mode 100644 index aa3133e6ce8d..000000000000 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_time_time.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/allocator/partition_allocator/partition_alloc_base/time/time.cc.orig 2022-07-22 17:30:31 UTC -+++ base/allocator/partition_allocator/partition_alloc_base/time/time.cc -@@ -6,7 +6,7 @@ - - #include "build/build_config.h" - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // time.h is a widely included header and its size impacts build time. - // Try not to raise this limit unless necessary. See - // https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md 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 d6413d76da7e..74306761eef5 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,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-07-22 17:30:31 UTC +--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-09-24 10:57:32 UTC +++ base/allocator/partition_allocator/partition_alloc_config.h -@@ -68,7 +68,7 @@ static_assert(sizeof(void*) != 8, ""); +@@ -76,7 +76,7 @@ static_assert(sizeof(void*) != 8, ""); // POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific // features such as futex(2). @@ -9,7 +9,7 @@ #define PA_HAS_LINUX_KERNEL #endif -@@ -187,7 +187,7 @@ constexpr bool kUseLazyCommit = false; +@@ -195,7 +195,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. @@ -18,12 +18,12 @@ #define PA_HAS_ATFORK_HANDLER #endif -@@ -227,7 +227,7 @@ constexpr bool kUseLazyCommit = false; +@@ -235,7 +235,7 @@ constexpr bool kUseLazyCommit = false; // // Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to // larger slot spans. -#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) +#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD) #define PA_PREFER_SMALLER_SLOT_SPANS - #endif // BUILDFLAG(IS_LINUX) + #endif // BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h index df44ff1d52bf..f8d6e94a9a28 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-08-31 12:19:35 UTC +--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-09-24 10:57:32 UTC +++ base/allocator/partition_allocator/partition_alloc_constants.h @@ -91,7 +91,7 @@ PartitionPageShift() { return 18; // 256 KiB @@ -9,12 +9,12 @@ PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t PartitionPageShift() { return PageAllocationGranularityShift() + 2; -@@ -247,7 +247,7 @@ constexpr size_t kSuperPageBaseMask = ~kSuperPageOffse - #if defined(PA_HAS_64_BITS_POINTERS) - // The Configurable Pool is only available in 64-bit mode - constexpr size_t kNumPools = 3; --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Special-case macOS. Contrary to other platforms, there is no sandbox limit - // there, meaning that a single renderer could "happily" consume >8GiB. So the - // 8GiB pool size is a regression. Make the limit higher on this platform only +@@ -270,7 +270,7 @@ constexpr size_t kNumPools = 3; + // Special-case Android and iOS, which incur test failures with larger + // GigaCage. Regardless, allocating >8GiB with malloc() on these platforms is + // unrealistic as of 2022. +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + constexpr size_t kPoolMaxSize = 8 * kGiB; + #else + constexpr size_t kPoolMaxSize = 16 * kGiB; diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h index abf25cf132ff..76c0ca47b9af 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_page.h.orig 2022-06-17 14:20:10 UTC +--- base/allocator/partition_allocator/partition_page.h.orig 2022-09-24 10:57:32 UTC +++ base/allocator/partition_allocator/partition_page.h -@@ -130,13 +130,14 @@ struct SlotSpanMetadata { +@@ -131,13 +131,14 @@ struct SlotSpanMetadata { PartitionBucket<thread_safe>* const bucket = nullptr; // CHECK()ed in AllocNewSlotSpan(). @@ -17,7 +17,7 @@ // System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is // currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code, // so we use the 16 kiB maximum (64 kiB will crash). -@@ -150,7 +151,9 @@ struct SlotSpanMetadata { +@@ -151,7 +152,9 @@ struct SlotSpanMetadata { #endif // defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE) // The maximum number of bits needed to cover all currently supported OSes. static constexpr size_t kMaxSlotsPerSlotSpanBits = 13; 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 a788aa40be35..bb41e042aed2 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,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_root.cc.orig 2022-08-31 12:19:35 UTC +--- base/allocator/partition_allocator/partition_root.cc.orig 2022-09-24 10:57:32 UTC +++ base/allocator/partition_allocator/partition_root.cc @@ -33,7 +33,7 @@ #include "wow64apiset.h" @@ -18,16 +18,16 @@ // 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. -@@ -309,7 +309,7 @@ static size_t PartitionPurgeSlotSpan( +@@ -321,7 +321,7 @@ static size_t PartitionPurgeSlotSpan( constexpr size_t kMaxSlotCount = (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) / - SystemPageSize(); + MaxPurgeableSlotSize(); -#elif BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) -+#elif BUILDFLAG(IS_APPLE) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)) ++#elif BUILDFLAG(IS_APPLE) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) && defined(ARCH_CPU_ARM64)) // It's better for slot_usage to be stack-allocated and fixed-size, which // demands that its size be constexpr. On IS_APPLE and Linux on arm64, // PartitionPageSize() is always SystemPageSize() << 2, so regardless of -@@ -652,7 +652,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions +@@ -709,7 +709,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions // apple OSes. PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || (internal::SystemPageSize() == (size_t{1} << 14))); diff --git a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc index 3bd1d03cc820..04f15603fea3 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc +++ b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc @@ -1,4 +1,4 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2022-05-19 14:06:27 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2022-09-24 10:57:32 UTC +++ base/files/file_path_watcher_unittest.cc @@ -498,7 +498,7 @@ TEST_F(FilePathWatcherTest, MAYBE_WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; @@ -9,7 +9,7 @@ // Mac implementation does not detect files modified in a directory. ASSERT_TRUE(WriteFile(file1, "content v2")); VLOG(1) << "Waiting for file1 modification"; -@@ -1108,7 +1108,7 @@ enum Permission { +@@ -1118,7 +1118,7 @@ enum Permission { Execute }; @@ -18,7 +18,7 @@ bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -1139,7 +1139,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -1149,7 +1149,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi } #endif // BUILDFLAG(IS_APPLE) diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc index 612be1c5ded0..61b17232ca71 100644 --- a/www/chromium/files/patch-base_process_process__metrics.cc +++ b/www/chromium/files/patch-base_process_process__metrics.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics.cc.orig 2022-06-17 14:20:10 UTC +--- base/process/process_metrics.cc.orig 2022-09-25 13:48:17 UTC +++ base/process/process_metrics.cc @@ -17,7 +17,7 @@ namespace base { namespace { @@ -27,16 +27,23 @@ Value meminfo = memory_info_.ToValue(); Value vmstat = vmstat_info_.ToValue(); meminfo.MergeDictionary(&vmstat); -@@ -99,7 +99,7 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create +@@ -99,7 +99,6 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create #endif // !BUILDFLAG(IS_MAC) } -#if !BUILDFLAG(IS_FREEBSD) || !BUILDFLAG(IS_POSIX) -+#if !BUILDFLAG(IS_BSD) || !BUILDFLAG(IS_POSIX) double ProcessMetrics::GetPlatformIndependentCPUUsage() { TimeDelta cumulative_cpu = GetCumulativeCPUUsage(); TimeTicks time = TimeTicks::Now(); -@@ -150,7 +150,7 @@ double ProcessMetrics::GetPreciseCPUUsage() { +@@ -122,7 +121,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( + + return 100.0 * cpu_time_delta / time_delta; + } +-#endif + + #if BUILDFLAG(IS_WIN) + double ProcessMetrics::GetPreciseCPUUsage() { +@@ -150,7 +148,7 @@ double ProcessMetrics::GetPreciseCPUUsage() { #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index dfd8f228a00e..7cf5adc13ca5 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2022-08-31 12:19:35 UTC +--- base/process/process_metrics.h.orig 2022-09-25 07:07:39 UTC +++ base/process/process_metrics.h @@ -36,7 +36,7 @@ #endif @@ -63,7 +63,17 @@ CPU::CoreType GetCoreType(uint32_t core_index); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) -@@ -294,7 +294,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -284,9 +284,7 @@ class BASE_EXPORT ProcessMetrics { + // Used to store the previous times and CPU usage counts so we can + // compute the CPU usage between calls. + TimeTicks last_cpu_time_; +-#if !BUILDFLAG(IS_FREEBSD) || !BUILDFLAG(IS_POSIX) + TimeDelta last_cumulative_cpu_; +-#endif + + #if BUILDFLAG(IS_WIN) + TimeTicks last_cpu_time_for_precise_cpu_usage_; +@@ -294,7 +292,7 @@ class BASE_EXPORT ProcessMetrics { #endif #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -72,7 +82,7 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -337,7 +337,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -337,7 +335,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \ @@ -81,7 +91,7 @@ // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -372,7 +372,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -372,7 +370,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -90,7 +100,7 @@ // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -387,7 +387,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -387,7 +385,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -99,7 +109,7 @@ int buffers = 0; int cached = 0; int active_anon = 0; -@@ -424,7 +424,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK +@@ -424,7 +422,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -108,7 +118,7 @@ // Parse the data found in /proc/<pid>/stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. -@@ -611,7 +611,7 @@ class BASE_EXPORT SystemMetrics { +@@ -611,7 +609,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; diff --git a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc index 33b263a8c1fd..5171fa6f68ba 100644 --- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_freebsd.cc.orig 2022-09-01 05:13:41 UTC +--- base/process/process_metrics_freebsd.cc.orig 2022-09-25 13:48:17 UTC +++ base/process/process_metrics_freebsd.cc @@ -3,20 +3,39 @@ // found in the LICENSE file. @@ -42,31 +42,37 @@ // static std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( -@@ -26,17 +45,18 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create +@@ -24,22 +43,19 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create + return WrapUnique(new ProcessMetrics(process)); + } - double ProcessMetrics::GetPlatformIndependentCPUUsage() { +-double ProcessMetrics::GetPlatformIndependentCPUUsage() { ++TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { struct kinfo_proc info; - int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_}; - size_t length = sizeof(info); + size_t length = sizeof(struct kinfo_proc); ++ struct timeval tv; + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ }; + if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) - return 0; -+ return 0.0; ++ return TimeDelta(); - return (info.ki_pctcpu / FSCALE) * 100.0; -+ return static_cast<double>((info.ki_pctcpu * 100.0) / FSCALE); ++ return Microseconds(info.ki_runtime); } - TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { +-TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { - NOTREACHED(); -+ NOTIMPLEMENTED(); - return TimeDelta(); +- return TimeDelta(); +-} +- + bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const { + return false; } - -@@ -67,4 +87,221 @@ size_t GetSystemCommitCharge() { +@@ -67,4 +83,221 @@ size_t GetSystemCommitCharge() { return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); } diff --git a/www/chromium/files/patch-base_process_process__metrics__openbsd.cc b/www/chromium/files/patch-base_process_process__metrics__openbsd.cc index 7cf86d373978..70b2aa744c6c 100644 --- a/www/chromium/files/patch-base_process_process__metrics__openbsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__openbsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_openbsd.cc.orig 2022-04-21 18:48:31 UTC +--- base/process/process_metrics_openbsd.cc.orig 2022-09-24 10:57:32 UTC +++ base/process/process_metrics_openbsd.cc @@ -6,14 +6,23 @@ @@ -24,17 +24,18 @@ // static std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( ProcessHandle process) { -@@ -24,49 +33,24 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun +@@ -24,49 +33,23 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun return false; } -static int GetProcessCPU(pid_t pid) { -+double ProcessMetrics::GetPlatformIndependentCPUUsage() { ++TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { struct kinfo_proc info; - size_t length; - int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid, - sizeof(struct kinfo_proc), 0 }; + size_t length = sizeof(struct kinfo_proc); ++ struct timeval tv; - if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) - return -1; @@ -45,11 +46,12 @@ - if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) - return 0; -+ return 0.0; ++ return TimeDelta(); - return info.p_pctcpu; -+ return static_cast<double>((info.p_pctcpu * 100.0) / FSCALE); - } +-} ++ tv.tv_sec = info.p_rtime_sec; ++ tv.tv_usec = info.p_rtime_usec; -double ProcessMetrics::GetPlatformIndependentCPUUsage() { - TimeTicks time = TimeTicks::Now(); @@ -66,13 +68,14 @@ - double percentage = static_cast<double>((cpu * 100.0) / FSCALE); - - return percentage; --} -- - TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { - NOTREACHED(); - return TimeDelta(); ++ return Microseconds(TimeValToMicroseconds(tv)); } +-TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { +- NOTREACHED(); +- return TimeDelta(); +-} +- -ProcessMetrics::ProcessMetrics(ProcessHandle process) - : process_(process), - last_cpu_(0) {} @@ -80,7 +83,7 @@ size_t GetSystemCommitCharge() { int mib[] = { CTL_VM, VM_METER }; int pagesize; -@@ -84,6 +68,129 @@ size_t GetSystemCommitCharge() { +@@ -84,6 +67,129 @@ size_t GetSystemCommitCharge() { pagesize = getpagesize(); return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); diff --git a/www/chromium/files/patch-base_process_process__metrics__unittest.cc b/www/chromium/files/patch-base_process_process__metrics__unittest.cc new file mode 100644 index 000000000000..1e4ff0087053 --- /dev/null +++ b/www/chromium/files/patch-base_process_process__metrics__unittest.cc @@ -0,0 +1,20 @@ +--- base/process/process_metrics_unittest.cc.orig 2022-09-24 10:57:32 UTC ++++ base/process/process_metrics_unittest.cc +@@ -44,7 +44,7 @@ namespace debug { + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ + BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + + namespace { + +@@ -347,7 +347,7 @@ TEST_F(SystemMetricsTest, ParseVmstat) { + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ + BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + + // Test that ProcessMetrics::GetPlatformIndependentCPUUsage() doesn't return + // negative values when the number of threads running on the process decreases diff --git a/www/chromium/files/patch-base_system_sys__info__unittest.cc b/www/chromium/files/patch-base_system_sys__info__unittest.cc index 23d8386cb560..aacd03d8d20b 100644 --- a/www/chromium/files/patch-base_system_sys__info__unittest.cc +++ b/www/chromium/files/patch-base_system_sys__info__unittest.cc @@ -1,11 +1,11 @@ ---- base/system/sys_info_unittest.cc.orig 2022-08-31 12:19:35 UTC +--- base/system/sys_info_unittest.cc.orig 2022-09-24 10:57:32 UTC +++ base/system/sys_info_unittest.cc @@ -234,12 +234,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) { EXPECT_TRUE(IsStringUTF8(hardware_info->model)); bool empty_result_expected = #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) | ++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ + BUILDFLAG(IS_BSD) false; #else 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 adf2c80b15ce..f5f436141cb1 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 2022-02-28 16:54:41 UTC +--- base/test/launcher/test_launcher.cc.orig 2022-09-24 10:57:32 UTC +++ base/test/launcher/test_launcher.cc -@@ -63,6 +63,7 @@ - #include "testing/gtest/include/gtest/gtest.h" +@@ -65,6 +65,7 @@ + #include "third_party/libxml/chromium/libxml_utils.h" #if BUILDFLAG(IS_POSIX) +#include <signal.h> diff --git a/www/chromium/files/patch-base_threading_platform__thread.h b/www/chromium/files/patch-base_threading_platform__thread.h index 213431093414..6f887f6c8c6f 100644 --- a/www/chromium/files/patch-base_threading_platform__thread.h +++ b/www/chromium/files/patch-base_threading_platform__thread.h @@ -1,6 +1,6 @@ ---- base/threading/platform_thread.h.orig 2022-08-31 12:19:35 UTC +--- base/threading/platform_thread.h.orig 2022-09-24 10:57:32 UTC +++ base/threading/platform_thread.h -@@ -249,7 +249,7 @@ class BASE_EXPORT PlatformThread { +@@ -253,7 +253,7 @@ class BASE_EXPORT PlatformThread { // Returns a realtime period provided by `delegate`. static TimeDelta GetRealtimePeriod(Delegate* delegate); diff --git a/www/chromium/files/patch-base_threading_platform__thread__linux.cc b/www/chromium/files/patch-base_threading_platform__thread__linux.cc index ed2cf1404bbe..7c88aa9a0057 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__linux.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__linux.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_linux.cc.orig 2022-08-31 12:19:35 UTC +--- base/threading/platform_thread_linux.cc.orig 2022-09-24 10:57:32 UTC +++ base/threading/platform_thread_linux.cc @@ -29,7 +29,9 @@ @@ -19,7 +19,7 @@ const FilePath::CharType kCgroupDirectory[] = FILE_PATH_LITERAL("/sys/fs/cgroup"); -@@ -303,7 +305,7 @@ void SetThreadCgroupsForThreadType(PlatformThreadId th +@@ -304,7 +306,7 @@ void SetThreadCgroupsForThreadType(PlatformThreadId th namespace internal { namespace { @@ -28,7 +28,7 @@ const struct sched_param kRealTimePrio = {8}; #endif } // namespace -@@ -328,7 +330,7 @@ const ThreadTypeToNiceValuePair kThreadTypeToNiceValue +@@ -330,7 +332,7 @@ const ThreadTypeToNiceValuePair kThreadTypeToNiceValue }; bool CanSetThreadTypeToRealtimeAudio() { @@ -37,7 +37,7 @@ // A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke // pthread_setschedparam in SetCurrentThreadTypeForPlatform(). struct rlimit rlim; -@@ -340,7 +342,7 @@ bool CanSetThreadTypeToRealtimeAudio() { +@@ -342,7 +344,7 @@ bool CanSetThreadTypeToRealtimeAudio() { bool SetCurrentThreadTypeForPlatform(ThreadType thread_type, MessagePumpType pump_type_hint) { @@ -46,7 +46,7 @@ // For legacy schedtune interface SetThreadCgroupsForThreadType(PlatformThread::CurrentId(), thread_type); -@@ -359,7 +361,7 @@ bool SetCurrentThreadTypeForPlatform(ThreadType thread +@@ -361,7 +363,7 @@ bool SetCurrentThreadTypeForPlatform(ThreadType thread absl::optional<ThreadPriorityForTest> GetCurrentThreadPriorityForPlatformForTest() { @@ -55,7 +55,7 @@ int maybe_sched_rr = 0; struct sched_param maybe_realtime_prio = {0}; if (pthread_getschedparam(pthread_self(), &maybe_sched_rr, -@@ -378,7 +380,7 @@ GetCurrentThreadPriorityForPlatformForTest() { +@@ -380,7 +382,7 @@ GetCurrentThreadPriorityForPlatformForTest() { void PlatformThread::SetName(const std::string& name) { ThreadIdNameManager::GetInstance()->SetName(name); @@ -64,7 +64,7 @@ // On linux we can get the thread names to show up in the debugger by setting // the process name for the LWP. We don't want to do this for the main // thread because that would rename the process, causing tools like killall -@@ -408,8 +410,10 @@ void PlatformThread::SetThreadType(ProcessId process_i +@@ -410,8 +412,10 @@ void PlatformThread::SetThreadType(ProcessId process_i // priority. CHECK_NE(thread_id, process_id); diff --git a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc index d2b705a17220..6f79a34db482 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_unittest.cc.orig 2022-08-31 12:19:35 UTC +--- base/threading/platform_thread_unittest.cc.orig 2022-09-24 10:57:32 UTC +++ base/threading/platform_thread_unittest.cc @@ -31,7 +31,7 @@ #include "base/time/time.h" @@ -9,7 +9,7 @@ #include <pthread.h> #include <sys/syscall.h> #include <sys/types.h> -@@ -416,7 +416,7 @@ TEST(PlatformThreadTest, +@@ -417,7 +417,7 @@ TEST(PlatformThreadTest, // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this // proprerty changes for a given platform. TEST(PlatformThreadTest, CanChangeThreadType) { @@ -18,7 +18,7 @@ // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be // able to increase priority to any level. constexpr bool kCanIncreasePriority = false; -@@ -515,7 +515,7 @@ TEST(PlatformThreadTest, SetHugeThreadName) { +@@ -523,7 +523,7 @@ TEST(PlatformThreadTest, SetHugeThreadName) { TEST(PlatformThreadTest, GetDefaultThreadStackSize) { size_t stack_size = PlatformThread::GetDefaultThreadStackSize(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || \ @@ -27,7 +27,7 @@ !defined(THREAD_SANITIZER)) || \ (BUILDFLAG(IS_ANDROID) && !defined(ADDRESS_SANITIZER)) EXPECT_EQ(0u, stack_size); -@@ -676,12 +676,16 @@ INSTANTIATE_TEST_SUITE_P( +@@ -684,12 +684,16 @@ INSTANTIATE_TEST_SUITE_P( #endif // BUILDFLAG(IS_APPLE) diff --git a/www/chromium/files/patch-base_time_time.cc b/www/chromium/files/patch-base_time_time.cc deleted file mode 100644 index de90c9b11c34..000000000000 --- a/www/chromium/files/patch-base_time_time.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/time/time.cc.orig 2022-02-28 16:54:41 UTC -+++ base/time/time.cc -@@ -6,7 +6,7 @@ - - #include "build/build_config.h" - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // time.h is a widely included header and its size impacts build time. - // Try not to raise this limit unless necessary. See - // https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md diff --git a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc index e697c602ffd7..4a938cc94c34 100644 --- a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc +++ b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc @@ -1,6 +1,6 @@ ---- base/trace_event/process_memory_dump.cc.orig 2022-06-17 14:20:10 UTC +--- base/trace_event/process_memory_dump.cc.orig 2022-09-24 10:57:32 UTC +++ base/trace_event/process_memory_dump.cc -@@ -106,7 +106,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden +@@ -112,7 +112,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden #if BUILDFLAG(IS_WIN) std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec( new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); @@ -9,12 +9,12 @@ std::unique_ptr<char[]> vec(new char[max_vec_size]); #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) std::unique_ptr<unsigned char[]> vec(new unsigned char[max_vec_size]); -@@ -131,7 +131,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden +@@ -134,7 +134,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden for (size_t i = 0; i < page_count; i++) resident_page_count += vec[i].VirtualAttributes.Valid; -#elif BUILDFLAG(IS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - // TODO(fuchsia): Port, see https://crbug.com/706592. - #elif BUILDFLAG(IS_APPLE) - // mincore in MAC does not fail with EAGAIN. + // TODO(crbug.com/851760): Implement counting resident bytes. + // For now, log and avoid unused variable warnings. + NOTIMPLEMENTED_LOG_ONCE(); diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn index 13b50eb433dd..36a12d51c8be 100644 --- a/www/chromium/files/patch-build_config_BUILD.gn +++ b/www/chromium/files/patch-build_config_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/BUILD.gn.orig 2022-02-28 16:54:41 UTC +--- build/config/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ build/config/BUILD.gn -@@ -218,13 +218,17 @@ config("default_libs") { +@@ -215,13 +215,17 @@ config("default_libs") { "CoreText.framework", "Foundation.framework", ] diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index 345284620bd1..66c08d46c983 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2022-08-31 12:19:35 UTC +--- build/config/compiler/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ build/config/compiler/BUILD.gn -@@ -231,13 +231,16 @@ config("default_include_dirs") { +@@ -222,13 +222,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 +18,7 @@ } # compiler --------------------------------------------------------------------- -@@ -461,6 +464,10 @@ config("compiler") { +@@ -452,6 +455,10 @@ config("compiler") { } } @@ -29,7 +29,7 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_gold) { -@@ -536,7 +543,7 @@ config("compiler") { +@@ -527,7 +534,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -38,7 +38,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] # TODO(hans): Remove this once Clang generates better optimized debug info -@@ -900,7 +907,7 @@ config("compiler_cpu_abi") { +@@ -891,7 +898,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -47,7 +47,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -915,7 +922,7 @@ config("compiler_cpu_abi") { +@@ -906,7 +913,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -56,7 +56,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1243,7 +1250,7 @@ config("compiler_deterministic") { +@@ -1234,7 +1241,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. @@ -65,16 +65,16 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1534,7 +1541,7 @@ config("default_warnings") { - "-Wno-ignored-pragma-optimize", - ] +@@ -1532,7 +1539,7 @@ config("default_warnings") { + ] + } - if (!is_nacl) { + if (!is_nacl && !is_bsd) { - # TODO(https://crbug.com/1300731) Clean up and enable. - cflags += [ "-Wno-unqualified-std-cast-call" ] - -@@ -1727,7 +1734,7 @@ config("no_chromium_code") { + cflags += [ + # TODO(crbug.com/1343975) Evaluate and possibly enable. + "-Wno-deprecated-builtins", +@@ -1705,7 +1712,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] @@ -83,7 +83,7 @@ cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -2241,7 +2248,7 @@ config("afdo_optimize_size") { +@@ -2219,7 +2226,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") { @@ -92,7 +92,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2257,7 +2264,7 @@ config("afdo") { +@@ -2235,7 +2242,7 @@ config("afdo") { cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ] inputs = [ _clang_sample_profile ] } @@ -101,7 +101,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2397,7 +2404,8 @@ config("symbols") { +@@ -2375,7 +2382,8 @@ config("symbols") { } } diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index 7ac34593005c..593898c88069 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 2022-08-31 12:19:35 UTC +--- cc/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ cc/BUILD.gn -@@ -666,7 +666,7 @@ cc_test_static_library("test_support") { +@@ -664,7 +664,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -894,7 +894,6 @@ cc_test("cc_unittests") { +@@ -891,7 +891,6 @@ cc_test("cc_unittests") { data = [ "//components/viz/test/data/" ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc index dd8b95e8c3ff..4b034ff05609 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 2022-08-31 12:19:35 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -125,7 +125,7 @@ +@@ -126,7 +126,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 -@@ -168,16 +168,16 @@ +@@ -169,16 +169,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 -@@ -323,7 +323,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -329,7 +329,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 -@@ -409,7 +409,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -415,7 +415,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) || -@@ -473,7 +473,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -506,7 +506,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. -@@ -556,7 +556,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -589,7 +589,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::RecordStartupProcessCreationTime( -@@ -735,6 +735,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() { +@@ -767,6 +767,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() { // not always enabled on Linux/ChromeOS. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled(); @@ -74,7 +74,7 @@ #else bool enable_gwp_asan = true; #endif -@@ -794,7 +796,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { +@@ -826,7 +828,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { base::internal::TimerBase::InitializeFeatures(); base::InitializeCpuReductionExperiment(); base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures(); @@ -83,7 +83,7 @@ base::MessagePumpLibevent::InitializeFeatures(); #elif BUILDFLAG(IS_MAC) base::PlatformThread::InitializeOptimizedRealtimeThreadingFeature(); -@@ -881,7 +883,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo +@@ -916,7 +918,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo // TODO(crbug.com/1052397): Revisit the macro expression once build flag // switch of lacros-chrome is complete. @@ -92,7 +92,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -911,7 +913,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo +@@ -946,7 +948,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -101,7 +101,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1291,7 +1293,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1336,7 +1338,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -110,7 +110,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) { -@@ -1367,7 +1369,7 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1412,7 +1414,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 9edf54956e68..2dea57c7615f 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 2022-08-31 12:19:35 UTC +--- chrome/app/generated_resources.grd.orig 2022-09-24 10:57:32 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. --> -@@ -3071,7 +3071,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3069,7 +3069,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> -@@ -4801,7 +4801,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4802,7 +4802,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,25 @@ <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> -@@ -8880,7 +8880,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -5439,7 +5439,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> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <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> +@@ -5467,7 +5467,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> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <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> +@@ -8964,7 +8964,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW Google Pay </message> @@ -36,7 +54,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> -@@ -10046,7 +10046,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -10148,7 +10148,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> @@ -45,3 +63,12 @@ <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window."> Minimize </message> +@@ -12211,7 +12211,7 @@ Please help our engineers fix this problem. Tell us wh + Open Anyway + </message> + +- <if expr="is_win or is_macosx or is_linux"> ++ <if expr="is_win or is_macosx or is_posix"> + <message name="IDS_UTILITY_PROCESS_SYSTEM_SIGNALS_NAME" desc="The name of the utility process used to collect system signals. Only spawned on Windows, Mac or Linux."> + System Signals Utilities + </message> diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp index 490b9e95fb3c..8c5fceac2377 100644 --- a/www/chromium/files/patch-chrome_app_settings__strings.grdp +++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp @@ -1,4 +1,4 @@ ---- chrome/app/settings_strings.grdp.orig 2022-08-31 12:19:35 UTC +--- chrome/app/settings_strings.grdp.orig 2022-09-24 10:57:32 UTC +++ chrome/app/settings_strings.grdp @@ -134,7 +134,7 @@ Theme @@ -13,8 +13,8 @@ Use Classic </message> </if> -- <if expr="not is_linux or chromeos_ash or chromeos_lacros or is_fuchsia"> -+ <if expr="not is_posix or chromeos_ash or chromeos_lacros or is_fuchsia"> +- <if expr="not is_linux or is_chromeos or is_fuchsia"> ++ <if expr="not is_posix or is_chromeos or is_fuchsia"> <message name="IDS_SETTINGS_RESET_TO_DEFAULT_THEME" desc="Name of the control which resets the browser theme back to the default theme."> Reset to default </message> diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index c710f6c89a47..74c509468085 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 2022-08-31 12:19:35 UTC +--- chrome/browser/about_flags.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/about_flags.cc -@@ -210,7 +210,7 @@ +@@ -212,7 +212,7 @@ #include "ui/native_theme/native_theme_features.h" #include "ui/ui_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -285,7 +285,7 @@ +@@ -287,7 +287,7 @@ #include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h" // nogncheck #endif // ENABLE_SUPERVISED_USERS @@ -18,7 +18,7 @@ #include "ui/ozone/buildflags.h" #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -390,7 +390,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -392,7 +392,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -27,7 +27,7 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -1214,7 +1214,7 @@ const FeatureEntry::FeatureVariation +@@ -1262,7 +1262,7 @@ const FeatureEntry::FeatureVariation }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -36,7 +36,7 @@ const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, {"DocumentUseClientScore", "false"}, -@@ -3864,7 +3864,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3923,7 +3923,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(base::kOneGroupPerRenderer)}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -45,7 +45,7 @@ { "enable-accelerated-video-decode", flag_descriptions::kAcceleratedVideoDecodeName, -@@ -4501,7 +4501,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4549,7 +4549,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -54,7 +54,7 @@ {"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName, flag_descriptions::kOzonePlatformHintDescription, kOsLinux, MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)}, -@@ -4520,7 +4520,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4568,7 +4568,7 @@ const FeatureEntry kFeatureEntries[] = { password_manager::features::kForceInitialSyncWhenDecryptionFails)}, #endif // BUILDFLAG(IS_LINUX) @@ -63,8 +63,17 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -5217,7 +5217,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(omnibox::kZeroSuggestPrefetching)}, +@@ -4822,7 +4822,7 @@ const FeatureEntry kFeatureEntries[] = { + "FeedCloseRefresh")}, + #endif // BUILDFLAG(IS_ANDROID) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + {"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName, + flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop, + FEATURE_VALUE_TYPE(feed::kWebUiFeed)}, +@@ -5336,7 +5336,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(omnibox::kZeroSuggestPrefetchingOnWeb)}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) @@ -72,7 +81,7 @@ {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -5728,7 +5728,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5873,7 +5873,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kPointerLockOptionsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kPointerLockOptions)}, @@ -81,7 +90,7 @@ {"enable-async-dns", flag_descriptions::kAsyncDnsName, flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, FEATURE_VALUE_TYPE(features::kAsyncDns)}, -@@ -6657,7 +6657,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6791,7 +6791,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -90,7 +99,7 @@ {"global-media-controls-modern-ui", flag_descriptions::kGlobalMediaControlsModernUIName, flag_descriptions::kGlobalMediaControlsModernUIDescription, -@@ -7551,7 +7551,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7651,7 +7651,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -99,7 +108,7 @@ {"quick-commands", flag_descriptions::kQuickCommandsName, flag_descriptions::kQuickCommandsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kQuickCommands)}, -@@ -7862,7 +7862,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7950,7 +7950,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -108,7 +117,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -8428,7 +8428,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8530,7 +8530,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ 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 07fe0677fcd3..55c3b1745326 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 2022-07-22 17:30:31 UTC +--- chrome/browser/browser_process_impl.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/browser_process_impl.cc -@@ -210,7 +210,7 @@ +@@ -211,7 +211,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 -@@ -1166,7 +1166,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1167,7 +1167,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); @@ -18,7 +18,7 @@ ChromeJsErrorReportProcessor::Create(); #endif -@@ -1418,7 +1418,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1426,7 +1426,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_browser__process__impl.h b/www/chromium/files/patch-chrome_browser_browser__process__impl.h index cc6db4b95ae8..da5c7801d61e 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.h +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.h @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.h.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/browser_process_impl.h.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/browser_process_impl.h -@@ -360,7 +360,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -363,7 +363,7 @@ class BrowserProcessImpl : public BrowserProcess, // 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_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd index 9b1896d38d86..8eb993d5f434 100644 --- a/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd @@ -1,6 +1,6 @@ ---- chrome/browser/browser_resources.grd.orig 2022-07-22 17:30:31 UTC +--- chrome/browser/browser_resources.grd.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/browser_resources.grd -@@ -124,7 +124,7 @@ +@@ -120,7 +120,7 @@ <if expr="chromeos_ash"> <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" /> </if> 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 47c64cd7ccf3..82dd66c4421c 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -112,13 +112,13 @@ +@@ -113,13 +113,13 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -16,7 +16,7 @@ #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h" #endif -@@ -184,7 +184,7 @@ +@@ -188,7 +188,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -25,7 +25,7 @@ #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" -@@ -766,7 +766,7 @@ void PopulateChromeFrameBinders( +@@ -780,7 +780,7 @@ void PopulateChromeFrameBinders( #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -34,7 +34,7 @@ if (!render_frame_host->GetParent()) { map->Add<chrome::mojom::DraggableRegions>( base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed)); -@@ -774,7 +774,7 @@ void PopulateChromeFrameBinders( +@@ -788,7 +788,7 @@ void PopulateChromeFrameBinders( #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -43,7 +43,7 @@ if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && render_frame_host->IsInPrimaryMainFrame()) { map->Add<blink::mojom::SubAppsService>( -@@ -829,14 +829,14 @@ void PopulateChromeWebUIFrameBinders( +@@ -843,14 +843,14 @@ void PopulateChromeWebUIFrameBinders( SegmentationInternalsUI>(map); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -60,7 +60,7 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); #endif -@@ -1196,7 +1196,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1235,7 +1235,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 99a2b2c328b8..4e6bede3479c 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 2022-08-31 12:19:35 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -237,11 +237,11 @@ +@@ -239,11 +239,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/breakpad_linux.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -277,7 +277,7 @@ +@@ -279,7 +279,7 @@ // 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) || \ @@ -23,7 +23,7 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h" #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" -@@ -1028,7 +1028,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1025,7 +1025,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -32,7 +32,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 . -@@ -1041,7 +1041,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1038,7 +1038,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { } #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) @@ -41,7 +41,7 @@ // Set the product channel for crash reports. if (!crash_reporter::IsCrashpadEnabled()) { breakpad::SetChannelCrashKey( -@@ -1063,7 +1063,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1060,7 +1060,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) || \ 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 e2c4c2e25b91..36bbe61a8cd5 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 2022-08-31 12:19:35 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -387,7 +387,7 @@ +@@ -386,7 +386,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" -@@ -466,17 +466,17 @@ +@@ -467,17 +467,17 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -30,7 +30,7 @@ #if !BUILDFLAG(IS_ANDROID) #include "base/debug/leak_annotations.h" #include "components/crash/core/app/breakpad_linux.h" -@@ -484,12 +484,12 @@ +@@ -485,12 +485,12 @@ #include "components/crash/content/browser/crash_handler_host_linux.h" #endif @@ -45,7 +45,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) -@@ -513,11 +513,11 @@ +@@ -514,11 +514,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -59,7 +59,7 @@ #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif defined(USE_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -933,7 +933,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo +@@ -927,7 +927,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo int GetCrashSignalFD(const base::CommandLine& command_line) { return crashpad::CrashHandlerHost::Get()->GetDeathSignalSocket(); } @@ -68,7 +68,7 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -1481,7 +1481,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1475,7 +1475,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( is_integration_test, &startup_data_); @@ -77,7 +77,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1520,7 +1520,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1514,7 +1514,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. @@ -86,7 +86,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1541,7 +1541,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1535,7 +1535,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); #endif @@ -95,7 +95,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif defined(USE_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -2310,6 +2310,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2304,6 +2304,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin #elif BUILDFLAG(IS_POSIX) #if BUILDFLAG(IS_ANDROID) bool enable_crash_reporter = true; @@ -104,7 +104,7 @@ #else bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { -@@ -2648,7 +2650,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2653,7 +2655,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); @@ -113,7 +113,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4078,7 +4080,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4096,7 +4098,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -122,7 +122,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4507,14 +4509,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4540,14 +4542,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -139,7 +139,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -4547,7 +4549,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4580,7 +4582,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati // 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_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h index 8a6123ba77b7..800427745d40 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 2022-08-31 12:19:35 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -429,7 +429,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -436,7 +436,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_dev__ui__browser__resources.grd b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd index 32c00e3a60e5..a794ac4cb7de 100644 --- a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd @@ -1,11 +1,11 @@ ---- chrome/browser/dev_ui_browser_resources.grd.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/dev_ui_browser_resources.grd.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/dev_ui_browser_resources.grd @@ -36,7 +36,7 @@ This file specifies browser resources for developer-fa <include name="IDR_PREDICTORS_JS" file="${root_gen_dir}\chrome\browser\resources\predictors\predictors.js" use_base_dir="false" type="BINDATA" /> <include name="IDR_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_JS" file="${root_gen_dir}\chrome\browser\resources\predictors\resource_prefetch_predictor.js" use_base_dir="false" type="BINDATA" /> -- <if expr="is_android or is_linux or chromeos_ash or chromeos_lacros"> -+ <if expr="is_android or is_posix or chromeos_ash or chromeos_lacros"> +- <if expr="is_android or is_linux or is_chromeos"> ++ <if expr="is_android or is_posix or is_chromeos"> <include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_internals\sandbox_internals.html" preprocess="true" type="BINDATA" /> <include name="IDR_SANDBOX_INTERNALS_JS" file="${root_gen_dir}\chrome\browser\resources\sandbox_internals\tsc\sandbox_internals.js" use_base_dir="false" type="BINDATA" /> </if> 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 758f98c0a395..0f41b487e284 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,15 +1,6 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1511,7 +1511,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe - target_info->is_filetype_handled_safely) - DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (item->GetOriginalMimeType() == "application/x-x509-user-cert") - DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); - #endif -@@ -1563,7 +1563,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1552,7 +1552,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +9,7 @@ if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); } -@@ -1679,7 +1679,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1668,7 +1668,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) || \ @@ -27,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()) { -@@ -1721,7 +1721,7 @@ std::unique_ptr<download::DownloadItemRenameHandler> +@@ -1710,7 +1710,7 @@ std::unique_ptr<download::DownloadItemRenameHandler> ChromeDownloadManagerDelegate::GetRenameHandlerForDownload( download::DownloadItem* download_item) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -36,7 +27,7 @@ return enterprise_connectors::FileSystemRenameHandler::CreateIfNeeded( download_item); #else -@@ -1737,7 +1737,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl +@@ -1726,7 +1726,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__file__picker.cc b/www/chromium/files/patch-chrome_browser_download_download__file__picker.cc index 01e3e2bf72d0..15282cd82ac1 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__file__picker.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__file__picker.cc @@ -1,20 +1,20 @@ ---- chrome/browser/download/download_file_picker.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/download/download_file_picker.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/download/download_file_picker.cc -@@ -15,7 +15,7 @@ +@@ -16,7 +16,7 @@ #include "content/public/browser/download_manager.h" #include "content/public/browser/web_contents.h" --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "ui/aura/window.h" -@@ -81,7 +81,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl - // dialog in Linux. See SelectFileImpl() in select_file_dialog_linux_gtk.cc. - // Here we make owning_window host to browser current active window - // if it is null. https://crbug.com/1301898 --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +@@ -84,7 +84,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl + // dialog in Linux (See SelectFileImpl() in select_file_dialog_linux_gtk.cc). + // and windows.Here we make owning_window host to browser current active + // window if it is null. https://crbug.com/1301898 +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) if (!owning_window || !owning_window->GetHost()) { owning_window = BrowserList::GetInstance() ->GetLastActive() 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 ad761738f7c6..d4d4bc81310a 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 2022-08-31 12:19:35 UTC +--- chrome/browser/download/download_item_model.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/download/download_item_model.cc -@@ -709,7 +709,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -731,7 +731,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(); -@@ -751,7 +751,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -773,7 +773,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,3 +18,12 @@ if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); +@@ -1087,7 +1087,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe + return; + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (download_->GetOriginalMimeType() == "application/x-x509-user-cert") { + SetShouldPreferOpeningInBrowser(true); + 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 d167c55d86e6..c90f36e25b3a 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-08-31 12:19:35 UTC +--- 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 -@@ -117,11 +117,11 @@ AnalysisServiceSettings::AnalysisServiceSettings( +@@ -142,11 +142,11 @@ AnalysisServiceSettings::AnalysisServiceSettings( const char* verification_key = kKeyWindowsVerification; #elif BUILDFLAG(IS_MAC) const char* verification_key = kKeyMacVerification; 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 4bef52efb9e8..4d6879f84012 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,15 +1,20 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc -@@ -12,7 +12,7 @@ - #include "components/keyed_service/content/browser_context_dependency_manager.h" +@@ -11,11 +11,11 @@ + #include "chrome/browser/profiles/profile.h" #include "components/keyed_service/core/keyed_service.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "chrome/browser/browser_process.h" + #if BUILDFLAG(IS_MAC) + #include "chrome/browser/enterprise/connectors/device_trust/browser/mac_device_trust_connector_service.h" +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/connectors/device_trust/browser/browser_device_trust_connector_service.h" + #endif // BUILDFLAG(IS_MAC) #include "chrome/browser/policy/chrome_browser_policy_connector.h" -@@ -37,7 +37,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi +@@ -40,7 +40,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi bool DeviceTrustConnectorServiceFactory::ServiceIsCreatedWithBrowserContext() const { @@ -18,7 +23,7 @@ return IsDeviceTrustConnectorFeatureEnabled(); #else return false; -@@ -58,7 +58,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil +@@ -59,7 +59,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil DeviceTrustConnectorService* service = nullptr; @@ -27,3 +32,12 @@ if (IsDeviceTrustConnectorFeatureEnabled()) { auto* key_manager = g_browser_process->browser_policy_connector() ->chrome_browser_cloud_management_controller() +@@ -67,7 +67,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil + #if BUILDFLAG(IS_MAC) + service = new MacDeviceTrustConnectorService( + key_manager, profile->GetPrefs(), g_browser_process->local_state()); +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + service = new BrowserDeviceTrustConnectorService(key_manager, + profile->GetPrefs()); + #endif // BUILDFLAG(IS_MAC) diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc index bec828731e01..3fadf75f5396 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2022-04-21 18:48:31 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc -@@ -23,7 +23,7 @@ +@@ -22,7 +22,7 @@ #include "components/policy/core/common/management/management_service.h" #include "content/public/browser/browser_context.h" diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc index 40dcf1b73df7..fefe0da8ea9f 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig 2022-04-21 18:48:31 UTC +--- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc @@ -13,7 +13,7 @@ @@ -7,14 +7,14 @@ -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/linux_key_rotation_command.h" - #endif // BUILDFLAG(IS_WIN) - -@@ -43,7 +43,7 @@ std::unique_ptr<KeyRotationCommand> KeyRotationCommand + #elif BUILDFLAG(IS_MAC) + #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.h" +@@ -45,7 +45,7 @@ std::unique_ptr<KeyRotationCommand> KeyRotationCommand scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory) { #if BUILDFLAG(IS_WIN) return std::make_unique<WinKeyRotationCommand>(); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return std::make_unique<LinuxKeyRotationCommand>( - std::move(url_loader_factory)); - #else + return std::make_unique<LinuxKeyRotationCommand>(url_loader_factory); + #elif BUILDFLAG(IS_MAC) + return std::make_unique<MacKeyRotationCommand>(url_loader_factory); diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc new file mode 100644 index 000000000000..7f18ab142919 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc @@ -0,0 +1,19 @@ +--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2022-09-24 10:57:32 UTC ++++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc +@@ -18,14 +18,14 @@ + #include "chrome/common/chrome_paths.h" + #include "components/version_info/version_info.h" + +-#if !BUILDFLAG(IS_FUCHSIA) ++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD) + #include "components/crash/core/app/crashpad.h" + #include "third_party/crashpad/crashpad/client/crash_report_database.h" + #endif // !BUILDFLAG(IS_FUCHSIA) + + namespace enterprise_connectors { + +-#if !BUILDFLAG(IS_FUCHSIA) ++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD) + namespace { + // key names used when building the dictionary to pass to the real-time + // reporting API diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h new file mode 100644 index 000000000000..4f490d7695dd --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h @@ -0,0 +1,20 @@ +--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h.orig 2022-09-24 10:57:32 UTC ++++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h +@@ -22,7 +22,7 @@ class BrowserCrashEventRouter + BrowserCrashEventRouter& operator=(const BrowserCrashEventRouter&) = delete; + ~BrowserCrashEventRouter() override; + +-#if !BUILDFLAG(IS_FUCHSIA) ++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD) + void OnCloudReportingLaunched( + enterprise_reporting::ReportScheduler* report_scheduler) override; + #endif // !BUILDFLAG(IS_FUCHSIA) +@@ -32,7 +32,7 @@ class BrowserCrashEventRouter + nullptr; + raw_ptr<policy::ChromeBrowserCloudManagementController> controller_ = nullptr; + +-#if !BUILDFLAG(IS_FUCHSIA) ++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD) + // ReportCrashes() checks the enterprise policy settings, retrieves crash + // reports from the crashpad local database and sends reports that have not + // been sent to the reporting server. diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index a81b4ca28314..9a360fa47537 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 2022-08-31 12:19:35 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1324,6 +1324,10 @@ static_library("extensions") { +@@ -1332,6 +1332,10 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc index 556de08c9226..7d2bff326490 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc @@ -1,8 +1,8 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc -@@ -4,7 +4,7 @@ +@@ -6,7 +6,7 @@ - #include "chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h" + #include "build/build_config.h" -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc index f7956a996d22..dbf2d6e8476f 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2022-07-22 17:30:31 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -821,7 +821,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -818,7 +818,7 @@ void ExternalProviderImpl::CreateExternalProviders( if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, base::MakeRefCounted<ExternalPrefLoader>( -@@ -849,7 +849,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -846,7 +846,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. diff --git a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc index b543e2d173fe..2587bedd0fc1 100644 --- a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc +++ b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2022-07-22 17:30:31 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -224,7 +224,7 @@ const struct { +@@ -254,7 +254,7 @@ const struct { {base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"), kDontBlockChildren}, #endif diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index 3fb496df6d63..9cd5095ee572 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,15 +1,24 @@ ---- chrome/browser/flag_descriptions.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/flag_descriptions.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/flag_descriptions.cc -@@ -6066,7 +6066,7 @@ const char kSideSearchDSESupportDescription[] = +@@ -6226,7 +6226,7 @@ const char kSideSearchDSESupportDescription[] = // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + const char kQuickCommandsName[] = "Quick Commands"; + const char kQuickCommandsDescription[] = + "Enable a text interface to browser features. Invoke with Ctrl-Space."; +@@ -6235,7 +6235,7 @@ const char kQuickCommandsDescription[] = + // BUILDFLAG(IS_FUCHSIA) - const char kDesktopDetailedLanguageSettingsName[] = - "Detailed Language Settings (Desktop)"; -@@ -6087,7 +6087,7 @@ const char kWebShareDescription[] = + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; + const char kFollowingFeedSidepanelDescription[] = + "Enables the following feed in the sidepanel."; +@@ -6249,7 +6249,7 @@ const char kWebShareDescription[] = "platforms."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -18,7 +27,7 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -6107,7 +6107,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -6269,7 +6269,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -27,7 +36,7 @@ const char kCleanUndecryptablePasswordsLinuxName[] = "Cleanup local undecryptable passwords during initial sync flow"; const char kCleanUndecryptablePasswordsLinuxDescription[] = -@@ -6120,7 +6120,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail +@@ -6282,7 +6282,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail "storage and requests initial sync."; #endif // BUILDFLAG(IS_LINUX) @@ -36,7 +45,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -6129,7 +6129,7 @@ const char kSkipUndecryptablePasswordsDescription[] = +@@ -6291,7 +6291,7 @@ const char kSkipUndecryptablePasswordsDescription[] = "there are undecryptable ones."; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -45,7 +54,7 @@ const char kAsyncDnsName[] = "Async DNS resolver"; const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -@@ -6234,7 +6234,7 @@ const char kElasticOverscrollDescription[] = +@@ -6396,7 +6396,7 @@ const char kElasticOverscrollDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 665cfadce008..751a451e6dfd 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,15 +1,15 @@ ---- chrome/browser/flag_descriptions.h.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/flag_descriptions.h.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/flag_descriptions.h -@@ -3477,7 +3477,7 @@ extern const char kSideSearchDSESupportDescription[]; +@@ -3574,7 +3574,7 @@ extern const char kSideSearchDSESupportDescription[]; // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + extern const char kQuickCommandsName[]; + extern const char kQuickCommandsDescription[]; - extern const char kDesktopDetailedLanguageSettingsName[]; - extern const char kDesktopDetailedLanguageSettingsDescription[]; -@@ -3498,7 +3498,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -3591,7 +3591,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -18,7 +18,7 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -3514,12 +3514,12 @@ extern const char kForcePasswordInitialSyncWhenDecrypt +@@ -3607,18 +3607,18 @@ extern const char kForcePasswordInitialSyncWhenDecrypt extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[]; #endif // BUILDFLAG(IS_LINUX) @@ -33,7 +33,14 @@ extern const char kAsyncDnsName[]; extern const char kAsyncDnsDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -@@ -3595,7 +3595,7 @@ extern const char kElasticOverscrollDescription[]; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + extern const char kFollowingFeedSidepanelName[]; + extern const char kFollowingFeedSidepanelDescription[]; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +@@ -3695,7 +3695,7 @@ extern const char kElasticOverscrollDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -41,4 +48,4 @@ + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; - #endif + 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 52ac95b6126d..0882c44bc350 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,4 +1,4 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc @@ -58,8 +58,10 @@ @@ -12,7 +12,7 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" -@@ -523,7 +525,7 @@ void RecordStartupMetrics() { +@@ -516,7 +518,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc index 04207e746447..48fcc827a929 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,6 +1,24 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -788,7 +788,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -174,7 +174,7 @@ + #include "chrome/notification_helper/notification_helper_constants.h" + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "components/metrics/motherboard_metrics_provider.h" + #endif + +@@ -721,7 +721,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic + metrics_service_->RegisterMetricsProvider( + std::make_unique<metrics::CPUMetricsProvider>()); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + metrics_service_->RegisterMetricsProvider( + std::make_unique<metrics::MotherboardMetricsProvider>()); + #endif +@@ -798,7 +798,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +27,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); -@@ -880,7 +880,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -890,7 +890,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -17,8 +35,8 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); - metrics_service_->RegisterMetricsProvider( -@@ -1065,7 +1065,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) +@@ -1073,7 +1073,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve #endif // 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_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc index 4cd29aee741b..4dd9b33bb05b 100644 --- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,4 +1,4 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -91,7 +91,7 @@ @@ -9,7 +9,7 @@ #include "chrome/common/chrome_paths_internal.h" #include "chrome/grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" -@@ -174,7 +174,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -173,7 +173,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) -@@ -479,7 +479,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -484,7 +484,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -27,10 +27,10 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -546,7 +546,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe - registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string()); - registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist, - std::string()); +@@ -556,7 +556,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe + registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); + #endif // BUILDFLAG(IS_CHROMEOS_LACROS) + -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, diff --git a/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc b/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc index 5800a8f3fd1a..022a3a4941ca 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/password_manager/password_reuse_manager_factory.cc -@@ -94,7 +94,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic +@@ -92,7 +92,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic // 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) || \ 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 be2c80b28e37..7a941f3473c5 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,24 +1,30 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -189,7 +189,7 @@ +@@ -189,12 +189,12 @@ + #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "components/device_signals/core/browser/pref_names.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) #include "chrome/browser/web_applications/policy/web_app_settings_policy_handler.h" #endif -@@ -722,7 +722,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - { key::kDefaultGeolocationSetting, +@@ -725,7 +725,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, -- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ +- || BUILDFLAG(IS_FUCHSIA) ++ || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, -@@ -1329,7 +1329,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1330,7 +1330,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -27,7 +33,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1398,12 +1398,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1400,18 +1400,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -39,10 +45,26 @@ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + { key::kUnmanagedDeviceSignalsConsentFlowEnabled, + device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, + base::Value::Type::BOOLEAN }, + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ +- || BUILDFLAG(IS_FUCHSIA) ++ || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1584,7 +1584,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1424,7 +1424,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) \ +- || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + { key::kAutoplayAllowed, + prefs::kAutoplayAllowed, + base::Value::Type::BOOLEAN }, +@@ -1609,7 +1609,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS) @@ -51,16 +73,16 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -1642,7 +1642,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::BOOLEAN }, +@@ -1668,7 +1668,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA)) -+#if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)) + #if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) \ +- || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA)) ++ || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA)) || BUILDFLAG(IS_BSD) { key::kChromeAppsEnabled, extensions::pref_names::kChromeAppsEnabled, base::Value::Type::BOOLEAN }, -@@ -1975,7 +1975,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2007,7 +2007,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -69,7 +91,7 @@ handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -2004,7 +2004,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2036,7 +2036,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) || \ @@ -78,7 +100,7 @@ signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>( key::kForceBrowserSignin, prefs::kForceBrowserSignin, base::Value::Type::BOOLEAN)); -@@ -2337,7 +2337,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2369,7 +2369,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH chrome_schema)); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -87,7 +109,7 @@ handlers->AddHandler( std::make_unique<web_app::WebAppSettingsPolicyHandler>(chrome_schema)); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -2350,7 +2350,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2382,7 +2382,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -96,7 +118,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -2358,7 +2358,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2390,7 +2390,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) 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 b5e0be2f6760..201f280e06f0 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,13 +1,13 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -442,14 +442,14 @@ +@@ -439,14 +439,14 @@ #include "components/os_crypt/os_crypt.h" #endif --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#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/web_applications/url_handler_prefs.h" + #include "components/device_signals/core/browser/pref_names.h" #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch @@ -17,16 +17,23 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -1246,7 +1246,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1214,7 +1214,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_WIN) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) web_app::url_handler_prefs::RegisterLocalStatePrefs(registry); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + +@@ -1531,13 +1531,13 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync + safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry); #endif -@@ -1567,7 +1567,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + device_signals::RegisterProfilePrefs(registry); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) // 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_printing_print__job__worker.cc b/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc index 66c0b9e4b39e..33fb7b94c459 100644 --- a/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc +++ b/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc @@ -1,6 +1,6 @@ ---- chrome/browser/printing/print_job_worker.cc.orig 2022-07-22 17:30:31 UTC +--- chrome/browser/printing/print_job_worker.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/printing/print_job_worker.cc -@@ -209,7 +209,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value:: +@@ -195,7 +195,7 @@ void PrintJobWorker::SetSettings(base::Value::Dict new crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>( print_backend->GetPrinterDriverInfo(printer_name)); 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 681e7a96a459..5a1f59c85661 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 2022-08-31 12:19:35 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -251,7 +251,7 @@ +@@ -255,7 +255,7 @@ #include "chrome/browser/ui/cocoa/screentime/screentime_features.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/idle/idle_service_factory.h" #endif -@@ -428,11 +428,11 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -435,11 +435,11 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // 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_profiles_profile__impl.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc index df9ed9f6799f..88b837f30cf5 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_impl.cc.orig 2022-07-22 17:30:31 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -259,6 +259,10 @@ +@@ -261,6 +261,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #endif @@ -11,7 +11,7 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -847,7 +851,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -851,7 +855,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc index 6eb8961c3863..014e10c0cde4 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profiles_state.cc.orig 2022-07-22 17:30:31 UTC +--- chrome/browser/profiles/profiles_state.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/profiles/profiles_state.cc -@@ -178,7 +178,7 @@ bool IsGuestModeRequested(const base::CommandLine& com +@@ -181,7 +181,7 @@ bool IsGuestModeRequested(const base::CommandLine& com PrefService* local_state, bool show_warning) { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ diff --git a/www/chromium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts b/www/chromium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts index 529bf50f38a8..b8cd2cb5a76b 100644 --- a/www/chromium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts +++ b/www/chromium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts @@ -1,11 +1,11 @@ ---- chrome/browser/resources/sandbox_internals/sandbox_internals.ts.orig 2022-07-22 17:30:31 UTC +--- chrome/browser/resources/sandbox_internals/sandbox_internals.ts.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/resources/sandbox_internals/sandbox_internals.ts @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. --// <if expr="is_linux or chromeos_ash or chromeos_lacros"> -+// <if expr="is_posix or chromeos_ash or chromeos_lacros"> +-// <if expr="is_linux or is_chromeos"> ++// <if expr="is_posix or is_chromeos"> import './strings.m.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; @@ -13,8 +13,8 @@ } // </if> --// <if expr="is_linux or chromeos_ash or chromeos_lacros"> -+// <if expr="is_posix or chromeos_ash or chromeos_lacros"> +-// <if expr="is_linux or is_chromeos"> ++// <if expr="is_posix or is_chromeos"> /** * Adds a status row that reports either Yes or No. @@ -22,8 +22,8 @@ // <if expr="is_android"> androidHandler(); // </if> -- // <if expr="is_linux or chromeos_ash or chromeos_lacros"> -+ // <if expr="is_posix or chromeos_ash or chromeos_lacros"> +- // <if expr="is_linux or is_chromeos"> ++ // <if expr="is_posix or is_chromeos"> linuxHandler(); // </if> }); diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css b/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css index 543e7266512f..83e42eea211d 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css +++ b/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css @@ -1,11 +1,11 @@ ---- chrome/browser/resources/settings/autofill_page/passwords_shared.css.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/resources/settings/autofill_page/passwords_shared.css.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/resources/settings/autofill_page/passwords_shared.css -@@ -72,7 +72,7 @@ cr-input.password-input::part(input), +@@ -90,7 +90,7 @@ cr-input.password-input::part(input), * necessary to prevent Chrome from using the operating system's font * instead of the Material Design font. * TODO(dbeam): why not font: inherit? */ --<if expr="is_linux or chromeos_ash or chromeos_lacros"> -+<if expr="is_posix or chromeos_ash or chromeos_lacros"> +-<if expr="is_linux or is_chromeos"> ++<if expr="is_posix or is_chromeos"> font-family: 'DejaVu Sans Mono', monospace; </if> <if expr="is_win"> 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 8b9235e59d69..605b99aed469 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_route.ts +++ b/www/chromium/files/patch-chrome_browser_resources_settings_route.ts @@ -1,8 +1,8 @@ ---- chrome/browser/resources/settings/route.ts.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/resources/settings/route.ts.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/resources/settings/route.ts -@@ -187,7 +187,7 @@ function createBrowserSettingsRoutes(): Partial<Settin - - r.ACCESSIBILITY = r.ADVANCED.createSection('/accessibility', 'a11y'); +@@ -204,7 +204,7 @@ function createBrowserSettingsRoutes(): Partial<Settin + r.ACCESSIBILITY = r.ADVANCED.createSection( + '/accessibility', 'a11y', loadTimeData.getString('a11yPageTitle')); - // <if expr="is_linux"> + // <if expr="is_posix"> diff --git a/www/chromium/files/patch-chrome_browser_resources_signin_signin__shared.css b/www/chromium/files/patch-chrome_browser_resources_signin_signin__shared.css index 87281547034e..ffd17b4b1503 100644 --- a/www/chromium/files/patch-chrome_browser_resources_signin_signin__shared.css +++ b/www/chromium/files/patch-chrome_browser_resources_signin_signin__shared.css @@ -1,11 +1,11 @@ ---- chrome/browser/resources/signin/signin_shared.css.orig 2022-07-22 17:30:31 UTC +--- chrome/browser/resources/signin/signin_shared.css.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/resources/signin/signin_shared.css @@ -37,7 +37,7 @@ cr-button + cr-button { margin-inline-start: 8px; } --<if expr="is_macosx or is_linux or chromeos_ash or chromeos_lacros"> -+<if expr="is_macosx or is_posix or chromeos_ash or chromeos_lacros"> +-<if expr="is_macosx or is_linux or is_chromeos"> ++<if expr="is_macosx or is_posix or is_chromeos"> .action-container { flex-flow: row-reverse; justify-content: flex-start; diff --git a/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html b/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html index 948b9dd698b5..cc6bde0a4295 100644 --- a/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html +++ b/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html @@ -1,6 +1,6 @@ ---- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html -@@ -248,7 +248,7 @@ +@@ -326,7 +326,7 @@ consent-confirmation autofocus> $i18n{syncConfirmationConfirmLabel} </cr-button> @@ -9,7 +9,7 @@ <cr-button id="settingsButton" on-click="onGoToSettings_" disabled="[[anyButtonClicked_]]" consent-confirmation> $i18n{syncConfirmationSettingsLabel} -@@ -258,7 +258,7 @@ +@@ -336,7 +336,7 @@ disabled="[[anyButtonClicked_]]"> $i18n{syncConfirmationUndoLabel} </cr-button> @@ -18,7 +18,7 @@ <cr-button id="settingsButton" on-click="onGoToSettings_" disabled="[[anyButtonClicked_]]" consent-confirmation> $i18n{syncConfirmationSettingsLabel} -@@ -301,7 +301,7 @@ +@@ -379,7 +379,7 @@ consent-confirmation> $i18n{syncConfirmationConfirmLabel} </cr-button> @@ -27,7 +27,7 @@ <cr-button id="settingsButton" on-click="onGoToSettings_" disabled="[[anyButtonClicked_]]" consent-confirmation> $i18n{syncConfirmationSettingsLabel} -@@ -311,7 +311,7 @@ +@@ -389,7 +389,7 @@ disabled="[[anyButtonClicked_]]"> $i18n{syncConfirmationUndoLabel} </cr-button> 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 new file mode 100644 index 000000000000..410398e2fa06 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc @@ -0,0 +1,20 @@ +--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2022-09-24 10:57:32 UTC ++++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc +@@ -17,7 +17,7 @@ + #include "net/base/url_util.h" + #include "third_party/abseil-cpp/absl/types/variant.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/local_binary_upload_service_factory.h" + #endif + +@@ -287,7 +287,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil + Profile* profile, + const enterprise_connectors::AnalysisSettings& settings) { + // Local content analysis is supported only on desktop platforms. +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (settings.cloud_or_local_settings.is_cloud_analysis()) { + return CloudBinaryUploadServiceFactory::GetForProfile(profile); + } else { diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc index 391bddbfef9b..f553686e9837 100644 --- a/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc +++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/sharing/sharing_handler_registry_impl.cc @@ -24,7 +24,7 @@ #endif // BUILDFLAG(IS_ANDROID) @@ -9,7 +9,7 @@ #include "chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS_LACROS)) BUILDFLAG(IS_CHROMEOS) -@@ -77,7 +77,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl +@@ -78,7 +78,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc index d3290a87107c..8d2fb6af069e 100644 --- a/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc +++ b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/device_info_sync_client_impl.cc.orig 2022-07-22 17:30:31 UTC +--- chrome/browser/sync/device_info_sync_client_impl.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/sync/device_info_sync_client_impl.cc -@@ -38,7 +38,7 @@ std::string DeviceInfoSyncClientImpl::GetSigninScopedD +@@ -42,7 +42,7 @@ std::string DeviceInfoSyncClientImpl::GetSigninScopedD // in lacros-chrome 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_browser__dialogs.h b/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h index e31a059d60d9..8518361f602e 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h +++ b/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_dialogs.h.orig 2022-07-22 17:30:31 UTC +--- chrome/browser/ui/browser_dialogs.h.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/ui/browser_dialogs.h -@@ -27,7 +27,7 @@ +@@ -25,7 +25,7 @@ #include "ui/base/models/dialog_model.h" #include "ui/gfx/native_widget_types.h" 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 26cd4d6a5ca9..60dc24c504ec 100644 --- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h +++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/chrome_pages.h.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/ui/chrome_pages.h.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/ui/chrome_pages.h @@ -30,7 +30,7 @@ enum class ConsentLevel; } // namespace signin @@ -9,7 +9,7 @@ namespace web_app { enum class AppSettingsPageEntryPoint; } // namespace web_app -@@ -210,7 +210,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, +@@ -213,7 +213,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, #endif #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__view__controller__delegate.h index 3255c96a8b69..eb986edf141b 100644 --- a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h +++ b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/signin_view_controller_delegate.h.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/ui/signin_view_controller_delegate.h.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/ui/signin_view_controller_delegate.h -@@ -80,7 +80,7 @@ class SigninViewControllerDelegate { +@@ -81,7 +81,7 @@ class SigninViewControllerDelegate { #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_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc index 4241012438fa..162f660d5004 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 2022-08-31 12:19:35 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -198,7 +198,7 @@ +@@ -200,7 +200,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/autofill_assistant/common_dependencies_chrome.h" #include "chrome/browser/autofill_assistant/platform_dependencies_desktop.h" #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" -@@ -538,13 +538,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -532,13 +532,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -25,7 +25,7 @@ if (base::FeatureList::IsEnabled( features::kHappinessTrackingSurveysForDesktopDemo) || base::FeatureList::IsEnabled(features::kTrustSafetySentimentSurvey) || -@@ -559,7 +559,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -553,7 +553,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc index 55cbb146ad8b..aa8066b7eabc 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/download/download_item_view.cc.orig 2022-07-22 17:30:31 UTC +--- chrome/browser/ui/views/download/download_item_view.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/ui/views/download/download_item_view.cc @@ -188,7 +188,7 @@ bool UseNewWarnings() { } @@ -7,7 +7,7 @@ -#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) if (UseNewWarnings()) - return STYLE_EMPHASIZED; + return views::style::STYLE_EMPHASIZED; #endif @@ -196,7 +196,7 @@ int GetFilenameStyle(const views::Label& label) { } @@ -16,5 +16,5 @@ -#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) if (UseNewWarnings()) - return STYLE_EMPHASIZED; + return views::style::STYLE_EMPHASIZED; #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc index 2331080a4906..dbb0e3d514b7 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc -@@ -15,7 +15,7 @@ +@@ -16,7 +16,7 @@ #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/frame/browser_frame_view_layout_linux.h" #include "chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.h" #include "chrome/browser/ui/views/frame/browser_frame_view_linux.h" -@@ -33,7 +33,7 @@ namespace { +@@ -34,7 +34,7 @@ namespace { std::unique_ptr<OpaqueBrowserFrameView> CreateOpaqueBrowserFrameView( BrowserFrame* frame, BrowserView* browser_view) { @@ -18,3 +18,12 @@ auto* linux_ui = ui::LinuxUi::instance(); auto* profile = browser_view->browser()->profile(); auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); +@@ -74,7 +74,7 @@ std::unique_ptr<BrowserNonClientFrameView> CreateBrows + BrowserFrame* frame, + BrowserView* browser_view) { + // TODO(https://crbug.com/1346734): Enable it on all platforms. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (browser_view->browser()->is_type_picture_in_picture()) { + return std::make_unique<PictureInPictureBrowserFrameView>(frame, + browser_view); 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 cdcec49b450e..76c057ef36b2 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 2022-08-31 12:19:35 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1990,7 +1990,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2012,7 +2012,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 a6a683742921..d3868eae27dd 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 2022-08-31 12:19:35 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -55,7 +55,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" @@ -9,7 +9,7 @@ #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -552,7 +552,7 @@ OpaqueBrowserFrameView::FrameButtonStyle +@@ -557,7 +557,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; -@@ -762,7 +762,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons +@@ -767,7 +767,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons } void OpaqueBrowserFrameView::WindowIconPressed() { 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 f1dfa80f2ddc..f3cdecb085b9 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 2022-08-31 12:19:35 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -607,7 +607,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -570,7 +570,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 9c4bd69e54e2..828134fba529 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 2022-08-31 12:19:35 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc -@@ -154,7 +154,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom +@@ -160,7 +160,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView( -@@ -436,7 +436,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati +@@ -445,7 +445,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 ab0ccdebb6aa..224b073e670f 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 2022-08-31 12:19:35 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h -@@ -75,7 +75,7 @@ class SigninViewControllerDelegateViews +@@ -76,7 +76,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__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index e1b0fc513e63..18bba4a996bd 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -479,7 +479,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -476,7 +476,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. // - Chrome OS // Releasing capture on Ash cancels gestures so avoid it. @@ -9,7 +9,7 @@ can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); -@@ -1032,7 +1032,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -1029,7 +1029,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -1983,7 +1983,7 @@ void TabDragController::CompleteDrag() { +@@ -1944,7 +1944,7 @@ void TabDragController::CompleteDrag() { } // If source window was maximized - maximize the new window as well. @@ -27,7 +27,7 @@ // Keeping maximized state breaks snap to Grid on Windows when dragging // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in -@@ -2376,7 +2376,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2334,7 +2334,7 @@ TabDragController::Liveness TabDragController::GetLoca } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_web__applications_app__browser__controller.cc b/www/chromium/files/patch-chrome_browser_ui_web__applications_app__browser__controller.cc index 4cf2e449fb75..66d54028b235 100644 --- a/www/chromium/files/patch-chrome_browser_ui_web__applications_app__browser__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_web__applications_app__browser__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/web_applications/app_browser_controller.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/ui/web_applications/app_browser_controller.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/ui/web_applications/app_browser_controller.cc -@@ -408,7 +408,7 @@ CustomThemeSupplier* AppBrowserController::GetThemeSup +@@ -428,7 +428,7 @@ CustomThemeSupplier* AppBrowserController::GetThemeSup } bool AppBrowserController::ShouldUseSystemTheme() const { 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 59abbc1afd10..c19abad07af8 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2022-09-14 21:13:04 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -308,7 +308,7 @@ +@@ -309,7 +309,7 @@ #include "chrome/browser/ui/webui/app_launcher_page_ui.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" #endif -@@ -333,17 +333,17 @@ +@@ -335,17 +335,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 -@@ -696,7 +696,7 @@ bool IsAboutUI(const GURL& url) { +@@ -698,7 +698,7 @@ bool IsAboutUI(const GURL& url) { #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -48,7 +48,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -1190,7 +1190,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1193,7 +1193,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) -@@ -1250,27 +1250,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1253,27 +1253,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_ntp_app__launcher__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc index 1b5d810e3576..0f23441bb7de 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc @@ -325,7 +325,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI bool is_deprecated_app = false; @@ -9,7 +9,7 @@ is_deprecated_app = extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id()); #endif -@@ -1426,7 +1426,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: +@@ -1427,7 +1427,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: options.os_hooks[web_app::OsHookType::kUninstallationViaOsSettings] = web_app->CanUserUninstallWebApp(); 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 6f7b2a4c6bf7..ceffae7b2326 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -117,7 +117,7 @@ +@@ -116,7 +116,7 @@ #include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h" #endif @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -138,7 +138,7 @@ +@@ -137,7 +137,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -18,7 +18,7 @@ #include "ui/ozone/public/ozone_platform.h" #endif -@@ -381,7 +381,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -360,7 +360,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT}, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, -@@ -389,7 +389,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -368,7 +368,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif @@ -36,7 +36,7 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -413,7 +413,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -392,7 +392,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_ui_window__sizer_window__sizer.cc b/www/chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc index e7a263bab4e9..39a10c10c7c0 100644 --- a/www/chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc +++ b/www/chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/window_sizer/window_sizer.cc.orig 2022-06-17 14:20:10 UTC +--- chrome/browser/ui/window_sizer/window_sizer.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/ui/window_sizer/window_sizer.cc -@@ -172,7 +172,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( +@@ -173,7 +173,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( browser, window_bounds, show_state); } diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc index b921cc1742c4..7d2554f0e235 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2022-06-17 14:20:10 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut.cc -@@ -44,7 +44,7 @@ namespace { +@@ -45,7 +45,7 @@ namespace { #if BUILDFLAG(IS_MAC) const int kDesiredIconSizesForShortcut[] = {16, 32, 128, 256, 512}; @@ -9,16 +9,25 @@ // Linux supports icons of any size. FreeDesktop Icon Theme Specification states // that "Minimally you should install a 48x48 icon in the hicolor theme." const int kDesiredIconSizesForShortcut[] = {16, 32, 48, 128, 256, 512}; -@@ -147,7 +147,7 @@ ScopedShortcutOverrideForTesting::~ScopedShortcutOverr +@@ -130,7 +130,7 @@ std::string GetAllFilesInDir(const base::FilePath& fil + } // namespace + + ScopedShortcutOverrideForTesting::ScopedShortcutOverrideForTesting() { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auto callback = base::BindRepeating( + [](ScopedShortcutOverrideForTesting* scoped_override, + base::FilePath filename, std::string xdg_command, +@@ -163,7 +163,7 @@ ScopedShortcutOverrideForTesting::~ScopedShortcutOverr } } } -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - directories = {&desktop}; - #endif - for (base::ScopedTempDir* dir : directories) { -@@ -191,7 +191,7 @@ std::unique_ptr<ScopedShortcutOverrideForTesting> Over + // Reset the file handling callback. + SetUpdateMimeInfoDatabaseOnLinuxCallbackForTesting( + UpdateMimeInfoDatabaseOnLinuxCallback()); +@@ -210,7 +210,7 @@ std::unique_ptr<ScopedShortcutOverrideForTesting> Over scoped_override->chrome_apps_folder.CreateUniqueTempDirUnderPath( base_path); DCHECK(success); @@ -27,7 +36,7 @@ bool success = scoped_override->desktop.CreateUniqueTempDirUnderPath(base_path); DCHECK(success); -@@ -211,7 +211,7 @@ std::unique_ptr<ScopedShortcutOverrideForTesting> Over +@@ -230,7 +230,7 @@ std::unique_ptr<ScopedShortcutOverrideForTesting> Over #elif BUILDFLAG(IS_MAC) bool success = scoped_override->chrome_apps_folder.CreateUniqueTempDir(); DCHECK(success); diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h index 0f2ee6457227..4f9113108317 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h +++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2022-05-19 14:06:27 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut.h @@ -19,7 +19,7 @@ #include "ui/gfx/image/image_family.h" @@ -9,7 +9,16 @@ #include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h" #endif // BUILDFLAG(IS_LINUX) -@@ -48,7 +48,7 @@ struct ScopedShortcutOverrideForTesting { +@@ -33,7 +33,7 @@ class ImageSkia; + + namespace web_app { + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + struct LinuxFileRegistration { + std::string xdg_command; + std::string file_contents; +@@ -61,7 +61,7 @@ struct ScopedShortcutOverrideForTesting { #elif BUILDFLAG(IS_MAC) base::ScopedTempDir chrome_apps_folder; std::map<base::FilePath, bool> startup_enabled; @@ -17,8 +26,8 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::ScopedTempDir desktop; base::ScopedTempDir startup; - #endif -@@ -91,7 +91,7 @@ struct ShortcutInfo { + std::vector<LinuxFileRegistration> linux_file_registration; +@@ -107,7 +107,7 @@ struct ShortcutInfo { std::set<std::string> file_handler_extensions; std::set<std::string> file_handler_mime_types; std::set<std::string> protocol_handlers; diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc index a2ae4e1460e1..4638ae0eb2e8 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/web_app_provider.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/web_applications/web_app_provider.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/web_applications/web_app_provider.cc -@@ -265,7 +265,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile +@@ -271,7 +271,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile protocol_handler_manager.get()); std::unique_ptr<UrlHandlerManager> url_handler_manager; 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 09f056354317..6cdaa0fc7db1 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 2022-08-31 12:19:35 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -662,7 +662,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl +@@ -668,7 +668,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl } } diff --git a/www/chromium/files/patch-chrome_common_channel__info.h b/www/chromium/files/patch-chrome_common_channel__info.h index d90a2ca8726d..c7cfd27348bc 100644 --- a/www/chromium/files/patch-chrome_common_channel__info.h +++ b/www/chromium/files/patch-chrome_common_channel__info.h @@ -1,6 +1,6 @@ ---- chrome/common/channel_info.h.orig 2022-02-28 16:54:41 UTC +--- chrome/common/channel_info.h.orig 2022-09-24 10:57:32 UTC +++ chrome/common/channel_info.h -@@ -107,7 +107,7 @@ std::string GetChannelSuffixForDataDir(); +@@ -106,7 +106,7 @@ std::string GetChannelSuffixForDataDir(); // 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_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index 99d92c8d1bf8..969f48c209b4 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/chromium/files/patch-chrome_common_chrome__features.cc @@ -1,4 +1,4 @@ ---- chrome/common/chrome_features.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/common/chrome_features.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/common/chrome_features.cc @@ -90,7 +90,7 @@ const base::Feature kAsyncDns { }; @@ -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. -@@ -276,7 +276,7 @@ const base::Feature kDesktopPWAsDetailedInstallDialog{ +@@ -268,7 +268,7 @@ const base::Feature kDesktopPWAsEnforceWebAppSettingsP // Enables or disables Desktop PWAs to be auto-started on OS login. const base::Feature kDesktopPWAsRunOnOsLogin { "DesktopPWAsRunOnOsLogin", @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -292,7 +292,7 @@ const base::Feature kDesktopPWAsWebBundles{"DesktopPWA +@@ -284,7 +284,7 @@ const base::Feature kDesktopPWAsWebBundles{"DesktopPWA 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. -@@ -314,7 +314,7 @@ const base::Feature kDisruptiveNotificationPermissionR +@@ -306,7 +306,7 @@ const base::Feature kDisruptiveNotificationPermissionR const 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 -@@ -330,7 +330,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa +@@ -322,7 +322,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 -@@ -606,7 +606,7 @@ const base::Feature kIncognitoNtpRevamp{"IncognitoNtpR +@@ -608,7 +608,7 @@ const base::Feature kKioskEnableAppService("KioskEnabl const base::Feature kUpdateHistoryEntryPointsInIncognito{ "UpdateHistoryEntryPointsInIncognito", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -63,7 +63,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) const base::Feature kLinuxLowMemoryMonitor{"LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT}; -@@ -619,7 +619,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -621,7 +621,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 59570d9f4064..c70f1ce0be3d 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.h +++ b/www/chromium/files/patch-chrome_common_chrome__features.h @@ -1,4 +1,4 @@ ---- chrome/common/chrome_features.h.orig 2022-08-31 12:19:35 UTC +--- chrome/common/chrome_features.h.orig 2022-09-24 10:57:32 UTC +++ chrome/common/chrome_features.h @@ -81,7 +81,7 @@ extern const base::Feature kAppShimNewCloseBehavior; COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns; @@ -18,7 +18,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBackgroundModeAllowRestart; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -210,7 +210,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -204,7 +204,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kDesktopPWAsWebBundles; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kChromeAppsDeprecation; COMPONENT_EXPORT(CHROME_FEATURES) -@@ -424,7 +424,7 @@ extern const base::Feature kIncognitoNtpRevamp; +@@ -429,7 +429,7 @@ extern const base::Feature kKioskEnableAppService; COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kUpdateHistoryEntryPointsInIncognito; @@ -36,7 +36,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kLinuxLowMemoryMonitor; COMPONENT_EXPORT(CHROME_FEATURES) -@@ -433,7 +433,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -438,7 +438,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index 29cc1f47fa21..9962ce5262ed 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.cc +++ b/www/chromium/files/patch-chrome_common_pref__names.cc @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/common/pref_names.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/common/pref_names.cc -@@ -1222,7 +1222,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox +@@ -1249,7 +1249,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif -@@ -1317,7 +1317,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1348,7 +1348,7 @@ const char kShowUpdatePromotionInfoBar[] = // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -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). const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -1822,7 +1822,7 @@ const char kDownloadDirUpgraded[] = "download.director +@@ -1854,7 +1854,7 @@ const char kDownloadDirUpgraded[] = "download.director const char kDownloadLastCompleteTime[] = "download.last_complete_time"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +27,7 @@ const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -2119,7 +2119,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i +@@ -2151,7 +2151,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i // its isolation requirements. const char kWebAppsIsolationState[] = "web_apps.isolation_state"; @@ -36,7 +36,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) // Dictionary that maps origins to web apps that can act as URL handlers. const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info"; -@@ -2219,7 +2219,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled +@@ -2251,7 +2251,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled // requests. const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -45,7 +45,7 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. const char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3248,7 +3248,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto +@@ -3275,7 +3275,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto const char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index dff7f9b8a7e2..88f949986cb5 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.h +++ b/www/chromium/files/patch-chrome_common_pref__names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2022-08-31 12:19:35 UTC +--- chrome/common/pref_names.h.orig 2022-09-24 10:57:32 UTC +++ chrome/common/pref_names.h -@@ -382,7 +382,7 @@ extern const char kUseAshProxy[]; +@@ -389,7 +389,7 @@ extern const char kUseAshProxy[]; #endif // BUILDFLAG(IS_CHROMEOS_LACROS) // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -407,7 +407,7 @@ extern const char kShowUpdatePromotionInfoBar[]; +@@ -414,7 +414,7 @@ extern const char kShowUpdatePromotionInfoBar[]; #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ extern const char kUseCustomChromeFrame[]; #endif #if BUILDFLAG(ENABLE_PLUGINS) -@@ -596,7 +596,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[ +@@ -604,7 +604,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[ extern const char kDownloadDirUpgraded[]; extern const char kDownloadLastCompleteTime[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +27,7 @@ extern const char kOpenPdfDownloadInSystemReader[]; #endif #if BUILDFLAG(IS_ANDROID) -@@ -706,7 +706,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps +@@ -714,7 +714,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps extern const char kWebAppsPreferences[]; extern const char kWebAppsIsolationState[]; @@ -36,7 +36,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) extern const char kWebAppsUrlHandlerInfo[]; #endif -@@ -840,7 +840,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] +@@ -846,7 +846,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] extern const char kAmbientAuthenticationInPrivateModesEnabled[]; extern const char kBasicAuthOverHttpEnabled[]; @@ -45,7 +45,7 @@ extern const char kAuthNegotiateDelegateByKdcPolicy[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -1109,7 +1109,7 @@ extern const char kBlockAutoplayEnabled[]; +@@ -1115,7 +1115,7 @@ extern const char kBlockAutoplayEnabled[]; #endif extern const char kSandboxExternalProtocolBlocked[]; 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 0aee7e7a68ec..070778f0e95a 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 2022-08-31 12:19:35 UTC +--- chrome/common/webui_url_constants.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/common/webui_url_constants.cc -@@ -473,18 +473,18 @@ const char kOsUIScanningAppURL[] = "os://scanning"; +@@ -478,18 +478,18 @@ const char kOsUIScanningAppURL[] = "os://scanning"; const char kOsUIVersionURL[] = "os://version"; #endif @@ -22,7 +22,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -@@ -499,14 +499,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr +@@ -504,14 +504,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[] = -@@ -521,7 +521,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro +@@ -527,7 +527,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"; -@@ -595,7 +595,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan +@@ -602,7 +602,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 -@@ -801,7 +801,7 @@ const char* const kChromeDebugURLs[] = { +@@ -810,7 +810,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 f8d55d53ee94..bc563fe5fa8c 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 2022-08-31 12:19:35 UTC +--- chrome/common/webui_url_constants.h.orig 2022-09-24 10:57:32 UTC +++ chrome/common/webui_url_constants.h -@@ -403,24 +403,24 @@ extern const char kOsUIScanningAppURL[]; +@@ -407,24 +407,24 @@ extern const char kOsUIScanningAppURL[]; extern const char kOsUIVersionURL[]; #endif @@ -29,7 +29,7 @@ extern const char kChromeUIWebAppSettingsURL[]; extern const char kChromeUIWebAppSettingsHost[]; #endif -@@ -435,14 +435,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; +@@ -439,14 +439,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -46,7 +46,7 @@ extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIEnterpriseProfileWelcomeHost[]; -@@ -454,7 +454,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -459,7 +459,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif diff --git a/www/chromium/files/patch-chrome_services_system__signals_public_cpp_browser_system__signals__service__host__impl.cc b/www/chromium/files/patch-chrome_services_system__signals_public_cpp_browser_system__signals__service__host__impl.cc deleted file mode 100644 index 8a03d8acf037..000000000000 --- a/www/chromium/files/patch-chrome_services_system__signals_public_cpp_browser_system__signals__service__host__impl.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/services/system_signals/public/cpp/browser/system_signals_service_host_impl.cc.orig 2022-07-22 17:30:31 UTC -+++ chrome/services/system_signals/public/cpp/browser/system_signals_service_host_impl.cc -@@ -12,7 +12,7 @@ - #include "content/public/browser/service_process_host.h" // nogncheck - #elif BUILDFLAG(IS_MAC) - #include "chrome/services/system_signals/mac/mac_system_signals_service.h" --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "chrome/services/system_signals/linux/linux_system_signals_service.h" - #endif - -@@ -39,7 +39,7 @@ SystemSignalsServiceHostImpl::GetService() { - return remote_service_.get(); - } - --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - - device_signals::mojom::SystemSignalsService* - SystemSignalsServiceHostImpl::GetService() { diff --git a/www/chromium/files/patch-chrome_services_system__signals_public_cpp_browser_system__signals__service__host__impl.h b/www/chromium/files/patch-chrome_services_system__signals_public_cpp_browser_system__signals__service__host__impl.h deleted file mode 100644 index bd95ae8d3441..000000000000 --- a/www/chromium/files/patch-chrome_services_system__signals_public_cpp_browser_system__signals__service__host__impl.h +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/services/system_signals/public/cpp/browser/system_signals_service_host_impl.h.orig 2022-07-22 17:30:31 UTC -+++ chrome/services/system_signals/public/cpp/browser/system_signals_service_host_impl.h -@@ -11,7 +11,7 @@ - #if BUILDFLAG(IS_WIN) - #include "components/device_signals/core/common/mojom/system_signals.mojom.h" - #include "mojo/public/cpp/bindings/remote.h" --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #include <memory> - #include "components/device_signals/core/common/mojom/system_signals.mojom-forward.h" - #endif -@@ -34,7 +34,7 @@ class SystemSignalsServiceHostImpl - private: - #if BUILDFLAG(IS_WIN) - mojo::Remote<device_signals::mojom::SystemSignalsService> remote_service_; --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - std::unique_ptr<device_signals::mojom::SystemSignalsService> local_service_; - #endif - }; diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index 76b44ad552c4..a210d8ad7038 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 2022-08-31 12:19:35 UTC +--- chrome/test/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ chrome/test/BUILD.gn -@@ -9731,7 +9731,7 @@ test("chrome_app_unittests") { +@@ -9861,7 +9861,7 @@ test("chrome_app_unittests") { "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", ] diff --git a/www/chromium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc b/www/chromium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc index 1f0b694f1ee4..41305b1e68f5 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/keycode_text_conversion_unittest.cc.orig 2022-03-25 21:59:56 UTC +--- chrome/test/chromedriver/keycode_text_conversion_unittest.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/test/chromedriver/keycode_text_conversion_unittest.cc -@@ -64,7 +64,7 @@ std::string ConvertKeyCodeToTextNoError(ui::KeyboardCo +@@ -67,7 +67,7 @@ std::string ConvertKeyCodeToTextNoError(ui::KeyboardCo // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Fails on bots: crbug.com/174962 #define MAYBE_KeyCodeToText DISABLED_KeyCodeToText #else -@@ -101,7 +101,7 @@ TEST(KeycodeTextConversionTest, MAYBE_KeyCodeToText) { +@@ -104,7 +104,7 @@ TEST(KeycodeTextConversionTest, MAYBE_KeyCodeToText) { // 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_test_interaction_interaction__sequence__browser__util.cc b/www/chromium/files/patch-chrome_test_interaction_webui__interaction__test__util.cc index 6f403e8839d8..ab8c3b2a105e 100644 --- a/www/chromium/files/patch-chrome_test_interaction_interaction__sequence__browser__util.cc +++ b/www/chromium/files/patch-chrome_test_interaction_webui__interaction__test__util.cc @@ -1,6 +1,6 @@ ---- chrome/test/interaction/interaction_sequence_browser_util.cc.orig 2022-07-22 17:30:31 UTC -+++ chrome/test/interaction/interaction_sequence_browser_util.cc -@@ -52,7 +52,7 @@ class RenderFrameHost; +--- chrome/test/interaction/webui_interaction_test_util.cc.orig 2022-09-24 10:57:32 UTC ++++ chrome/test/interaction/webui_interaction_test_util.cc +@@ -54,7 +54,7 @@ class RenderFrameHost; namespace { diff --git a/www/chromium/files/patch-chrome_updater_app_app__install.cc b/www/chromium/files/patch-chrome_updater_app_app__install.cc index acec22645cf9..d39f5b445763 100644 --- a/www/chromium/files/patch-chrome_updater_app_app__install.cc +++ b/www/chromium/files/patch-chrome_updater_app_app__install.cc @@ -1,6 +1,6 @@ ---- chrome/updater/app/app_install.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/updater/app/app_install.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/updater/app/app_install.cc -@@ -211,7 +211,7 @@ void AppInstall::WakeCandidate() { +@@ -215,7 +215,7 @@ void AppInstall::WakeCandidate() { update_service_internal, base::WrapRefCounted(this))); } diff --git a/www/chromium/files/patch-chrome_updater_configurator.cc b/www/chromium/files/patch-chrome_updater_configurator.cc index 5da57674da73..10228aa83d14 100644 --- a/www/chromium/files/patch-chrome_updater_configurator.cc +++ b/www/chromium/files/patch-chrome_updater_configurator.cc @@ -1,6 +1,6 @@ ---- chrome/updater/configurator.cc.orig 2022-06-17 14:20:10 UTC +--- chrome/updater/configurator.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/updater/configurator.cc -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ #include "chrome/updater/win/net/network.h" #elif BUILDFLAG(IS_MAC) #include "chrome/updater/mac/net/network.h" diff --git a/www/chromium/files/patch-chrome_updater_device__management_dm__storage.cc b/www/chromium/files/patch-chrome_updater_device__management_dm__storage.cc index 7cc6932e9745..8b92b0bb8e06 100644 --- a/www/chromium/files/patch-chrome_updater_device__management_dm__storage.cc +++ b/www/chromium/files/patch-chrome_updater_device__management_dm__storage.cc @@ -1,4 +1,4 @@ ---- chrome/updater/device_management/dm_storage.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/updater/device_management/dm_storage.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/updater/device_management/dm_storage.cc @@ -70,7 +70,7 @@ bool DeleteObsoletePolicies(const base::FilePath& cach @@ -6,6 +6,15 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // crbug.com/1276162 - implement. + // TODO(crbug.com/1276162) - implement. DMStorage::DMStorage(const base::FilePath& policy_cache_root) - : policy_cache_root_(policy_cache_root) { + : policy_cache_root_(policy_cache_root), +@@ -215,7 +215,7 @@ DMStorage::GetOmahaPolicySettings() const { + return omaha_settings; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/1276162) - implement. + scoped_refptr<DMStorage> GetDefaultDMStorage() { + NOTIMPLEMENTED(); diff --git a/www/chromium/files/patch-chrome_updater_installer.cc b/www/chromium/files/patch-chrome_updater_installer.cc index b6d6c0d7be9b..b0890ef567ba 100644 --- a/www/chromium/files/patch-chrome_updater_installer.cc +++ b/www/chromium/files/patch-chrome_updater_installer.cc @@ -1,6 +1,6 @@ ---- chrome/updater/installer.cc.orig 2022-05-19 14:06:27 UTC +--- chrome/updater/installer.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/updater/installer.cc -@@ -242,7 +242,7 @@ absl::optional<base::FilePath> Installer::GetCurrentIn +@@ -243,7 +243,7 @@ absl::optional<base::FilePath> Installer::GetCurrentIn return path->AppendASCII(pv_.GetString()); } diff --git a/www/chromium/files/patch-chrome_utility_services.cc b/www/chromium/files/patch-chrome_utility_services.cc index f22832e46b19..020df159a333 100644 --- a/www/chromium/files/patch-chrome_utility_services.cc +++ b/www/chromium/files/patch-chrome_utility_services.cc @@ -1,6 +1,15 @@ ---- chrome/utility/services.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/utility/services.cc.orig 2022-09-24 10:57:32 UTC +++ chrome/utility/services.cc -@@ -77,7 +77,7 @@ +@@ -56,7 +56,7 @@ + #include "chrome/services/system_signals/mac/mac_system_signals_service.h" + #endif // BUILDFLAG(IS_MAC) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/services/system_signals/linux/linux_system_signals_service.h" + #endif // BUILDFLAG(IS_LINUX) + +@@ -84,7 +84,7 @@ #include "chrome/services/file_util/file_util_service.h" // nogncheck #endif @@ -9,7 +18,16 @@ #include "chrome/services/file_util/document_analysis_service.h" // nogncheck #endif -@@ -261,7 +261,7 @@ auto RunCupsIppParser( +@@ -218,7 +218,7 @@ auto RunMacNotificationService( + } + #endif // BUILDFLAG(IS_MAC) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auto RunSystemSignalsService( + mojo::PendingReceiver<device_signals::mojom::SystemSignalsService> + receiver) { +@@ -287,7 +287,7 @@ auto RunCupsIppParser( } #endif @@ -18,7 +36,16 @@ auto RunDocumentAnalysis( mojo::PendingReceiver<chrome::mojom::DocumentAnalysisService> receiver) { return std::make_unique<DocumentAnalysisService>(std::move(receiver)); -@@ -454,7 +454,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -471,7 +471,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& + services.Add(RunWindowsIconReader); + #endif // BUILDFLAG(IS_WIN) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + services.Add(RunSystemSignalsService); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + +@@ -487,7 +487,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunFileUtil); #endif diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc index 76c6b274c62f..a9732ce7f6f8 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2022-08-31 12:19:35 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2022-09-24 10:57:32 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -92,7 +92,7 @@ +@@ -90,7 +90,7 @@ #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_switches.h" @@ -9,7 +9,7 @@ #include <fontconfig/fontconfig.h> #include <signal.h> #include <sys/prctl.h> -@@ -280,7 +280,7 @@ class CastViewsDelegate : public views::ViewsDelegate +@@ -265,7 +265,7 @@ class CastViewsDelegate : public views::ViewsDelegate #endif // defined(USE_AURA) @@ -18,7 +18,7 @@ base::FilePath GetApplicationFontsDir() { std::unique_ptr<base::Environment> env(base::Environment::Create()); -@@ -326,7 +326,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -311,7 +311,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {cc::switches::kDisableThreadedAnimation, ""}, #endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) @@ -27,7 +27,7 @@ #if defined(ARCH_CPU_X86_FAMILY) // This is needed for now to enable the x11 Ozone platform to work with // current Linux/NVidia OpenGL drivers. -@@ -514,7 +514,7 @@ void CastBrowserMainParts::ToolkitInitialized() { +@@ -482,7 +482,7 @@ void CastBrowserMainParts::ToolkitInitialized() { views_delegate_ = std::make_unique<CastViewsDelegate>(); #endif // defined(USE_AURA) 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 2f59cf8e7b96..1f8ff56cedfc 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 2022-08-31 12:19:35 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2022-09-24 10:57:32 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -470,7 +470,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -434,7 +434,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { diff --git a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc deleted file mode 100644 index 92eda4a3c9b6..000000000000 --- a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chromecast/renderer/cast_content_renderer_client.cc.orig 2022-08-31 12:19:35 UTC -+++ chromecast/renderer/cast_content_renderer_client.cc -@@ -190,7 +190,7 @@ void CastContentRendererClient::RenderFrameCreated( - dispatcher->OnRenderFrameCreated(render_frame); - #endif - --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) - // JsChannelBindings destroys itself when the RenderFrame is destroyed. - JsChannelBindings::Create(render_frame); - #endif diff --git a/www/chromium/files/patch-components_autofill__assistant_browser_autofill__assistant__impl.cc b/www/chromium/files/patch-components_autofill__assistant_browser_autofill__assistant__impl.cc index f2e1fd2a6794..ef3973865890 100644 --- a/www/chromium/files/patch-components_autofill__assistant_browser_autofill__assistant__impl.cc +++ b/www/chromium/files/patch-components_autofill__assistant_browser_autofill__assistant__impl.cc @@ -1,6 +1,6 @@ ---- components/autofill_assistant/browser/autofill_assistant_impl.cc.orig 2022-07-22 17:30:31 UTC +--- components/autofill_assistant/browser/autofill_assistant_impl.cc.orig 2022-09-24 10:57:32 UTC +++ components/autofill_assistant/browser/autofill_assistant_impl.cc -@@ -121,7 +121,7 @@ void AutofillAssistantImpl::GetCapabilitiesByHashPrefi +@@ -150,7 +150,7 @@ void AutofillAssistantImpl::GetCapabilitiesByHashPrefi client_context.set_platform_type(ClientContextProto::PLATFORM_TYPE_ANDROID); #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ 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 7be9d677404c..954da18b222b 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 2022-08-31 12:19:35 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2022-09-24 10:57:32 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -2053,7 +2053,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2057,7 +2057,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc index b413213afd18..830de11bc6e6 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 2022-08-31 12:19:35 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2022-09-24 10:57:32 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -232,7 +232,7 @@ const base::FeatureParam<int> +@@ -237,7 +237,7 @@ const base::FeatureParam<int> 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_crash_core_app_BUILD.gn b/www/chromium/files/patch-components_crash_core_app_BUILD.gn index 539d5ef69911..b763acfdeea8 100644 --- a/www/chromium/files/patch-components_crash_core_app_BUILD.gn +++ b/www/chromium/files/patch-components_crash_core_app_BUILD.gn @@ -1,4 +1,4 @@ ---- components/crash/core/app/BUILD.gn.orig 2022-08-31 12:19:35 UTC +--- components/crash/core/app/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ components/crash/core/app/BUILD.gn @@ -52,7 +52,7 @@ static_library("app") { "crashpad.h", @@ -20,7 +20,7 @@ defines = [ "CRASH_IMPLEMENTATION" ] public_deps = [ ":lib" ] -@@ -89,7 +93,7 @@ static_library("app") { +@@ -93,7 +97,7 @@ static_library("app") { libs = [ "log" ] } @@ -29,7 +29,7 @@ deps += [ "//base:base_static", "//components/crash/core/common", -@@ -97,7 +101,7 @@ static_library("app") { +@@ -101,7 +105,7 @@ static_library("app") { ] } @@ -38,7 +38,7 @@ deps += [ "//third_party/breakpad:client" ] } -@@ -217,11 +221,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { +@@ -221,11 +225,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { # define custom UserStreamDataSources. executable("chrome_crashpad_handler") { sources = [ "chrome_crashpad_handler.cc" ] diff --git a/www/chromium/files/patch-components_device__signals_core_common_signals__features.cc b/www/chromium/files/patch-components_device__signals_core_common_signals__features.cc new file mode 100644 index 000000000000..6399f582c9e8 --- /dev/null +++ b/www/chromium/files/patch-components_device__signals_core_common_signals__features.cc @@ -0,0 +1,11 @@ +--- components/device_signals/core/common/signals_features.cc.orig 2022-09-24 10:57:32 UTC ++++ components/device_signals/core/common/signals_features.cc +@@ -18,7 +18,7 @@ const base::FeatureParam<bool> kDisableAntiVirus{&kNew + const base::FeatureParam<bool> kDisableHotfix{&kNewEvSignalsEnabled, + "DisableHotfix", false}; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + // Enables the consent promo for sharing device signal when a managed user + // signs in on an unmanaged device. This occurs after the sign-in intercept + // and before the sync promo (if enabled) diff --git a/www/chromium/files/patch-components_device__signals_core_common_signals__features.h b/www/chromium/files/patch-components_device__signals_core_common_signals__features.h new file mode 100644 index 000000000000..285808f0b9b6 --- /dev/null +++ b/www/chromium/files/patch-components_device__signals_core_common_signals__features.h @@ -0,0 +1,11 @@ +--- components/device_signals/core/common/signals_features.h.orig 2022-09-24 10:57:32 UTC ++++ components/device_signals/core/common/signals_features.h +@@ -20,7 +20,7 @@ extern const base::FeatureParam<bool> kDisableSettings + extern const base::FeatureParam<bool> kDisableAntiVirus; + extern const base::FeatureParam<bool> kDisableHotfix; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + extern const base::Feature kDeviceSignalsPromoAfterSigninIntercept; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) + diff --git a/www/chromium/files/patch-components_device__signals_core_system__signals_platform__delegate.cc b/www/chromium/files/patch-components_device__signals_core_system__signals_platform__delegate.cc new file mode 100644 index 000000000000..c5dea15ace97 --- /dev/null +++ b/www/chromium/files/patch-components_device__signals_core_system__signals_platform__delegate.cc @@ -0,0 +1,11 @@ +--- components/device_signals/core/system_signals/platform_delegate.cc.orig 2022-09-24 10:57:32 UTC ++++ components/device_signals/core/system_signals/platform_delegate.cc +@@ -11,7 +11,7 @@ namespace device_signals { + + bool CustomFilePathComparator::operator()(const base::FilePath& a, + const base::FilePath& b) const { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On Linux, the file system is case sensitive. + return a < b; + #else 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 6151de64c27b..f02901cd02b6 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,4 +1,4 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2022-08-31 12:19:35 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2022-09-24 10:57:32 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -35,7 +35,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe absl::optional<FeatureConfig> GetClientSideFeatureConfig( @@ -9,7 +9,7 @@ if (kIPHPasswordsAccountStorageFeature.name == feature->name) { absl::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -868,7 +868,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf +@@ -904,7 +904,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 fb5b06694eea..52f6a147d4a7 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,6 +1,6 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2022-08-31 12:19:35 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2022-09-24 10:57:32 UTC +++ components/feature_engagement/public/feature_constants.cc -@@ -23,7 +23,7 @@ const base::Feature kIPHDummyFeature{"IPH_Dummy", +@@ -24,7 +24,7 @@ const base::Feature kIPHDummyFeature{"IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT}; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,8 +9,8 @@ const base::Feature kIPHDesktopSharedHighlightingFeature{ "IPH_DesktopSharedHighlighting", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kIPHDesktopTabGroupsNewGroupFeature{ -@@ -299,7 +299,7 @@ const base::Feature kIPHFollowWhileBrowsingFeature{ - "IPH_FollowWhileBrowsing", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -294,7 +294,7 @@ const base::Feature kIPHOverflowMenuTipFeature{ + "IPH_OverflowMenuTip", base::FEATURE_DISABLED_BY_DEFAULT}; #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 8c9dbeb6812c..78ae6e7b7f8b 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 2022-08-31 12:19:35 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2022-09-24 10:57:32 UTC +++ components/feature_engagement/public/feature_constants.h @@ -32,7 +32,7 @@ extern const base::Feature kIPHDummyFeature; extern const base::Feature kEnableIPH; @@ -9,8 +9,8 @@ extern const base::Feature kIPHDesktopSharedHighlightingFeature; extern const base::Feature kIPHDesktopTabGroupsNewGroupFeature; extern const base::Feature kIPHFocusHelpBubbleScreenReaderPromoFeature; -@@ -181,7 +181,7 @@ extern const base::Feature kIPHPasswordSuggestionsFeat - extern const base::Feature kIPHFollowWhileBrowsingFeature; +@@ -178,7 +178,7 @@ extern const base::Feature kIPHFollowWhileBrowsingFeat + extern const base::Feature kIPHOverflowMenuTipFeature; #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 26a4a21d51a2..9f04d9289bcc 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 2022-07-22 17:30:31 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2022-09-24 10:57:32 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -123,7 +123,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHFollowWhileBrowsingFeature, +@@ -118,7 +118,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHOverflowMenuTipFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -9,7 +9,7 @@ &kIPHDesktopTabGroupsNewGroupFeature, &kIPHFocusHelpBubbleScreenReaderPromoFeature, &kIPHGMCCastStartStopFeature, -@@ -145,7 +145,8 @@ const base::Feature* const kAllFeatures[] = { +@@ -142,7 +142,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 5960285a7e4c..b2714fe28a74 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 2022-08-31 12:19:35 UTC +--- components/feature_engagement/public/feature_list.h.orig 2022-09-24 10:57:32 UTC +++ components/feature_engagement/public/feature_list.h -@@ -227,7 +227,7 @@ DEFINE_VARIATION_PARAM(kIPHFollowWhileBrowsingFeature, +@@ -216,7 +216,7 @@ DEFINE_VARIATION_PARAM(kIPHOverflowMenuTipFeature, "IP #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ DEFINE_VARIATION_PARAM(kIPHDesktopTabGroupsNewGroupFeature, "IPH_DesktopTabGroupsNewGroup"); DEFINE_VARIATION_PARAM(kIPHFocusModeFeature, "IPH_FocusMode"); -@@ -256,7 +256,8 @@ DEFINE_VARIATION_PARAM(kIPHIntentChipFeature, "IPH_Int +@@ -249,7 +249,8 @@ DEFINE_VARIATION_PARAM(kIPHWebUiHelpBubbleTestFeature, // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,16 +19,16 @@ DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardSuggestionFeature, "IPH_AutofillVirtualCardSuggestion"); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || -@@ -363,7 +364,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHPasswordSuggestionsFeature), +@@ -351,7 +352,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHFollowWhileBrowsingFeature), + VARIATION_ENTRY(kIPHOverflowMenuTipFeature), #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(kIPHDesktopTabGroupsNewGroupFeature), VARIATION_ENTRY(kIPHFocusModeFeature), VARIATION_ENTRY(kIPHGlobalMediaControls), -@@ -386,7 +387,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -376,7 +377,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_metrics_motherboard.cc b/www/chromium/files/patch-components_metrics_motherboard.cc new file mode 100644 index 000000000000..0590edf0a74d --- /dev/null +++ b/www/chromium/files/patch-components_metrics_motherboard.cc @@ -0,0 +1,10 @@ +--- components/metrics/motherboard.cc.orig 2022-09-24 10:57:32 UTC ++++ components/metrics/motherboard.cc +@@ -1,6 +1,7 @@ + // Copyright 2022 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. ++// CHECK + + #include "components/metrics/motherboard.h" + diff --git a/www/chromium/files/patch-components_neterror_resources_neterror.js b/www/chromium/files/patch-components_neterror_resources_neterror.js index a2e3f1732075..033e50bea392 100644 --- a/www/chromium/files/patch-components_neterror_resources_neterror.js +++ b/www/chromium/files/patch-components_neterror_resources_neterror.js @@ -1,11 +1,11 @@ ---- components/neterror/resources/neterror.js.orig 2022-07-22 17:30:31 UTC +--- components/neterror/resources/neterror.js.orig 2022-09-24 10:57:32 UTC +++ components/neterror/resources/neterror.js @@ -130,7 +130,7 @@ function detailsButtonClick() { let primaryControlOnLeft = true; // clang-format off --// <if expr="is_macosx or is_ios or is_linux or chromeos_ash or chromeos_lacros or is_android"> -+// <if expr="is_macosx or is_ios or is_bsd or chromeos_ash or chromeos_lacros or is_android"> +-// <if expr="is_macosx or is_ios or is_linux or is_chromeos or is_android"> ++// <if expr="is_macosx or is_ios or is_posix or is_chromeos or is_android"> // clang-format on primaryControlOnLeft = false; // </if> diff --git a/www/chromium/files/patch-components_optimization__guide_core_optimization__guide__util.cc b/www/chromium/files/patch-components_optimization__guide_core_optimization__guide__util.cc new file mode 100644 index 000000000000..a2fe2c360e87 --- /dev/null +++ b/www/chromium/files/patch-components_optimization__guide_core_optimization__guide__util.cc @@ -0,0 +1,11 @@ +--- components/optimization_guide/core/optimization_guide_util.cc.orig 2022-09-24 10:57:32 UTC ++++ components/optimization_guide/core/optimization_guide_util.cc +@@ -25,7 +25,7 @@ optimization_guide::proto::Platform GetPlatform() { + return optimization_guide::proto::PLATFORM_CHROMEOS; + #elif BUILDFLAG(IS_ANDROID) + return optimization_guide::proto::PLATFORM_ANDROID; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return optimization_guide::proto::PLATFORM_LINUX; + #else + return optimization_guide::proto::PLATFORM_UNKNOWN; diff --git a/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc b/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc index bcb0368cd104..e9386bc7eedc 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2022-08-31 12:19:35 UTC +--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2022-09-24 10:57:32 UTC +++ components/password_manager/core/browser/sync/password_sync_bridge.cc -@@ -162,7 +162,7 @@ bool ShouldRecoverPasswordsDuringMerge() { +@@ -177,7 +177,7 @@ bool ShouldRecoverPasswordsDuringMerge() { // Delete the local undecryptable copy when this is MacOS only. #if BUILDFLAG(IS_MAC) return true; @@ -9,7 +9,7 @@ return base::FeatureList::IsEnabled( features::kSyncUndecryptablePasswordsLinux); #else -@@ -171,7 +171,7 @@ bool ShouldRecoverPasswordsDuringMerge() { +@@ -186,7 +186,7 @@ bool ShouldRecoverPasswordsDuringMerge() { } bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() { 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 9e519fe9075a..6ab55fa5c39e 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,6 +1,6 @@ ---- components/password_manager/core/common/password_manager_features.cc.orig 2022-08-31 12:19:35 UTC +--- components/password_manager/core/common/password_manager_features.cc.orig 2022-09-24 10:57:32 UTC +++ components/password_manager/core/common/password_manager_features.cc -@@ -71,7 +71,7 @@ const base::Feature kFillingAcrossAffiliatedWebsites{ +@@ -83,7 +83,7 @@ const base::Feature kFillingAcrossAffiliatedWebsites{ const base::Feature kFillOnAccountSelect = {"fill-on-account-select", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -9,9 +9,9 @@ // When enabled, initial sync will be forced during startup if the password // store has encryption service failures. const base::Feature kForceInitialSyncWhenDecryptionFails = { -@@ -183,14 +183,14 @@ const base::Feature kEnableBiometricAuthenticationInSe - base::FEATURE_DISABLED_BY_DEFAULT}; - #endif +@@ -189,14 +189,14 @@ const base::Feature kRecoverFromNeverSaveAndroid = { + const base::Feature kPasswordStrengthIndicator = { + "PasswordStrengthIndicator", base::FEATURE_DISABLED_BY_DEFAULT}; -#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 de8a68edf23d..e87d494e70e8 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,6 +1,6 @@ ---- components/password_manager/core/common/password_manager_features.h.orig 2022-08-31 12:19:35 UTC +--- components/password_manager/core/common/password_manager_features.h.orig 2022-09-24 10:57:32 UTC +++ components/password_manager/core/common/password_manager_features.h -@@ -31,7 +31,7 @@ extern const base::Feature KEnablePasswordGenerationFo +@@ -37,7 +37,7 @@ extern const base::Feature KEnablePasswordGenerationFo extern const base::Feature kEnablePasswordManagerWithinFencedFrame; extern const base::Feature kFillingAcrossAffiliatedWebsites; extern const base::Feature kFillOnAccountSelect; @@ -9,10 +9,10 @@ extern const base::Feature kForceInitialSyncWhenDecryptionFails; #endif extern const base::Feature kInferConfirmationPasswordField; -@@ -58,10 +58,10 @@ extern const base::Feature kSecondaryServerFieldPredic - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) - extern const base::Feature kEnableBiometricAuthenticationInSettings; - #endif +@@ -63,10 +63,10 @@ extern const base::Feature kPasswordReuseDetectionEnab + extern const base::Feature kPasswordScriptsFetching; + extern const base::Feature kPasswordStrengthIndicator; + extern const base::Feature kRecoverFromNeverSaveAndroid; -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extern const base::Feature kSkipUndecryptablePasswords; diff --git a/www/chromium/files/patch-components_performance__manager_features.cc b/www/chromium/files/patch-components_performance__manager_features.cc deleted file mode 100644 index 7b2cf0e5cd42..000000000000 --- a/www/chromium/files/patch-components_performance__manager_features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/performance_manager/features.cc.orig 2022-03-25 21:59:56 UTC -+++ components/performance_manager/features.cc -@@ -21,7 +21,7 @@ const base::Feature kUrgentDiscardingFromPerformanceMa - "UrgentDiscardingFromPerformanceManager", - // Ash Chrome uses memory pressure evaluator instead of performance manager to - // discard tabs. --#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_DISABLED_BY_DEFAULT - #else - base::FEATURE_ENABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-components_performance__manager_public_features.h b/www/chromium/files/patch-components_performance__manager_public_features.h new file mode 100644 index 000000000000..02c58e004262 --- /dev/null +++ b/www/chromium/files/patch-components_performance__manager_public_features.h @@ -0,0 +1,11 @@ +--- components/performance_manager/public/features.h.orig 2022-09-24 10:57:32 UTC ++++ components/performance_manager/public/features.h +@@ -20,7 +20,7 @@ extern const base::Feature kRunOnMainThread; + + #if !BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #define URGENT_DISCARDING_FROM_PERFORMANCE_MANAGER() false + #else + #define URGENT_DISCARDING_FROM_PERFORMANCE_MANAGER() true diff --git a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc index f29db6c7c658..e16e658226a0 100644 --- a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc +++ b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc @@ -1,6 +1,6 @@ ---- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2022-08-31 12:19:35 UTC +--- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2022-09-24 10:57:32 UTC +++ components/policy/core/browser/policy_pref_mapping_test.cc -@@ -334,7 +334,7 @@ class PolicyTestCase { +@@ -338,7 +338,7 @@ class PolicyTestCase { const std::string os("chromeos_lacros"); #elif BUILDFLAG(IS_IOS) const std::string os("ios"); diff --git a/www/chromium/files/patch-components_policy_resources_policy__templates.json b/www/chromium/files/patch-components_policy_resources_policy__templates.json index 5b9fa629c388..6b1712785f86 100644 --- a/www/chromium/files/patch-components_policy_resources_policy__templates.json +++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json @@ -1,15 +1,15 @@ ---- components/policy/resources/policy_templates.json.orig 2022-08-31 12:19:35 UTC +--- components/policy/resources/policy_templates.json.orig 2022-09-24 10:57:32 UTC +++ components/policy/resources/policy_templates.json -@@ -1442,7 +1442,7 @@ +@@ -1446,7 +1446,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.win7:11-', 'chrome.mac:11-', 'chrome.linux:11-'], + 'supported_on': ['chrome.win7:11-', 'chrome.mac:11-', 'chrome.linux:11-', 'chrome.openbsd:11-', 'chrome.freebsd:11-'], + 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, - 'per_profile': False, -@@ -2570,7 +2570,7 @@ +@@ -2596,7 +2596,7 @@ 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,16 +18,16 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -4336,7 +4336,7 @@ +@@ -4386,7 +4386,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.win:57-', 'chrome.mac:88-', 'chrome.linux:88-'], + 'supported_on': ['chrome.win:57-', 'chrome.mac:88-', 'chrome.linux:88-', 'chrome.openbsd:88-', 'chrome.freebsd:88-'], + 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': False, - 'per_profile': False, -@@ -4365,7 +4365,7 @@ +@@ -4416,7 +4416,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -36,7 +36,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -5331,7 +5331,7 @@ +@@ -5400,7 +5400,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -45,7 +45,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -5392,7 +5392,7 @@ +@@ -5462,7 +5462,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -54,7 +54,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -5458,7 +5458,7 @@ +@@ -5529,7 +5529,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -63,16 +63,16 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -10875,7 +10875,7 @@ +@@ -11143,7 +11143,7 @@ 'owners': ['file://net/cert/OWNERS', 'rsleevi@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-'], + 'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-', 'chrome.openbsd:30-', 'chrome.freebsd:30-'], + 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, - 'per_profile': False, -@@ -10969,7 +10969,7 @@ +@@ -11268,7 +11268,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -81,7 +81,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -13011,7 +13011,7 @@ +@@ -13532,7 +13532,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -90,16 +90,25 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -13869,7 +13869,7 @@ +@@ -14402,7 +14402,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.win:31-', 'chrome.linux:31-', 'chrome_os:31-'], + 'supported_on': ['chrome.win:31-', 'chrome.linux:31-', 'chrome_os:31-', 'chrome.openbsd:31-', 'chrome.freebsd:31-'], + 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, - 'per_profile': True, -@@ -20892,7 +20892,7 @@ +@@ -17239,7 +17239,7 @@ + 'deprecated': True, + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.win:64-', 'chrome.mac:66-', 'android:65-'], +- 'future_on': ['chrome.linux'], ++ 'future_on': ['chrome.linux','chrome.openbsd','chrome.freebsd'], + 'features': { + 'dynamic_refresh': False, + 'per_profile': False, +@@ -21470,7 +21470,7 @@ 'items': { 'type': 'string' } }, # Spell checking is provided by macOS, so can't be controlled on Mac. @@ -108,7 +117,7 @@ 'features': { 'can_be_recommended': False, 'dynamic_refresh': True, -@@ -20923,7 +20923,7 @@ +@@ -21501,7 +21501,7 @@ 'items': { 'type': 'string' } }, # Spell checking is provided by macOS, so can't be controlled on Mac. @@ -117,7 +126,7 @@ 'deprecated': True, 'features': { 'can_be_recommended': False, -@@ -20957,7 +20957,7 @@ +@@ -21535,7 +21535,7 @@ 'items': { 'type': 'string' } }, # Spell checking is provided by macOS, so can't be controlled on Mac. @@ -126,16 +135,16 @@ 'features': { 'can_be_recommended': False, 'dynamic_refresh': True, -@@ -21729,7 +21729,7 @@ +@@ -22319,7 +22319,7 @@ 'owners': ['fbeaufort@chromium.org', 'beccahughes@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.win:66-', 'chrome.linux:66-', 'chrome.mac:66-', 'chrome_os:66-'], + 'supported_on': ['chrome.win:66-', 'chrome.linux:66-', 'chrome.mac:66-', 'chrome_os:66-', 'chrome.openbsd:66-', 'chrome.freebsd:66-'], + 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, - 'per_profile': True, -@@ -26348,7 +26348,7 @@ +@@ -27015,7 +27015,7 @@ 'owners': ['file://services/audio/OWNERS', 'dalecurtis@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -144,7 +153,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -27731,7 +27731,7 @@ If this policy is left unset, privacy screen is disabl +@@ -28415,7 +28415,7 @@ If this policy is left unset, privacy screen is disabl 'owners': ['file://chrome/browser/notifications/OWNERS', 'knollr@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -153,7 +162,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -27755,7 +27755,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google +@@ -28439,7 +28439,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google 'owners': ['file://chrome/browser/notifications/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -162,7 +171,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -28853,7 +28853,7 @@ If you disable this policy, web page scrolling to spec +@@ -29549,7 +29549,7 @@ If you disable this policy, web page scrolling to spec 'owners': ['asumaneev@google.com'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -171,21 +180,21 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -30101,7 +30101,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2 +@@ -30851,7 +30851,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PR }, ], 'default': True, - 'supported_on': ['chrome.win:93-', 'chrome.linux:93-', 'chrome.mac:93-'], + 'supported_on': ['chrome.win:93-', 'chrome.linux:93-', 'chrome.mac:93-', 'chrome.openbsd:93-', 'chrome.freebsd:93-'], + 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, - 'per_profile': True, -@@ -30234,7 +30234,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2 +@@ -30985,7 +30985,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PR 'owners': ['mattm@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.win:104-', 'chrome.mac:104-', 'chrome.linux:104-'], + 'supported_on': ['chrome.win:104-', 'chrome.mac:104-', 'chrome.linux:104-', 'chrome.openbsd:104-', 'chrome.freebsd:104-'], + 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, - 'per_profile': True, diff --git a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py index c73eaa782933..12a691e4a209 100644 --- a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py +++ b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py @@ -1,14 +1,14 @@ ---- components/policy/tools/generate_policy_source.py.orig 2022-03-25 21:59:56 UTC +--- components/policy/tools/generate_policy_source.py.orig 2022-09-24 10:57:32 UTC +++ components/policy/tools/generate_policy_source.py -@@ -49,8 +49,10 @@ PLATFORM_STRINGS = { - 'ios': ['ios'], +@@ -50,8 +50,10 @@ PLATFORM_STRINGS = { + 'fuchsia': ['fuchsia'], 'chrome.win': ['win'], 'chrome.linux': ['linux'], + 'chrome.openbsd': ['openbsd'], + 'chrome.freebsd': ['freebsd'], 'chrome.mac': ['mac'], -- 'chrome.*': ['win', 'mac', 'linux', 'fuchsia'], -+ 'chrome.*': ['win', 'mac', 'linux', 'fuchsia', 'openbsd', 'freebsd'], +- 'chrome.*': ['win', 'mac', 'linux'], ++ 'chrome.*': ['win', 'mac', 'linux', 'openbsd', 'freebsd'], 'chrome.win7': ['win'], } diff --git a/www/chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc b/www/chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc index ee0d7b2f0992..2416c2c807d5 100644 --- a/www/chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc @@ -1,8 +1,8 @@ ---- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2022-07-22 17:30:31 UTC +--- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2022-09-24 10:57:32 UTC +++ components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc @@ -36,6 +36,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi } - screen_ai::SetPreloadedLibraryFilePath(library_path); + screen_ai::StoreComponentBinaryPath(library_path); +#if !BUILDFLAG(IS_BSD) auto* instance = sandbox::policy::SandboxLinux::GetInstance(); diff --git a/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc b/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc index 6a0c338fe352..4a005cd23f28 100644 --- a/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc +++ b/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc @@ -1,11 +1,11 @@ ---- components/sync_device_info/local_device_info_util.cc.orig 2022-05-19 14:06:27 UTC +--- components/sync_device_info/local_device_info_util.cc.orig 2022-09-24 10:57:32 UTC +++ components/sync_device_info/local_device_info_util.cc -@@ -74,7 +74,7 @@ std::string GetPersonalizableDeviceNameInternal(); +@@ -78,7 +78,7 @@ void OnMachineStatisticsLoaded(LocalDeviceNameInfo* na sync_pb::SyncEnums::DeviceType GetLocalDeviceType() { - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS) return sync_pb::SyncEnums_DeviceType_TYPE_CROS; --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return sync_pb::SyncEnums_DeviceType_TYPE_LINUX; #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) return ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET diff --git a/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc b/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc index 29f412422f87..1edb88b39884 100644 --- a/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc +++ b/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc @@ -1,8 +1,8 @@ ---- components/sync_device_info/local_device_info_util_linux.cc.orig 2022-04-21 18:48:31 UTC +--- components/sync_device_info/local_device_info_util_linux.cc.orig 2022-09-24 10:57:32 UTC +++ components/sync_device_info/local_device_info_util_linux.cc -@@ -14,6 +14,11 @@ - #include "chromeos/constants/devicetype.h" // nogncheck - #endif +@@ -9,6 +9,11 @@ + + #include "base/linux_util.h" +#if defined(__FreeBSD__) +#include <sys/param.h> @@ -11,4 +11,4 @@ + namespace syncer { - #if BUILDFLAG(IS_CHROMEOS_ASH) + std::string GetPersonalizableDeviceNameInternal() { 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 906ba665dc49..63fcb9daeedf 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 2022-08-31 12:19:35 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2022-09-24 10:57:32 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1024,7 +1024,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1026,7 +1026,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 c701aae87550..8093e9ac2e5a 100644 --- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -1,4 +1,4 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2022-07-22 17:30:31 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2022-09-24 10:57:32 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc @@ -97,7 +97,7 @@ RootCompositorFrameSinkImpl::Create( @@ -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); -@@ -579,7 +579,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -576,7 +576,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 64f188f0deab..487946da8489 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 2022-05-19 14:06:27 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2022-09-24 10:57:32 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -197,7 +197,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl +@@ -196,7 +196,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-content_app_content__main.cc b/www/chromium/files/patch-content_app_content__main.cc index 05ecbeb93d7c..1f0b8fa274fd 100644 --- a/www/chromium/files/patch-content_app_content__main.cc +++ b/www/chromium/files/patch-content_app_content__main.cc @@ -1,6 +1,6 @@ ---- content/app/content_main.cc.orig 2022-08-31 12:19:35 UTC +--- content/app/content_main.cc.orig 2022-09-24 10:57:32 UTC +++ content/app/content_main.cc -@@ -259,7 +259,7 @@ RunContentProcess(ContentMainParams params, +@@ -284,7 +284,7 @@ RunContentProcess(ContentMainParams params, #endif base::EnableTerminationOnOutOfMemory(); 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 f892589ed3e0..bf22333c2c4e 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,6 +1,6 @@ ---- content/app/content_main_runner_impl.cc.orig 2022-08-31 12:19:35 UTC +--- content/app/content_main_runner_impl.cc.orig 2022-09-24 10:57:32 UTC +++ content/app/content_main_runner_impl.cc -@@ -128,13 +128,13 @@ +@@ -130,13 +130,13 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" @@ -16,7 +16,7 @@ #include "base/native_library.h" #include "base/rand_util.h" #include "content/public/common/zygote/sandbox_support_linux.h" -@@ -173,6 +173,10 @@ +@@ -175,6 +175,10 @@ #include "media/base/media_switches.h" #endif @@ -27,16 +27,16 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -358,7 +362,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -360,7 +364,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #if BUILDFLAG(ENABLE_PLUGINS) + #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -394,7 +398,7 @@ void PreloadLibraryCdms() { +@@ -396,7 +400,7 @@ void PreloadLibraryCdms() { } #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS) @@ -45,7 +45,7 @@ void PreSandboxInit() { // Pre-acquire resources needed by BoringSSL. See // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md -@@ -410,6 +414,11 @@ void PreSandboxInit() { +@@ -412,6 +416,11 @@ void PreSandboxInit() { #endif InitializeWebRtcModule(); @@ -57,7 +57,7 @@ // Set the android SkFontMgr for blink. We need to ensure this is done // before the sandbox is initialized to allow the font manager to access // font configuration files on disk. -@@ -592,7 +601,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* +@@ -594,7 +603,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -66,7 +66,7 @@ PreSandboxInit(); #endif -@@ -783,11 +792,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -785,11 +794,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -80,7 +80,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -965,6 +973,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -972,6 +980,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam } #endif @@ -97,7 +97,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE_HANDLE) -@@ -1024,7 +1042,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1031,7 +1049,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { mojo::core::InitFeatures(); } @@ -106,7 +106,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 -@@ -1057,6 +1075,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1064,6 +1082,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 1e5968c8314e..2ba3342c2157 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 2022-08-31 12:19:35 UTC +--- content/browser/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ content/browser/BUILD.gn -@@ -2435,6 +2435,13 @@ source_set("browser") { +@@ -2471,6 +2471,13 @@ source_set("browser") { ] } diff --git a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc index 9d24051a7806..8b422d89fed4 100644 --- a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_child_process_host_impl.cc.orig 2022-06-17 14:20:10 UTC +--- content/browser/browser_child_process_host_impl.cc.orig 2022-09-24 10:57:32 UTC +++ content/browser/browser_child_process_host_impl.cc -@@ -294,6 +294,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo +@@ -307,6 +307,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo switches::kDisableBestEffortTasks, switches::kDisableLogging, switches::kEnableLogging, diff --git a/www/chromium/files/patch-content_browser_media_media__interface__proxy.cc b/www/chromium/files/patch-content_browser_media_media__interface__proxy.cc index 4dd973eb0f7f..e8ea84274cda 100644 --- a/www/chromium/files/patch-content_browser_media_media__interface__proxy.cc +++ b/www/chromium/files/patch-content_browser_media_media__interface__proxy.cc @@ -1,6 +1,6 @@ ---- content/browser/media/media_interface_proxy.cc.orig 2022-08-31 12:19:35 UTC +--- content/browser/media/media_interface_proxy.cc.orig 2022-09-24 10:57:32 UTC +++ content/browser/media/media_interface_proxy.cc -@@ -73,7 +73,7 @@ +@@ -76,7 +76,7 @@ #include "media/mojo/services/mojo_renderer_service.h" // nogncheck #endif @@ -9,7 +9,7 @@ #include "content/public/browser/stable_video_decoder_factory.h" #include "media/base/media_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -286,7 +286,7 @@ void MediaInterfaceProxy::CreateVideoDecoder( +@@ -327,7 +327,7 @@ void MediaInterfaceProxy::CreateVideoDecoder( mojo::PendingRemote<media::stable::mojom::StableVideoDecoder> oop_video_decoder; 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 a55262854c34..140f949b7fdb 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,7 +1,7 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2022-08-31 12:19:35 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2022-09-24 10:57:32 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -213,7 +213,7 @@ - #include "content/browser/hid/hid_service.h" +@@ -211,7 +211,7 @@ + #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -9,7 +9,7 @@ #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -1143,7 +1143,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1135,7 +1135,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; -@@ -1230,7 +1230,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1222,7 +1222,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; -@@ -2108,7 +2108,7 @@ void RenderProcessHostImpl::CreateWebSocketConnector( +@@ -2114,7 +2114,7 @@ void RenderProcessHostImpl::CreateWebSocketConnector( std::move(receiver)); } @@ -36,7 +36,7 @@ void RenderProcessHostImpl::CreateStableVideoDecoder( mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) { if (!stable_video_decoder_factory_remote_.is_bound()) { -@@ -3229,6 +3229,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3243,6 +3243,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, @@ -44,7 +44,7 @@ switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, switches::kDisableWebGLImageChromium, -@@ -4702,7 +4703,7 @@ void RenderProcessHostImpl::ResetIPC() { +@@ -4716,7 +4717,7 @@ void RenderProcessHostImpl::ResetIPC() { coordinator_connector_receiver_.reset(); tracing_registration_.reset(); 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 8927d39f950c..b5a677de39ae 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,7 +1,7 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2022-08-31 12:19:35 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2022-09-24 10:57:32 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -85,7 +85,7 @@ - #include "third_party/blink/public/mojom/hid/hid.mojom-forward.h" +@@ -83,7 +83,7 @@ + #include "content/public/browser/android/child_process_importance.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -9,7 +9,7 @@ #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -474,7 +474,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -472,7 +472,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); @@ -18,7 +18,7 @@ // Launch the zygote early in the browser startup. static void EarlyZygoteLaunch(); #endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC) -@@ -673,7 +673,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -671,7 +671,7 @@ class CONTENT_EXPORT RenderProcessHostImpl mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) override; @@ -27,7 +27,7 @@ void CreateStableVideoDecoder( mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) override; -@@ -1128,7 +1128,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -1121,7 +1121,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // RenderProcessHost. This is destroyed early in ResetIPC() method. std::unique_ptr<PermissionServiceContext> permission_service_context_; 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 6c2e69e7f4de..fdda90ad7803 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2022-08-31 12:19:35 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2022-09-24 10:57:32 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -114,7 +114,7 @@ +@@ -116,7 +116,7 @@ #include "ui/gfx/gdi_util.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/linux/linux_ui.h" -@@ -439,7 +439,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -441,7 +441,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge if (manager) return ToBrowserAccessibilityWin(manager->GetRoot())->GetCOM(); @@ -18,7 +18,7 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetRoot()) -@@ -1573,7 +1573,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1579,7 +1579,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) { -@@ -2393,7 +2393,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2400,7 +2400,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2570,7 +2570,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2577,7 +2577,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h index 331011c60ada..cadd08cfaed1 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 2022-08-31 12:19:35 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2022-09-24 10:57:32 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.h -@@ -243,7 +243,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -245,7 +245,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; 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 61555808678c..f8385f0baafd 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,6 +1,6 @@ ---- content/browser/web_contents/web_contents_view_aura.cc.orig 2022-08-31 12:19:35 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2022-09-24 10:57:32 UTC +++ content/browser/web_contents/web_contents_view_aura.cc -@@ -160,7 +160,7 @@ class WebDragSourceAura : public content::WebContentsO +@@ -176,7 +176,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr<aura::Window> window_; }; @@ -9,7 +9,7 @@ // Fill out the OSExchangeData with a file contents, synthesizing a name if // necessary. void PrepareDragForFileContents(const DropData& drop_data, -@@ -243,7 +243,7 @@ void PrepareDragData(const DropData& drop_data, +@@ -259,7 +259,7 @@ void PrepareDragData(const DropData& drop_data, if (!drop_data.download_metadata.empty()) PrepareDragForDownload(drop_data, provider, web_contents); #endif @@ -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. -@@ -1345,7 +1345,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1360,7 +1360,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_child_child__process.cc b/www/chromium/files/patch-content_child_child__process.cc index 3dd5ba59982c..c2abdf954d3e 100644 --- a/www/chromium/files/patch-content_child_child__process.cc +++ b/www/chromium/files/patch-content_child_child__process.cc @@ -1,6 +1,6 @@ ---- content/child/child_process.cc.orig 2022-08-31 12:19:35 UTC +--- content/child/child_process.cc.orig 2022-09-24 10:57:32 UTC +++ content/child/child_process.cc -@@ -67,7 +67,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_ +@@ -68,7 +68,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_ DCHECK(!g_lazy_child_process_tls.Pointer()->Get()); g_lazy_child_process_tls.Pointer()->Set(this); diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index f91ce9cf9f98..935e6e151fc8 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 2022-08-31 12:19:35 UTC +--- content/common/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ content/common/BUILD.gn -@@ -400,6 +400,9 @@ if (is_linux || is_chromeos) { +@@ -428,6 +428,9 @@ if (is_linux || is_chromeos) { public = [ "set_process_title_linux.h" ] sources = [ "set_process_title_linux.cc" ] deps = [ "//base" ] diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index b79dc03f2618..9e7930f313e2 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,4 +1,4 @@ ---- content/gpu/gpu_main.cc.orig 2022-09-02 10:45:05 UTC +--- content/gpu/gpu_main.cc.orig 2022-09-24 10:57:32 UTC +++ content/gpu/gpu_main.cc @@ -86,7 +86,7 @@ #include "sandbox/win/src/sandbox.h" @@ -36,7 +36,7 @@ #error "Unsupported Linux platform." #elif BUILDFLAG(IS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -396,7 +396,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -401,7 +401,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { diff --git a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc index d73204977f54..d5e6de2ff832 100644 --- a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2022-08-31 12:19:35 UTC +--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2022-09-24 10:57:32 UTC +++ content/gpu/gpu_sandbox_hook_linux.cc -@@ -114,6 +114,7 @@ void AddStandardChromeOsPermissions( +@@ -118,6 +118,7 @@ void AddStandardChromeOsPermissions( permissions->push_back(BrokerFilePermission::ReadOnly(kAngleGlesPath)); } diff --git a/www/chromium/files/patch-content_public_browser_render__process__host.h b/www/chromium/files/patch-content_public_browser_render__process__host.h index 537f27e85500..87f184902b5f 100644 --- a/www/chromium/files/patch-content_public_browser_render__process__host.h +++ b/www/chromium/files/patch-content_public_browser_render__process__host.h @@ -1,4 +1,4 @@ ---- content/public/browser/render_process_host.h.orig 2022-08-31 12:19:35 UTC +--- content/public/browser/render_process_host.h.orig 2022-09-24 10:57:32 UTC +++ content/public/browser/render_process_host.h @@ -53,7 +53,7 @@ #include "content/public/browser/android/child_process_importance.h" @@ -9,7 +9,7 @@ #include "media/mojo/mojom/stable/stable_video_decoder.mojom-forward.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -621,7 +621,7 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::S +@@ -626,7 +626,7 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::S const blink::StorageKey& storage_key, mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) = 0; 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 62cff14b0bf2..4523b076c9f8 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,4 +1,4 @@ ---- content/public/common/content_features.cc.orig 2022-08-31 12:19:35 UTC +--- content/public/common/content_features.cc.orig 2022-09-24 10:57:32 UTC +++ content/public/common/content_features.cc @@ -43,7 +43,7 @@ const base::Feature kAudioServiceOutOfProcess { "AudioServiceOutOfProcess", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1057,7 +1057,7 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB +@@ -1086,7 +1086,7 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB const base::Feature kWebAssemblyCodeProtection{ "WebAssemblyCodeProtection", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -27,7 +27,7 @@ // Use memory protection keys in userspace (PKU) (if available) to protect code // JITed for WebAssembly. Fall back to traditional memory protection if // WebAssemblyCodeProtection is also enabled. -@@ -1093,7 +1093,7 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi +@@ -1122,7 +1122,7 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi const 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 -@@ -1163,7 +1163,11 @@ const base::Feature kWebUIReportOnlyTrustedTypes{ +@@ -1192,7 +1192,11 @@ const base::Feature kWebUIReportOnlyTrustedTypes{ // 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 5537a0b3c98c..65f6bbb8ea27 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 2022-08-31 12:19:35 UTC +--- content/public/common/content_features.h.orig 2022-09-24 10:57:32 UTC +++ content/public/common/content_features.h -@@ -273,7 +273,7 @@ CONTENT_EXPORT extern const base::Feature kV8VmFuture; +@@ -282,7 +282,7 @@ CONTENT_EXPORT extern const base::Feature kV8VmFuture; CONTENT_EXPORT extern const base::Feature kWebAppWindowControlsOverlay; CONTENT_EXPORT extern const base::Feature kWebAssemblyBaseline; CONTENT_EXPORT extern const base::Feature kWebAssemblyCodeProtection; 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 ffca2971df12..8a77e3f93d30 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 2022-08-31 12:19:35 UTC +--- content/public/common/content_switches.cc.orig 2022-09-24 10:57:32 UTC +++ content/public/common/content_switches.cc -@@ -369,6 +369,8 @@ const char kEnableGpuMemoryBufferVideoFrames[] = +@@ -370,6 +370,8 @@ const char kEnableGpuMemoryBufferVideoFrames[] = // 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. -@@ -974,7 +976,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -984,7 +986,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 121b776fb5e6..ab27231d5d6e 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,4 +1,4 @@ ---- content/public/common/content_switches.h.orig 2022-07-22 17:30:31 UTC +--- content/public/common/content_switches.h.orig 2022-09-24 10:57:32 UTC +++ content/public/common/content_switches.h @@ -118,6 +118,7 @@ CONTENT_EXPORT extern const char kEnableBlinkTestFeatu CONTENT_EXPORT extern const char kEnableGpuMemoryBufferVideoFrames[]; @@ -8,7 +8,7 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -263,7 +264,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD +@@ -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_public_test_mock__render__process__host.h b/www/chromium/files/patch-content_public_test_mock__render__process__host.h index 27118bec225f..854d08192fbe 100644 --- a/www/chromium/files/patch-content_public_test_mock__render__process__host.h +++ b/www/chromium/files/patch-content_public_test_mock__render__process__host.h @@ -1,6 +1,6 @@ ---- content/public/test/mock_render_process_host.h.orig 2022-08-31 12:19:35 UTC +--- content/public/test/mock_render_process_host.h.orig 2022-09-24 10:57:32 UTC +++ content/public/test/mock_render_process_host.h -@@ -257,7 +257,7 @@ class MockRenderProcessHost : public RenderProcessHost +@@ -261,7 +261,7 @@ class MockRenderProcessHost : public RenderProcessHost const blink::StorageKey& storage_key, mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) override {} diff --git a/www/chromium/files/patch-content_public_test_mock__render__thread.cc b/www/chromium/files/patch-content_public_test_mock__render__thread.cc index 4911097effe3..8c4171c50074 100644 --- a/www/chromium/files/patch-content_public_test_mock__render__thread.cc +++ b/www/chromium/files/patch-content_public_test_mock__render__thread.cc @@ -1,6 +1,6 @@ ---- content/public/test/mock_render_thread.cc.orig 2022-08-31 12:19:35 UTC +--- content/public/test/mock_render_thread.cc.orig 2022-09-24 10:57:32 UTC +++ content/public/test/mock_render_thread.cc -@@ -63,7 +63,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend +@@ -62,7 +62,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend std::move(callback).Run(false); } 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 b1872c9ad869..15e998e18160 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 2022-08-31 12:19:35 UTC +--- content/renderer/render_thread_impl.cc.orig 2022-09-24 10:57:32 UTC +++ content/renderer/render_thread_impl.cc @@ -190,7 +190,7 @@ @@ -9,7 +9,7 @@ #include <malloc.h> #endif -@@ -670,7 +670,7 @@ void RenderThreadImpl::Init() { +@@ -671,7 +671,7 @@ void RenderThreadImpl::Init() { base::DiscardableMemoryAllocator::SetInstance( discardable_memory_allocator_.get()); @@ -18,7 +18,7 @@ render_message_filter()->SetThreadType( ChildProcess::current()->io_thread_id(), base::ThreadType::kCompositing); #endif -@@ -1040,7 +1040,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1041,7 +1041,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: const bool enable_video_decode_accelerator = @@ -27,7 +27,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1051,7 +1051,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1052,7 +1052,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: const bool enable_video_encode_accelerator = 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 096a2befcfec..9d42b5854804 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 2022-08-31 12:19:35 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2022-09-24 10:57:32 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -109,7 +109,7 @@ +@@ -108,7 +108,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 -@@ -178,7 +178,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -177,7 +177,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( main_thread_scheduler_(main_thread_scheduler) { // RenderThread may not exist in some tests. if (RenderThreadImpl::current()) { @@ -18,7 +18,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -188,7 +188,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -187,7 +187,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -27,7 +27,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -261,7 +261,7 @@ RendererBlinkPlatformImpl::WrapURLLoaderFactory( +@@ -254,7 +254,7 @@ RendererBlinkPlatformImpl::WrapURLLoaderFactory( /*terminate_sync_load_event=*/nullptr); } @@ -36,8 +36,8 @@ void RendererBlinkPlatformImpl::SetThreadType(base::PlatformThreadId thread_id, base::ThreadType thread_type) { if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) { -@@ -276,7 +276,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop - } +@@ -265,7 +265,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl + #endif blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index c998c1595db4..c2bb8ca34aa5 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,4 +1,4 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2022-08-31 12:19:35 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2022-09-24 10:57:32 UTC +++ content/renderer/renderer_blink_platform_impl.h @@ -29,7 +29,7 @@ #include "third_party/blink/public/common/user_agent/user_agent_metadata.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -171,7 +171,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -169,7 +169,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi const blink::WebURL& top_document_web_url) override; gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; blink::WebString ConvertIDNToUnicode(const blink::WebString& host) override; @@ -18,7 +18,7 @@ void SetThreadType(base::PlatformThreadId thread_id, base::ThreadType) override; #endif -@@ -238,7 +238,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -235,7 +235,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) const; @@ -27,7 +27,7 @@ std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif -@@ -260,7 +260,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -255,7 +255,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi mutable base::WaitableEvent io_thread_id_ready_event_; base::PlatformThreadId io_thread_id_ = base::kInvalidThreadId; diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index e8201c71a322..4e99e33981a3 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 2022-08-31 12:19:35 UTC +--- content/shell/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ content/shell/BUILD.gn -@@ -885,7 +885,7 @@ group("content_shell_crash_test") { +@@ -893,7 +893,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_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn index 07a7e8e769df..1fa18d43cbd8 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 2022-08-31 12:19:35 UTC +--- content/test/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ content/test/BUILD.gn -@@ -2037,7 +2037,7 @@ static_library("run_all_unittests") { +@@ -2055,7 +2055,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -9,7 +9,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -3006,7 +3006,7 @@ test("content_unittests") { +@@ -3025,7 +3025,7 @@ test("content_unittests") { deps += [ "//third_party/boringssl" ] } diff --git a/www/chromium/files/patch-extensions_browser_extension__prefs.cc b/www/chromium/files/patch-extensions_browser_extension__prefs.cc index 6902f2fbbcc7..d73241b4df1a 100644 --- a/www/chromium/files/patch-extensions_browser_extension__prefs.cc +++ b/www/chromium/files/patch-extensions_browser_extension__prefs.cc @@ -1,6 +1,6 @@ ---- extensions/browser/extension_prefs.cc.orig 2022-08-31 12:19:35 UTC +--- extensions/browser/extension_prefs.cc.orig 2022-09-24 10:57:32 UTC +++ extensions/browser/extension_prefs.cc -@@ -2295,7 +2295,7 @@ void ExtensionPrefs::RegisterProfilePrefs( +@@ -2274,7 +2274,7 @@ void ExtensionPrefs::RegisterProfilePrefs( registry->RegisterDictionaryPref(kInstallSignature); registry->RegisterListPref(kExternalUninstalls); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-extensions_browser_pref__names.cc b/www/chromium/files/patch-extensions_browser_pref__names.cc index 7cc9ac98f9f4..772208ceb339 100644 --- a/www/chromium/files/patch-extensions_browser_pref__names.cc +++ b/www/chromium/files/patch-extensions_browser_pref__names.cc @@ -1,6 +1,6 @@ ---- extensions/browser/pref_names.cc.orig 2022-04-21 18:48:31 UTC +--- extensions/browser/pref_names.cc.orig 2022-09-24 10:57:32 UTC +++ extensions/browser/pref_names.cc -@@ -49,7 +49,7 @@ const char kToolbar[] = "extensions.toolbar"; +@@ -48,7 +48,7 @@ const char kStorageGarbageCollect[] = "extensions.stor const char kDeletedComponentExtensions[] = "extensions.deleted_component_extensions"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-extensions_browser_pref__names.h b/www/chromium/files/patch-extensions_browser_pref__names.h index 9ad352ae22d0..4742c85e0b9f 100644 --- a/www/chromium/files/patch-extensions_browser_pref__names.h +++ b/www/chromium/files/patch-extensions_browser_pref__names.h @@ -1,6 +1,6 @@ ---- extensions/browser/pref_names.h.orig 2022-04-21 18:48:31 UTC +--- extensions/browser/pref_names.h.orig 2022-09-24 10:57:32 UTC +++ extensions/browser/pref_names.h -@@ -102,7 +102,7 @@ extern const char kToolbar[]; +@@ -98,7 +98,7 @@ extern const char kStorageGarbageCollect[]; extern const char kDeletedComponentExtensions[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-extensions_renderer_bindings_argument__spec.cc b/www/chromium/files/patch-extensions_renderer_bindings_argument__spec.cc new file mode 100644 index 000000000000..5517f299e407 --- /dev/null +++ b/www/chromium/files/patch-extensions_renderer_bindings_argument__spec.cc @@ -0,0 +1,11 @@ +--- extensions/renderer/bindings/argument_spec.cc.orig 2022-09-24 10:57:32 UTC ++++ extensions/renderer/bindings/argument_spec.cc +@@ -16,6 +16,8 @@ + #include "gin/data_object_builder.h" + #include "gin/dictionary.h" + ++#include <cmath> ++ + namespace extensions { + + namespace { diff --git a/www/chromium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc index 3aa8772d1998..77da3a83720f 100644 --- a/www/chromium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc +++ b/www/chromium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- extensions/shell/browser/shell_browser_main_parts.cc.orig 2022-08-31 12:19:35 UTC +--- extensions/shell/browser/shell_browser_main_parts.cc.orig 2022-09-24 10:57:32 UTC +++ extensions/shell/browser/shell_browser_main_parts.cc -@@ -147,7 +147,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( +@@ -150,7 +150,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( switches::kAppShellAllowRoaming)) { network_controller_->SetCellularAllowRoaming(true); } diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc index bf3c0d389709..e98d2f686dfc 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2022-08-31 12:19:35 UTC +--- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2022-09-24 10:57:32 UTC +++ gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc -@@ -643,7 +643,7 @@ bool AngleVulkanImageBackingFactory::CanUseAngleVulkan +@@ -640,7 +640,7 @@ bool AngleVulkanImageBackingFactory::CanUseAngleVulkan // TODO(penghuang): verify the scanout is the right usage for video playback. // crbug.com/1280798 constexpr auto kSupportedUsages = 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 e1768508b31d..531b7493d63f 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2022-08-31 12:19:35 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2022-09-24 10:57:32 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1065,7 +1065,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1071,7 +1071,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( if (gr_context_type_ != GrContextType::kVulkan && use_webgpu_adapter_ != WebGPUAdapterName::kCompat) { diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc index d79fde6e8d3f..1f5d8a9f7b13 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2022-07-22 17:30:31 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2022-09-24 10:57:32 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -315,7 +315,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -350,7 +350,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; #endif @@ -9,7 +9,7 @@ bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early; #else // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) // For some reasons MacOSX's VideoToolbox might crash when called after -@@ -365,7 +365,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -400,7 +400,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -18,7 +18,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -414,7 +414,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -449,7 +449,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL if (gl_initialized && gl_use_swiftshader_ && !gl::IsSoftwareGLImplementation(gl::GetGLImplementationParts())) { @@ -27,7 +27,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -450,7 +450,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -485,7 +485,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } @@ -36,7 +36,7 @@ // The ContentSandboxHelper is currently the only one implementation of // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -510,7 +510,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -545,7 +545,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -45,7 +45,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -638,7 +638,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -673,7 +673,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -54,7 +54,7 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -872,7 +872,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -909,7 +909,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc index 33814398b3d0..d7522e9e7135 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_device_queue.cc.orig 2022-03-25 21:59:56 UTC +--- gpu/vulkan/vulkan_device_queue.cc.orig 2022-09-24 10:57:32 UTC +++ gpu/vulkan/vulkan_device_queue.cc -@@ -85,7 +85,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -88,7 +88,7 @@ bool VulkanDeviceQueue::Initialize( // In dual-CPU cases, we cannot detect the active GPU correctly on Linux, // so don't select GPU device based on the |gpu_info|. @@ -9,7 +9,7 @@ // If gpu_info is provided, the device should match it. if (gpu_info && (device_properties.vendorID != gpu_info->gpu.vendor_id || device_properties.deviceID != gpu_info->gpu.device_id)) { -@@ -229,7 +229,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -232,7 +232,7 @@ bool VulkanDeviceQueue::Initialize( enabled_device_features_2_ = {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2}; // Android, Fuchsia, and Linux(VaapiVideoDecoder) need YCbCr sampler support. diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.h b/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.h index 1f7518b9e478..e98e726150d5 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.h +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_device_queue.h.orig 2022-02-28 16:54:41 UTC +--- gpu/vulkan/vulkan_device_queue.h.orig 2022-09-24 10:57:32 UTC +++ gpu/vulkan/vulkan_device_queue.h -@@ -155,7 +155,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue { +@@ -158,7 +158,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue { bool allow_protected_memory_ = false; diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.h b/www/chromium/files/patch-ipc_ipc__message__utils.h index a0726995cc95..0b1c49c55797 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.h +++ b/www/chromium/files/patch-ipc_ipc__message__utils.h @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.h.orig 2022-05-19 14:06:27 UTC +--- ipc/ipc_message_utils.h.orig 2022-09-24 10:57:32 UTC +++ ipc/ipc_message_utils.h -@@ -212,7 +212,7 @@ struct ParamTraits<unsigned int> { +@@ -214,7 +214,7 @@ struct ParamTraits<unsigned int> { // Since we want to support Android 32<>64 bit IPC, as long as we don't have // these traits for 32 bit ARM then that'll catch any errors. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-media_BUILD.gn b/www/chromium/files/patch-media_BUILD.gn index bb01e466dc1e..d89dd1f03ed2 100644 --- a/www/chromium/files/patch-media_BUILD.gn +++ b/www/chromium/files/patch-media_BUILD.gn @@ -1,6 +1,6 @@ ---- media/BUILD.gn.orig 2022-07-22 17:30:31 UTC +--- media/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ media/BUILD.gn -@@ -75,6 +75,9 @@ config("media_config") { +@@ -84,6 +84,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc index f48027af0e95..c72ee91613e3 100644 --- a/www/chromium/files/patch-media_base_media__switches.cc +++ b/www/chromium/files/patch-media_base_media__switches.cc @@ -1,4 +1,4 @@ ---- media/base/media_switches.cc.orig 2022-08-31 12:19:35 UTC +--- media/base/media_switches.cc.orig 2022-09-24 10:57:32 UTC +++ media/base/media_switches.cc @@ -10,7 +10,7 @@ #include "components/system_media_controls/linux/buildflags/buildflags.h" @@ -36,7 +36,7 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. const base::Feature kVaapiVideoDecodeLinux{"VaapiVideoDecoder", -@@ -947,7 +947,7 @@ const base::Feature MEDIA_EXPORT kDeprecateLowUsageCod +@@ -942,7 +942,7 @@ const base::Feature MEDIA_EXPORT kDeprecateLowUsageCod "DeprecateLowUsageCodecs", base::FEATURE_ENABLED_BY_DEFAULT}; #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-media_cdm_cdm__paths__unittest.cc b/www/chromium/files/patch-media_cdm_cdm__paths__unittest.cc index f7173cb2761c..c6f4870b2059 100644 --- a/www/chromium/files/patch-media_cdm_cdm__paths__unittest.cc +++ b/www/chromium/files/patch-media_cdm_cdm__paths__unittest.cc @@ -1,4 +1,4 @@ ---- media/cdm/cdm_paths_unittest.cc.orig 2022-03-25 21:59:56 UTC +--- media/cdm/cdm_paths_unittest.cc.orig 2022-09-24 10:57:32 UTC +++ media/cdm/cdm_paths_unittest.cc @@ -27,7 +27,7 @@ const char kComponentPlatform[] = "win"; @@ -8,4 +8,4 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) "linux"; #else - "unsupported_platform"; + #error unsupported platform 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 d77465c0c41d..02ef7e07f773 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 2022-08-31 12:19:35 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2022-09-24 10:57:32 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -742,7 +742,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -747,7 +747,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } } @@ -9,7 +9,7 @@ // Linux should always use a custom allocator (to allocate buffers using // libva) and a PlatformVideoFramePool. CHECK(allocator.has_value()); -@@ -764,7 +764,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -769,7 +769,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( #error "Unsupported platform" #endif diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc index 43f528eb8fd7..2e08d719bf91 100644 --- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc +++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc @@ -1,6 +1,6 @@ ---- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2022-07-22 17:30:31 UTC +--- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2022-09-24 10:57:32 UTC +++ media/gpu/vaapi/vaapi_video_decoder.cc -@@ -765,7 +765,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree +@@ -767,7 +767,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree const gfx::Size decoder_natural_size = aspect_ratio_.GetNaturalSize(decoder_visible_rect); diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni index 8d551025baa7..206b54b87902 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 2022-08-31 12:19:35 UTC +--- media/media_options.gni.orig 2022-09-24 10:57:32 UTC +++ media/media_options.gni -@@ -158,12 +158,15 @@ declare_args() { +@@ -165,12 +165,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 -@@ -179,6 +182,10 @@ declare_args() { +@@ -186,6 +189,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.h b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h index 81678c827a61..1f64b0477e74 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 2022-06-17 14:20:10 UTC +--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2022-09-24 10:57:32 UTC +++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h -@@ -625,7 +625,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem +@@ -695,7 +695,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_video__encode__accelerator__adapter.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc index 0073f4d92e33..97aca054a2ce 100644 --- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc +++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter.cc.orig 2022-08-31 12:19:35 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2022-09-24 10:57:32 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -128,7 +128,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( +@@ -129,7 +129,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( if (is_rgb) config.input_format = PIXEL_FORMAT_I420; @@ -9,7 +9,7 @@ if (storage_type == VideoFrame::STORAGE_DMABUFS || storage_type == VideoFrame::STORAGE_GPU_MEMORY_BUFFER) { if (is_rgb) -@@ -297,7 +297,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -298,7 +298,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal SetUpVeaConfig(profile_, options_, format, first_frame->storage_type(), supported_rc_modes_); diff --git a/www/chromium/files/patch-mojo_core_BUILD.gn b/www/chromium/files/patch-mojo_core_BUILD.gn index 0b98bf57356d..d893761db235 100644 --- a/www/chromium/files/patch-mojo_core_BUILD.gn +++ b/www/chromium/files/patch-mojo_core_BUILD.gn @@ -1,6 +1,6 @@ ---- mojo/core/BUILD.gn.orig 2022-02-28 16:54:41 UTC +--- mojo/core/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ mojo/core/BUILD.gn -@@ -128,7 +128,7 @@ template("core_impl_source_set") { +@@ -146,7 +146,7 @@ template("core_impl_source_set") { ] } diff --git a/www/chromium/files/patch-mojo_core_channel.cc b/www/chromium/files/patch-mojo_core_channel.cc index 46e38bace3a0..388f3a6caa60 100644 --- a/www/chromium/files/patch-mojo_core_channel.cc +++ b/www/chromium/files/patch-mojo_core_channel.cc @@ -1,6 +1,6 @@ ---- mojo/core/channel.cc.orig 2022-04-21 18:48:31 UTC +--- mojo/core/channel.cc.orig 2022-09-24 10:57:32 UTC +++ mojo/core/channel.cc -@@ -70,7 +70,11 @@ const size_t kMaxUnusedReadBufferCapacity = 4096; +@@ -71,7 +71,11 @@ const size_t kMaxUnusedReadBufferCapacity = 4096; // Fuchsia: The zx_channel_write() API supports up to 64 handles. const size_t kMaxAttachedHandles = 64; diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index 26ce1de85b90..9411682bfb4f 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 2022-08-31 12:19:35 UTC +--- net/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ net/BUILD.gn @@ -104,7 +104,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1193,6 +1193,15 @@ component("net") { +@@ -1198,6 +1198,15 @@ component("net") { ] } @@ -25,7 +25,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1325,7 +1334,7 @@ component("net") { +@@ -1330,7 +1339,7 @@ component("net") { } } @@ -34,7 +34,7 @@ sources += [ "base/network_change_notifier_posix.cc", "base/network_change_notifier_posix.h", -@@ -1358,7 +1367,7 @@ component("net") { +@@ -1363,7 +1372,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -43,7 +43,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -4363,7 +4372,7 @@ test("net_unittests") { +@@ -4368,7 +4377,7 @@ test("net_unittests") { ] } @@ -52,7 +52,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -4438,6 +4447,10 @@ test("net_unittests") { +@@ -4443,6 +4452,10 @@ test("net_unittests") { "//url:buildflags", ] @@ -63,7 +63,7 @@ if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -4509,7 +4522,7 @@ test("net_unittests") { +@@ -4510,7 +4523,7 @@ test("net_unittests") { ] } @@ -72,7 +72,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -4650,7 +4663,7 @@ test("net_unittests") { +@@ -4651,7 +4664,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/chromium/files/patch-net_base_network__change__notifier.cc b/www/chromium/files/patch-net_base_network__change__notifier.cc index e4cdad7aea2a..9c6654c0c60d 100644 --- a/www/chromium/files/patch-net_base_network__change__notifier.cc +++ b/www/chromium/files/patch-net_base_network__change__notifier.cc @@ -1,4 +1,4 @@ ---- net/base/network_change_notifier.cc.orig 2022-08-31 12:19:35 UTC +--- net/base/network_change_notifier.cc.orig 2022-09-24 10:57:32 UTC +++ net/base/network_change_notifier.cc @@ -37,7 +37,7 @@ #include "net/base/network_change_notifier_linux.h" @@ -9,7 +9,7 @@ #include "net/base/network_change_notifier_posix.h" #elif BUILDFLAG(IS_FUCHSIA) #include "net/base/network_change_notifier_fuchsia.h" -@@ -329,6 +329,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo +@@ -326,6 +326,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo #elif BUILDFLAG(IS_FUCHSIA) return std::make_unique<NetworkChangeNotifierFuchsia>( /*require_wlan=*/false); diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc.cc b/www/chromium/files/patch-net_cert_cert__verify__proc.cc index 2b0b95101b4e..611cd5bb4635 100644 --- a/www/chromium/files/patch-net_cert_cert__verify__proc.cc +++ b/www/chromium/files/patch-net_cert_cert__verify__proc.cc @@ -1,6 +1,6 @@ ---- net/cert/cert_verify_proc.cc.orig 2022-06-17 14:20:10 UTC +--- net/cert/cert_verify_proc.cc.orig 2022-09-24 10:57:32 UTC +++ net/cert/cert_verify_proc.cc -@@ -527,7 +527,7 @@ base::Value CertVerifyParams(X509Certificate* cert, +@@ -510,7 +510,7 @@ base::Value CertVerifyParams(X509Certificate* cert, } // namespace diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc b/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc index 911f00c845be..164cc908ba8c 100644 --- a/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc +++ b/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc @@ -1,9 +1,9 @@ ---- net/cert/cert_verify_proc_unittest.cc.orig 2022-08-31 12:19:35 UTC +--- net/cert/cert_verify_proc_unittest.cc.orig 2022-09-24 10:57:32 UTC +++ net/cert/cert_verify_proc_unittest.cc -@@ -234,7 +234,7 @@ const std::vector<CertVerifyProcType> kAllCertVerifier +@@ -239,7 +239,7 @@ const std::vector<CertVerifyProcType> kAllCertVerifier + #if BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED) CERT_VERIFY_PROC_BUILTIN_CHROME_ROOTS - #elif BUILDFLAG(IS_WIN) - CERT_VERIFY_PROC_WIN, CERT_VERIFY_PROC_BUILTIN_CHROME_ROOTS + #endif -#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) CERT_VERIFY_PROC_BUILTIN diff --git a/www/chromium/files/patch-net_dns_BUILD.gn b/www/chromium/files/patch-net_dns_BUILD.gn index d37f40166419..9b2524652c80 100644 --- a/www/chromium/files/patch-net_dns_BUILD.gn +++ b/www/chromium/files/patch-net_dns_BUILD.gn @@ -1,6 +1,6 @@ ---- net/dns/BUILD.gn.orig 2022-05-19 14:06:27 UTC +--- net/dns/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ net/dns/BUILD.gn -@@ -112,7 +112,7 @@ source_set("dns") { +@@ -113,7 +113,7 @@ source_set("dns") { "dns_config_service_android.cc", "dns_config_service_android.h", ] @@ -9,7 +9,7 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -153,6 +153,7 @@ source_set("dns") { +@@ -154,6 +154,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +17,7 @@ ] allow_circular_includes_from = [ -@@ -413,9 +414,9 @@ source_set("tests") { +@@ -416,9 +417,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/www/chromium/files/patch-net_dns_host__resolver__manager.cc b/www/chromium/files/patch-net_dns_host__resolver__manager.cc index faef864dd7e4..4e927f1fe61e 100644 --- a/www/chromium/files/patch-net_dns_host__resolver__manager.cc +++ b/www/chromium/files/patch-net_dns_host__resolver__manager.cc @@ -1,6 +1,6 @@ ---- net/dns/host_resolver_manager.cc.orig 2022-07-22 17:30:31 UTC +--- net/dns/host_resolver_manager.cc.orig 2022-09-24 10:57:32 UTC +++ net/dns/host_resolver_manager.cc -@@ -3145,7 +3145,7 @@ HostResolverManager::HostResolverManager( +@@ -3126,7 +3126,7 @@ HostResolverManager::HostResolverManager( } if (system_dns_config_notifier_) system_dns_config_notifier_->AddObserver(this); diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc index 2f509c62c21e..e754ee5e5f29 100644 --- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_posix.cc.orig 2022-07-22 17:30:31 UTC +--- net/socket/udp_socket_posix.cc.orig 2022-09-24 10:57:32 UTC +++ net/socket/udp_socket_posix.cc -@@ -563,7 +563,7 @@ int UDPSocketPosix::SetDoNotFragment() { +@@ -559,7 +559,7 @@ int UDPSocketPosix::SetDoNotFragment() { } void UDPSocketPosix::SetMsgConfirm(bool confirm) { @@ -9,7 +9,7 @@ if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { -@@ -584,7 +584,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { +@@ -580,7 +580,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); int value = broadcast ? 1 : 0; int rv; @@ -18,7 +18,7 @@ // SO_REUSEPORT on OSX permits multiple processes to each receive // UDP multicast or broadcast datagrams destined for the bound // port. -@@ -897,7 +897,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) +@@ -893,7 +893,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) #if BUILDFLAG(IS_CHROMEOS_ASH) if (last_error == EINVAL) return ERR_ADDRESS_IN_USE; diff --git a/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h b/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h index a9e21cf2f83d..71e4b623311b 100644 --- a/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h +++ b/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h @@ -1,6 +1,6 @@ ---- net/traffic_annotation/network_traffic_annotation.h.orig 2022-08-31 12:19:35 UTC +--- net/traffic_annotation/network_traffic_annotation.h.orig 2022-09-24 10:57:32 UTC +++ net/traffic_annotation/network_traffic_annotation.h -@@ -372,7 +372,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { +@@ -373,7 +373,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { } // namespace net // Placeholder for unannotated usages. @@ -9,7 +9,7 @@ #define TRAFFIC_ANNOTATION_WITHOUT_PROTO(ANNOTATION_ID) \ net::DefineNetworkTrafficAnnotation(ANNOTATION_ID, "No proto yet.") #endif -@@ -386,7 +386,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { +@@ -387,7 +387,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ diff --git a/www/chromium/files/patch-remoting_host_policy__watcher.cc b/www/chromium/files/patch-remoting_host_policy__watcher.cc index f21c4790a83c..b1bd53cbcf72 100644 --- a/www/chromium/files/patch-remoting_host_policy__watcher.cc +++ b/www/chromium/files/patch-remoting_host_policy__watcher.cc @@ -1,11 +1,11 @@ ---- remoting/host/policy_watcher.cc.orig 2022-08-31 12:19:35 UTC +--- remoting/host/policy_watcher.cc.orig 2022-09-24 10:57:32 UTC +++ remoting/host/policy_watcher.cc -@@ -177,7 +177,7 @@ std::unique_ptr<base::DictionaryValue> PolicyWatcher:: - auto result = std::make_unique<base::DictionaryValue>(); - result->SetBoolKey(key::kRemoteAccessHostFirewallTraversal, true); - result->SetBoolKey(key::kRemoteAccessHostRequireCurtain, false); +@@ -184,7 +184,7 @@ std::unique_ptr<base::DictionaryValue> PolicyWatcher:: + result->SetStringKey(key::kRemoteAccessHostUdpPortRange, ""); + result->SetIntKey(key::kRemoteAccessHostClipboardSizeBytes, -1); + result->SetBoolKey(key::kRemoteAccessHostAllowRemoteSupportConnections, true); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) result->SetBoolKey(key::kRemoteAccessHostMatchUsername, false); #endif - result->Set(key::kRemoteAccessHostClientDomainList, + #if !BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc index 9e73fa2e6ae5..88471692e958 100644 --- a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2022-08-31 12:19:35 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2022-09-24 10:57:32 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -124,7 +124,7 @@ +@@ -125,7 +125,7 @@ #include "remoting/host/mac/permission_utils.h" #endif // BUILDFLAG(IS_APPLE) @@ -9,7 +9,7 @@ #include <gtk/gtk.h> #include "ui/events/platform/x11/x11_event_source.h" -@@ -132,13 +132,13 @@ +@@ -133,13 +133,13 @@ #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && // defined(REMOTING_USE_X11) @@ -25,7 +25,7 @@ #include "remoting/host/host_utmp_logger.h" #endif -@@ -176,7 +176,7 @@ const char kApplicationName[] = "chromoting"; +@@ -177,7 +177,7 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -34,7 +34,7 @@ // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; -@@ -381,7 +381,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -385,7 +385,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; @@ -43,7 +43,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -447,7 +447,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -451,7 +451,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<HostStatusLogger> host_status_logger_; std::unique_ptr<HostEventLogger> host_event_logger_; @@ -52,7 +52,7 @@ std::unique_ptr<HostUTMPLogger> host_utmp_logger_; #endif std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_; -@@ -753,7 +753,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -759,7 +759,7 @@ void HostProcess::StartOnNetworkThread() { void HostProcess::ShutdownOnNetworkThread() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); config_watcher_.reset(); @@ -61,7 +61,7 @@ cert_watcher_.reset(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -812,7 +812,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -818,7 +818,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); @@ -70,7 +70,7 @@ if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -922,7 +922,7 @@ void HostProcess::StartOnUiThread() { +@@ -937,7 +937,7 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -79,7 +79,7 @@ // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()-> -@@ -993,7 +993,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1008,7 +1008,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -88,7 +88,7 @@ // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. -@@ -1001,7 +1001,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1016,7 +1016,7 @@ void HostProcess::ShutdownOnUiThread() { AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -97,7 +97,7 @@ context_->input_task_runner()->PostTask( FROM_HERE, base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); })); -@@ -1328,7 +1328,7 @@ bool HostProcess::OnUsernamePolicyUpdate(base::Diction +@@ -1343,7 +1343,7 @@ bool HostProcess::OnUsernamePolicyUpdate(base::Diction // Returns false: never restart the host after this policy update. DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); @@ -106,7 +106,7 @@ absl::optional<bool> host_username_match_required = policies->FindBoolKey(policy::key::kRemoteAccessHostMatchUsername); if (!host_username_match_required.has_value()) -@@ -1712,7 +1712,7 @@ void HostProcess::StartHost() { +@@ -1727,7 +1727,7 @@ void HostProcess::StartHost() { // The feature is enabled for all Googlers using a supported platform. desktop_environment_options_.set_enable_remote_open_url(is_googler_); @@ -115,7 +115,7 @@ desktop_environment_options_.set_enable_remote_webauthn(is_googler_); #endif -@@ -1745,7 +1745,7 @@ void HostProcess::StartHost() { +@@ -1760,7 +1760,7 @@ void HostProcess::StartHost() { host_status_logger_ = std::make_unique<HostStatusLogger>( host_->status_monitor(), log_to_server_.get()); @@ -124,7 +124,7 @@ const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->HasSwitch(kEnableUtempter)) host_utmp_logger_ = -@@ -1916,7 +1916,7 @@ int HostProcessMain() { +@@ -1929,7 +1929,7 @@ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); @@ -133,7 +133,7 @@ #if defined(REMOTING_USE_X11) // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) -@@ -1962,7 +1962,7 @@ int HostProcessMain() { +@@ -1975,7 +1975,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); diff --git a/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc b/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc index 95c3357b6bc0..9dc991b808a7 100644 --- a/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc +++ b/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc @@ -1,4 +1,4 @@ ---- remoting/host/webauthn/remote_webauthn_caller_security_utils.cc.orig 2022-06-17 14:20:10 UTC +--- remoting/host/webauthn/remote_webauthn_caller_security_utils.cc.orig 2022-09-24 10:57:32 UTC +++ remoting/host/webauthn/remote_webauthn_caller_security_utils.cc @@ -9,7 +9,7 @@ #include "base/strings/utf_string_conversions.h" @@ -26,4 +26,4 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::ProcessId parent_pid = base::GetParentProcessId(base::GetCurrentProcessHandle()); - base::FilePath parent_image_path = GetProcessImagePath(parent_pid); + // Note that on Linux the process image may no longer exist in its original diff --git a/www/chromium/files/patch-services_device_compute__pressure_cpu__probe.cc b/www/chromium/files/patch-services_device_compute__pressure_cpu__probe.cc index 5572a0dfcbc9..f030a9ea98db 100644 --- a/www/chromium/files/patch-services_device_compute__pressure_cpu__probe.cc +++ b/www/chromium/files/patch-services_device_compute__pressure_cpu__probe.cc @@ -1,8 +1,8 @@ ---- services/device/compute_pressure/cpu_probe.cc.orig 2022-08-31 12:19:35 UTC +--- services/device/compute_pressure/cpu_probe.cc.orig 2022-09-24 10:57:32 UTC +++ services/device/compute_pressure/cpu_probe.cc -@@ -55,6 +55,7 @@ std::unique_ptr<CpuProbe> CpuProbe::Create() { - #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - return CpuProbeLinux::Create(); +@@ -63,6 +63,7 @@ std::unique_ptr<CpuProbe> CpuProbe::Create() { + #elif BUILDFLAG(IS_MAC) + return CpuProbeMac::Create(); #else + NOTIMPLEMENTED(); return std::make_unique<NullCpuProbe>(); diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index 55702619e13f..ed781603ee0a 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 2022-08-31 12:19:35 UTC +--- services/network/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ services/network/BUILD.gn -@@ -327,7 +327,6 @@ if (is_linux || is_chromeos) { +@@ -322,7 +322,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc index 8e29c702aacb..384827937c06 100644 --- a/www/chromium/files/patch-services_network_network__service.cc +++ b/www/chromium/files/patch-services_network_network__service.cc @@ -1,6 +1,6 @@ ---- services/network/network_service.cc.orig 2022-08-31 12:19:35 UTC +--- services/network/network_service.cc.orig 2022-09-24 10:57:32 UTC +++ services/network/network_service.cc -@@ -82,7 +82,7 @@ +@@ -83,7 +83,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #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 5e462114f712..19c7f81488ab 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 2022-08-31 12:19:35 UTC +--- third_party/abseil-cpp/absl/base/config.h.orig 2022-09-24 10:57:32 UTC +++ third_party/abseil-cpp/absl/base/config.h -@@ -447,7 +447,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -458,7 +458,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != // POSIX.1-2001. #ifdef ABSL_HAVE_SCHED_YIELD #error ABSL_HAVE_SCHED_YIELD cannot be directly set @@ -10,7 +10,7 @@ #define ABSL_HAVE_SCHED_YIELD 1 #endif -@@ -462,7 +463,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -473,7 +474,7 @@ 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 index b28aae3acd42..64c9cb18173e 100644 --- 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 @@ -1,10 +1,10 @@ ---- third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc.orig 2022-02-07 13:39:41 UTC +--- third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc.orig 2022-09-24 10:57:32 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) +-#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) +#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) && !defined(__FreeBSD__) #define _XOPEN_SOURCE // Definedness suffices for strptime. #endif diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index bbc369cd3eaf..3ac8d680911a 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 2022-09-01 05:13:41 UTC +--- third_party/angle/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ third_party/angle/BUILD.gn -@@ -247,7 +247,6 @@ config("extra_warnings") { +@@ -261,7 +261,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,7 +8,7 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -425,7 +424,7 @@ angle_static_library("angle_common") { +@@ -439,7 +438,7 @@ angle_static_library("angle_common") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -551,6 +550,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -569,6 +568,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] @@ -27,7 +27,7 @@ } if (angle_use_wayland && angle_has_build) { -@@ -1068,12 +1070,12 @@ if (angle_use_wayland) { +@@ -1089,12 +1091,12 @@ if (angle_use_wayland) { "wayland-client", "wayland-egl", ] 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 2cd765850710..eca81ec0f0f5 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,6 +1,6 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2022-08-31 12:19:35 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2022-09-24 10:57:32 UTC +++ third_party/angle/src/libANGLE/Display.cpp -@@ -55,7 +55,7 @@ +@@ -54,7 +54,7 @@ # include "libANGLE/renderer/gl/wgl/DisplayWGL.h" # elif defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_IOS) # include "libANGLE/renderer/gl/apple/DisplayApple_api.h" @@ -9,7 +9,7 @@ # include "libANGLE/renderer/gl/egl/DisplayEGL.h" # if defined(ANGLE_USE_GBM) # include "libANGLE/renderer/gl/egl/gbm/DisplayGbm.h" -@@ -326,7 +326,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -331,7 +331,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateDisplayCGLOrEAGL(state); break; @@ -18,7 +18,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -369,7 +369,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -374,7 +374,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di #if defined(ANGLE_ENABLE_OPENGL) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayWGL(state); @@ -27,7 +27,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0 || platformType == EGL_PLATFORM_VULKAN_DISPLAY_MODE_HEADLESS_ANGLE) -@@ -420,7 +420,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -425,7 +425,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()) { -@@ -1978,7 +1978,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -1986,7 +1986,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/chromium/files/patch-third__party_angle_src_third__party_volk_BUILD.gn b/www/chromium/files/patch-third__party_angle_src_third__party_volk_BUILD.gn index 4220124fd028..54087977206b 100644 --- a/www/chromium/files/patch-third__party_angle_src_third__party_volk_BUILD.gn +++ b/www/chromium/files/patch-third__party_angle_src_third__party_volk_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/angle/src/third_party/volk/BUILD.gn.orig 2022-09-01 05:13:41 UTC +--- third_party/angle/src/third_party/volk/BUILD.gn.orig 2022-09-25 07:07:39 UTC +++ third_party/angle/src/third_party/volk/BUILD.gn @@ -20,7 +20,7 @@ source_set("volk") { public_configs = [ ":volk_config" ] diff --git a/www/chromium/files/patch-third__party_blink_public_platform_platform.h b/www/chromium/files/patch-third__party_blink_public_platform_platform.h index b12402e13c57..025a5a647911 100644 --- a/www/chromium/files/patch-third__party_blink_public_platform_platform.h +++ b/www/chromium/files/patch-third__party_blink_public_platform_platform.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/platform/platform.h.orig 2022-08-31 12:19:35 UTC +--- third_party/blink/public/platform/platform.h.orig 2022-09-24 10:57:32 UTC +++ third_party/blink/public/platform/platform.h -@@ -349,7 +349,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -340,7 +340,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; } 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 32136a740d9d..92cb72b020cc 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 2022-08-31 12:19:35 UTC +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2022-09-24 10:57:32 UTC +++ third_party/blink/renderer/controller/blink_initializer.cc @@ -74,12 +74,12 @@ #include "third_party/blink/renderer/controller/oom_intervention_impl.h" @@ -24,8 +24,8 @@ // Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring. if (UserLevelMemoryPressureSignalGenerator::Enabled()) UserLevelMemoryPressureSignalGenerator::Instance(); -@@ -251,7 +251,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder - main_thread->GetTaskRunner()); +@@ -253,7 +253,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder + main_thread_task_runner); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc b/www/chromium/files/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc new file mode 100644 index 000000000000..d9a9f14ec8c6 --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc @@ -0,0 +1,11 @@ +--- third_party/blink/renderer/core/execution_context/navigator_base.cc.orig 2022-09-24 10:57:32 UTC ++++ third_party/blink/renderer/core/execution_context/navigator_base.cc +@@ -31,7 +31,7 @@ String GetReducedNavigatorPlatform() { + return "Win32"; + #elif BUILDFLAG(IS_FUCHSIA) + return ""; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return "Linux x86_64"; + #else + #error Unsupported platform 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 96eb69ebf024..5522619a709a 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-08-31 12:19:35 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-09-24 10:57:32 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -401,7 +401,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( +@@ -404,7 +404,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3212,7 +3212,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3254,7 +3254,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs renderer_preferences_.use_subpixel_positioning); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc index 1e47f49f242e..253544de2af7 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2022-08-31 12:19:35 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2022-09-24 10:57:32 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6341,7 +6341,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6357,7 +6357,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { MoveCaretStaysHorizontallyAlignedWhenMoved #endif // TODO(crbug.com/1317375): Build these tests on all platforms. @@ -9,7 +9,7 @@ TEST_F(WebFrameTest, MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved) { RegisterMockedHttpURLLoad("move_caret.html"); -@@ -6737,7 +6737,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc +@@ -6753,7 +6753,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) { RunTest("composited_selection_bounds_large_selection_noscroll.html"); } diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index 03a35f1e970c..af80d2e77e02 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2022-05-19 14:06:27 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2022-09-24 10:57:32 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc @@ -65,7 +65,7 @@ #include "ui/display/screen_info.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -360,7 +360,7 @@ void LayoutView::UpdateLayout() { +@@ -359,7 +359,7 @@ void LayoutView::UpdateLayout() { DCHECK(!layout_state_); LayoutState root_layout_state(*this); 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 150ecdb32192..6a32598dbbbc 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 2022-02-28 16:54:41 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2022-09-24 10:57:32 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -108,7 +108,7 @@ namespace blink { +@@ -110,7 +110,7 @@ namespace blink { namespace { 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 691b2cb7205e..54a80e6d01b9 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 2022-08-31 12:19:35 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2022-09-24 10:57:32 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6103,7 +6103,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6152,7 +6152,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn index acdddbd32336..c815bcde96cd 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 2022-08-31 12:19:35 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -1893,7 +1893,7 @@ static_library("test_support") { +@@ -1895,7 +1895,7 @@ static_library("test_support") { ] # fuzzed_data_provider may not work with a custom toolchain. diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index e4a946da2ee4..4846865c6624 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2022-05-19 14:06:27 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2022-09-24 10:57:32 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h -@@ -57,7 +57,7 @@ +@@ -58,7 +58,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" #include "third_party/skia/include/core/SkRefCnt.h" 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 5931bd6cd3f6..bc1833cc160e 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,4 +1,4 @@ ---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2022-08-31 12:19:35 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2022-09-24 10:57:32 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 @@ -33,7 +33,7 @@ // shipped stable can have its runtime flag removed soon after. @@ -9,7 +9,7 @@ }, // "implied_by" or "depends_on" specifies relationship to other features: -@@ -1049,7 +1049,7 @@ +@@ -1014,7 +1014,7 @@ depends_on: ["FileSystemAccess"], status: {"Android": "test", "default": "experimental"}, origin_trial_feature_name: "FileHandling", @@ -18,7 +18,7 @@ }, { name: "FileHandlingIcons", -@@ -2357,7 +2357,7 @@ +@@ -2320,7 +2320,7 @@ { name: "U2FSecurityKeyAPI", origin_trial_feature_name: "U2FSecurityKeyAPI", @@ -27,7 +27,7 @@ origin_trial_type: "deprecation", }, { -@@ -2372,7 +2372,7 @@ +@@ -2335,7 +2335,7 @@ { name: "UnrestrictedSharedArrayBuffer", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -36,7 +36,7 @@ }, { name: "URLPatternCompareComponent", -@@ -2390,7 +2390,7 @@ +@@ -2353,7 +2353,7 @@ origin_trial_feature_name: "UserAgentReduction", origin_trial_allows_third_party: true, // iOS not included as it should not send a reduced User-Agent string. @@ -45,7 +45,7 @@ }, { name: "V8IdleTasks", -@@ -2510,12 +2510,12 @@ +@@ -2468,12 +2468,12 @@ name: "WebAppUrlHandling", status: "experimental", origin_trial_feature_name: "WebAppUrlHandling", diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc index 663a0aae4c12..f028e7064cb4 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2022-08-31 12:19:35 UTC +--- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2022-09-24 10:57:32 UTC +++ third_party/blink/renderer/platform/scheduler/common/thread.cc -@@ -97,7 +97,7 @@ void Thread::CreateAndSetCompositorThread() { +@@ -86,7 +86,7 @@ void Thread::CreateAndSetCompositorThread() { std::make_unique<scheduler::CompositorThread>(params); compositor_thread->Init(); diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc index 34387530f409..7266ea5a0a80 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc.orig 2022-08-31 12:19:35 UTC +--- third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc.orig 2022-09-24 10:57:32 UTC +++ third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc @@ -256,7 +256,7 @@ void CategorizedWorkerPool::Start(int num_normal_threa "CompositorTileWorkerBackground", thread_options, this, @@ -7,5 +7,5 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) thread->SetBackgroundingCallback( - Thread::MainThread()->GetTaskRunner(), + Thread::MainThread()->GetDeprecatedTaskRunner(), base::BindOnce([](base::PlatformThreadId thread_id) { diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_internal.h b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_internal.h index 603745fa809c..8aa6cee953ff 100644 --- a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_internal.h +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_internal.h @@ -1,6 +1,6 @@ ---- third_party/boringssl/src/crypto/fipsmodule/rand/internal.h.orig 2022-03-25 21:59:56 UTC +--- third_party/boringssl/src/crypto/fipsmodule/rand/internal.h.orig 2022-09-24 10:57:32 UTC +++ third_party/boringssl/src/crypto/fipsmodule/rand/internal.h -@@ -26,7 +26,8 @@ extern "C" { +@@ -27,7 +27,8 @@ extern "C" { #if !defined(OPENSSL_WINDOWS) && !defined(OPENSSL_FUCHSIA) && \ diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_refcount__c11.c b/www/chromium/files/patch-third__party_boringssl_src_crypto_refcount__c11.c index 77f5256190d9..242082f7dfa1 100644 --- a/www/chromium/files/patch-third__party_boringssl_src_crypto_refcount__c11.c +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_refcount__c11.c @@ -1,8 +1,8 @@ ---- third_party/boringssl/src/crypto/refcount_c11.c.orig 2022-02-07 13:39:41 UTC +--- third_party/boringssl/src/crypto/refcount_c11.c.orig 2022-09-24 10:57:32 UTC +++ third_party/boringssl/src/crypto/refcount_c11.c -@@ -24,6 +24,9 @@ - - #include <openssl/type_check.h> +@@ -22,6 +22,9 @@ + #include <stdatomic.h> + #include <stdlib.h> +#if !defined(__cplusplus) && !defined(static_assert) +#define static_assert _Static_assert diff --git a/www/chromium/files/patch-third__party_boringssl_src_include_openssl_base.h b/www/chromium/files/patch-third__party_boringssl_src_include_openssl_base.h index 54bc562d67b7..9f1ca83f891a 100644 --- a/www/chromium/files/patch-third__party_boringssl_src_include_openssl_base.h +++ b/www/chromium/files/patch-third__party_boringssl_src_include_openssl_base.h @@ -1,6 +1,6 @@ ---- third_party/boringssl/src/include/openssl/base.h.orig 2022-07-22 17:30:31 UTC +--- third_party/boringssl/src/include/openssl/base.h.orig 2022-09-24 10:57:32 UTC +++ third_party/boringssl/src/include/openssl/base.h -@@ -155,6 +155,11 @@ extern "C" { +@@ -156,6 +156,11 @@ extern "C" { #define OPENSSL_FUCHSIA #endif diff --git a/www/chromium/files/patch-third__party_dawn_src_dawn_common_Platform.h b/www/chromium/files/patch-third__party_dawn_src_dawn_common_Platform.h index f9441bdf30c1..549b9c83c417 100644 --- a/www/chromium/files/patch-third__party_dawn_src_dawn_common_Platform.h +++ b/www/chromium/files/patch-third__party_dawn_src_dawn_common_Platform.h @@ -1,6 +1,6 @@ ---- third_party/dawn/src/dawn/common/Platform.h.orig 2022-07-22 17:30:31 UTC +--- third_party/dawn/src/dawn/common/Platform.h.orig 2022-09-24 10:57:32 UTC +++ third_party/dawn/src/dawn/common/Platform.h -@@ -26,6 +26,11 @@ +@@ -45,6 +45,11 @@ #error "Unsupported Windows platform." #endif diff --git a/www/chromium/files/patch-third__party_ipcz_src_reference__drivers_random.cc b/www/chromium/files/patch-third__party_ipcz_src_reference__drivers_random.cc index 72bfd04f86a4..1d9d8c712564 100644 --- a/www/chromium/files/patch-third__party_ipcz_src_reference__drivers_random.cc +++ b/www/chromium/files/patch-third__party_ipcz_src_reference__drivers_random.cc @@ -1,4 +1,4 @@ ---- third_party/ipcz/src/reference_drivers/random.cc.orig 2022-06-17 14:20:10 UTC +--- third_party/ipcz/src/reference_drivers/random.cc.orig 2022-09-24 10:57:32 UTC +++ third_party/ipcz/src/reference_drivers/random.cc @@ -15,7 +15,7 @@ #include <limits> @@ -9,7 +9,7 @@ #include <asm/unistd.h> #include <errno.h> #include <sys/syscall.h> -@@ -77,7 +77,7 @@ void RandomBytes(absl::Span<uint8_t> destination) { +@@ -78,7 +78,7 @@ void RandomBytes(absl::Span<uint8_t> destination) { ABSL_ASSERT(ok); #elif BUILDFLAG(IS_FUCHSIA) zx_cprng_draw(destination.data(), destination.size()); diff --git a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h index a3e62caae06b..d9a9a382fcc4 100644 --- a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h +++ b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h @@ -1,12 +1,11 @@ ---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig 2022-02-07 13:39:41 UTC +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig 2022-09-24 10:57:32 UTC +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h -@@ -56,7 +56,8 @@ template <class T> boost::once_flag Singleton<T>::flag - #include "phonenumbers/base/logging.h" - #include "phonenumbers/base/thread_checker.h" - --#if !defined(__linux__) && !defined(__APPLE__) -+#if !defined(__linux__) && !defined(__APPLE__) && !defined(__OpenBSD__) && \ -+ !defined(__FreeBSD__) - - namespace i18n { - namespace phonenumbers { +@@ -22,7 +22,7 @@ + #elif (__cplusplus >= 201103L) && defined(I18N_PHONENUMBERS_USE_STDMUTEX) + // C++11 Lock implementation based on std::mutex. + #include "phonenumbers/base/memory/singleton_stdmutex.h" +-#elif defined(__linux__) || defined(__APPLE__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) ++#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) + #include "phonenumbers/base/memory/singleton_posix.h" + #elif defined(WIN32) + #include "phonenumbers/base/memory/singleton_win32.h" diff --git a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h index d4937d88891e..d3ed3a10d84d 100644 --- a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h +++ b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h @@ -1,12 +1,11 @@ ---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig 2022-02-07 13:39:41 UTC +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig 2022-09-24 10:57:32 UTC +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h -@@ -63,7 +63,8 @@ class Lock { (private) - // Dummy lock implementation on non-POSIX platforms. If you are running on a - // different platform and care about thread-safety, please compile with - // -DI18N_PHONENUMBERS_USE_BOOST. --#elif !defined(__linux__) && !defined(__APPLE__) -+#elif !defined(__linux__) && !defined(__APPLE__) && !defined(__OpenBSD__) && \ -+ !defined(__FreeBSD__) - - namespace i18n { - namespace phonenumbers { +@@ -22,7 +22,7 @@ + #elif (__cplusplus >= 201103L) && defined(I18N_PHONENUMBERS_USE_STDMUTEX) + // C++11 Lock implementation based on std::mutex. + #include "phonenumbers/base/synchronization/lock_stdmutex.h" +-#elif defined(__linux__) || defined(__APPLE__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) ++#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) + #include "phonenumbers/base/synchronization/lock_posix.h" + #elif defined(WIN32) + #include "phonenumbers/base/synchronization/lock_win32.h" diff --git a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h index 396e8136c4ed..727f486668a0 100644 --- a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h +++ b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h @@ -1,22 +1,20 @@ ---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig 2022-02-07 13:39:41 UTC +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig 2022-09-24 10:57:32 UTC +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h -@@ -23,7 +23,8 @@ +@@ -22,7 +22,7 @@ + // Note that I18N_PHONENUMBERS_NO_THREAD_SAFETY must be defined only to let the // user of the library know that it can't be used in a thread-safe manner when // it is not depending on Boost. - #if !defined(__linux__) && !defined(__APPLE__) && \ -- !defined(I18N_PHONENUMBERS_NO_THREAD_SAFETY) -+ !defined(I18N_PHONENUMBERS_NO_THREAD_SAFETY) && !defined(__OpenBSD__) && \ -+ !defined(__FreeBSD__) - #error Building without Boost, please provide \ - -DI18N_PHONENUMBERS_NO_THREAD_SAFETY - #endif -@@ -31,7 +32,8 @@ +-#if !defined(__linux__) && !defined(__APPLE__) && !defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) && \ ++#if !defined(__linux__) && !defined(__APPLE__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) && \ + !defined(I18N_PHONENUMBERS_NO_THREAD_SAFETY) && \ + !((__cplusplus >= 201103L) && defined(I18N_PHONENUMBERS_USE_STDMUTEX)) && \ + !defined(WIN32) +@@ -33,7 +33,7 @@ #endif #if !defined(NDEBUG) && !defined(I18N_PHONENUMBERS_USE_BOOST) && \ -- (defined(__linux__) || defined(__apple__)) -+ (defined(__linux__) || defined(__apple__) || defined(__OpenBSD__) || \ -+ defined(__FreeBSD__)) +- (defined(__linux__) || defined(__APPLE__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD)) ++ (defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD)) #include <pthread.h> diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp index 9042d78d56ea..f5b3d21404d0 100644 --- a/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp +++ b/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2022-02-28 16:54:41 UTC +--- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2022-09-24 10:57:32 UTC +++ third_party/pdfium/core/fxge/cfx_fontmapper.cpp -@@ -155,7 +155,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { +@@ -157,7 +157,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { {"ForteMT", "Forte"}, }; diff --git a/www/chromium/files/patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto b/www/chromium/files/patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto new file mode 100644 index 000000000000..59893e67db88 --- /dev/null +++ b/www/chromium/files/patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto @@ -0,0 +1,56 @@ +--- third_party/perfetto/protos/perfetto/trace/ftrace/v4l2.proto.orig 2022-09-24 10:57:32 UTC ++++ third_party/perfetto/protos/perfetto/trace/ftrace/v4l2.proto +@@ -10,7 +10,7 @@ message V4l2QbufFtraceEvent { + optional uint32 field = 2; + optional uint32 flags = 3; + optional uint32 index = 4; +- optional int32 minor = 5; ++ optional int32 gminor = 5; + optional uint32 sequence = 6; + optional uint32 timecode_flags = 7; + optional uint32 timecode_frames = 8; +@@ -30,7 +30,7 @@ message V4l2DqbufFtraceEvent { + optional uint32 field = 2; + optional uint32 flags = 3; + optional uint32 index = 4; +- optional int32 minor = 5; ++ optional int32 gminor = 5; + optional uint32 sequence = 6; + optional uint32 timecode_flags = 7; + optional uint32 timecode_frames = 8; +@@ -48,7 +48,7 @@ message V4l2DqbufFtraceEvent { + message Vb2V4l2BufQueueFtraceEvent { + optional uint32 field = 1; + optional uint32 flags = 2; +- optional int32 minor = 3; ++ optional int32 gminor = 3; + optional uint32 sequence = 4; + optional uint32 timecode_flags = 5; + optional uint32 timecode_frames = 6; +@@ -65,7 +65,7 @@ message Vb2V4l2BufQueueFtraceEvent { + message Vb2V4l2BufDoneFtraceEvent { + optional uint32 field = 1; + optional uint32 flags = 2; +- optional int32 minor = 3; ++ optional int32 gminor = 3; + optional uint32 sequence = 4; + optional uint32 timecode_flags = 5; + optional uint32 timecode_frames = 6; +@@ -82,7 +82,7 @@ message Vb2V4l2BufDoneFtraceEvent { + message Vb2V4l2QbufFtraceEvent { + optional uint32 field = 1; + optional uint32 flags = 2; +- optional int32 minor = 3; ++ optional int32 gminor = 3; + optional uint32 sequence = 4; + optional uint32 timecode_flags = 5; + optional uint32 timecode_frames = 6; +@@ -99,7 +99,7 @@ message Vb2V4l2QbufFtraceEvent { + message Vb2V4l2DqbufFtraceEvent { + optional uint32 field = 1; + optional uint32 flags = 2; +- optional int32 minor = 3; ++ optional int32 gminor = 3; + optional uint32 sequence = 4; + optional uint32 timecode_flags = 5; + optional uint32 timecode_frames = 6; diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc index f201ad28c782..728e2847b2f5 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc @@ -1,4 +1,4 @@ ---- third_party/perfetto/src/base/unix_socket.cc.orig 2022-08-31 12:19:35 UTC +--- third_party/perfetto/src/base/unix_socket.cc.orig 2022-09-24 10:57:32 UTC +++ third_party/perfetto/src/base/unix_socket.cc @@ -42,7 +42,7 @@ #include <unistd.h> @@ -9,7 +9,7 @@ #include <sys/ucred.h> #endif -@@ -790,9 +790,13 @@ void UnixSocket::ReadPeerCredentialsPosix() { +@@ -801,9 +801,13 @@ void UnixSocket::ReadPeerCredentialsPosix() { return; PERFETTO_CHECK(peer_cred_mode_ != SockPeerCredMode::kIgnore); diff --git a/www/chromium/files/patch-third__party_ruy_BUILD.gn b/www/chromium/files/patch-third__party_ruy_BUILD.gn index f7f2d074ca7a..099797fc506e 100644 --- a/www/chromium/files/patch-third__party_ruy_BUILD.gn +++ b/www/chromium/files/patch-third__party_ruy_BUILD.gn @@ -1,8 +1,8 @@ ---- third_party/ruy/BUILD.gn.orig 2022-08-31 12:19:35 UTC +--- third_party/ruy/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ third_party/ruy/BUILD.gn -@@ -11,7 +11,7 @@ use_cpuinfo = - # cpuinfo is not supported on Windows on ARM yet. - !(is_win && current_cpu == "arm64") && +@@ -9,7 +9,7 @@ use_cpuinfo = + current_cpu != "ppc64" && current_cpu != "ppc64le" && + current_cpu != "s390" && current_cpu != "s390x" && # cpuinfo is not supported on fuchsia. - !is_fuchsia && + !is_fuchsia && !is_bsd && diff --git a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn index 36aa7017411e..af0484fa3187 100644 --- a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2022-07-22 17:30:31 UTC +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ third_party/webrtc/modules/audio_device/BUILD.gn -@@ -294,7 +294,7 @@ rtc_library("audio_device_impl") { +@@ -299,7 +299,7 @@ rtc_library("audio_device_impl") { if (rtc_use_dummy_audio_file_devices) { defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] } else { diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn index d68887cf10e4..9c8bb40ae876 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/BUILD.gn.orig 2022-08-31 12:19:35 UTC +--- third_party/webrtc/rtc_base/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ third_party/webrtc/rtc_base/BUILD.gn -@@ -1243,7 +1243,7 @@ rtc_library("rtc_base") { +@@ -1250,7 +1250,7 @@ rtc_library("rtc_base") { sources += [ "mac_ifaddrs_converter.cc" ] } diff --git a/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc b/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc index 8004dec2996e..de2fe5444183 100644 --- a/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc +++ b/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc @@ -1,6 +1,6 @@ ---- tools/gn/src/base/files/file_posix.cc.orig 2021-09-24 04:34:58 UTC +--- tools/gn/src/base/files/file_posix.cc.orig 2022-09-24 10:57:32 UTC +++ tools/gn/src/base/files/file_posix.cc -@@ -369,7 +369,7 @@ void File::DoInitialize(const FilePath& path, uint32_t +@@ -371,7 +371,7 @@ void File::DoInitialize(const FilePath& path, uint32_t bool File::Flush() { DCHECK(IsValid()); diff --git a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc deleted file mode 100644 index 792c782a234f..000000000000 --- a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- ui/base/ime/init/input_method_initializer.cc.orig 2022-08-31 12:19:35 UTC -+++ ui/base/ime/init/input_method_initializer.cc -@@ -10,7 +10,7 @@ - #include "build/chromeos_buildflags.h" - - #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - #include "ui/base/ime/linux/fake_input_method_context.h" - #include "ui/base/ime/linux/linux_input_method_context_factory.h" - #elif BUILDFLAG(IS_WIN) -@@ -34,7 +34,7 @@ void ShutdownInputMethod() { - - void InitializeInputMethodForTesting() { - #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - GetInputMethodContextFactoryForTest() = - base::BindRepeating([](LinuxInputMethodContextDelegate* delegate) - -> std::unique_ptr<LinuxInputMethodContext> { -@@ -47,7 +47,7 @@ void InitializeInputMethodForTesting() { - - void ShutdownInputMethodForTesting() { - #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - // The function owns the factory (as a static variable that's returned by - // reference), so setting this to an empty factory will free the old one. - GetInputMethodContextFactoryForTest() = LinuxInputMethodContextFactory(); diff --git a/www/chromium/files/patch-ui_base_ime_linux_linux__input__method__context__factory.cc b/www/chromium/files/patch-ui_base_ime_linux_linux__input__method__context__factory.cc index 92d34787a833..1c1f6204ed93 100644 --- a/www/chromium/files/patch-ui_base_ime_linux_linux__input__method__context__factory.cc +++ b/www/chromium/files/patch-ui_base_ime_linux_linux__input__method__context__factory.cc @@ -1,4 +1,4 @@ ---- ui/base/ime/linux/linux_input_method_context_factory.cc.orig 2022-08-31 12:19:35 UTC +--- ui/base/ime/linux/linux_input_method_context_factory.cc.orig 2022-09-27 14:30:33 UTC +++ ui/base/ime/linux/linux_input_method_context_factory.cc @@ -9,7 +9,7 @@ #include "build/build_config.h" @@ -9,12 +9,12 @@ #include "ui/linux/linux_ui.h" #include "ui/linux/linux_ui_delegate.h" #endif -@@ -37,7 +37,7 @@ std::unique_ptr<LinuxInputMethodContext> CreateLinuxIn - if (auto context = factory.Run(delegate)) - return context; +@@ -32,7 +32,7 @@ std::unique_ptr<LinuxInputMethodContext> CreateLinuxIn + if (auto factory = GetInputMethodContextFactoryForTest()) + return factory.Run(delegate); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Finally, let the toolkit create the context. + // Give the toolkit a chance to create the context. if (auto* linux_ui = LinuxUi::instance()) { if (auto context = linux_ui->CreateInputMethodContext(delegate)) 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 19ffbdf18f51..2ddfb1888a95 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/chromium/files/patch-ui_base_ui__base__features.cc @@ -1,6 +1,6 @@ ---- ui/base/ui_base_features.cc.orig 2022-08-31 12:19:35 UTC +--- ui/base/ui_base_features.cc.orig 2022-09-24 10:57:32 UTC +++ ui/base/ui_base_features.cc -@@ -189,7 +189,7 @@ const base::Feature kExperimentalFlingAnimation { +@@ -185,7 +185,7 @@ const base::Feature kExperimentalFlingAnimation { // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -287,7 +287,7 @@ bool IsForcedColorsEnabled() { +@@ -283,7 +283,7 @@ bool IsForcedColorsEnabled() { // milestones. const base::Feature kEyeDropper { "EyeDropper", diff --git a/www/chromium/files/patch-ui_color_color__id.h b/www/chromium/files/patch-ui_color_color__id.h index ced7b4ba0bee..be24eb6e1e52 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 2022-08-31 12:19:35 UTC +--- ui/color/color_id.h.orig 2022-09-24 10:57:32 UTC +++ ui/color/color_id.h -@@ -238,7 +238,7 @@ +@@ -240,7 +240,7 @@ E_CPONLY(kColorNativeColor6) \ E_CPONLY(kColorNativeBaseColor) \ E_CPONLY(kColorNativeSecondaryColor) diff --git a/www/chromium/files/patch-ui_events_event.cc b/www/chromium/files/patch-ui_events_event.cc index 4c588c77b542..5706f7afcc9b 100644 --- a/www/chromium/files/patch-ui_events_event.cc +++ b/www/chromium/files/patch-ui_events_event.cc @@ -1,6 +1,6 @@ ---- ui/events/event.cc.orig 2022-03-25 21:59:56 UTC +--- ui/events/event.cc.orig 2022-09-24 10:57:32 UTC +++ ui/events/event.cc -@@ -453,7 +453,7 @@ std::string LocatedEvent::ToString() const { +@@ -425,7 +425,7 @@ std::string LocatedEvent::ToString() const { MouseEvent::MouseEvent(const PlatformEvent& native_event) : LocatedEvent(native_event), changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)), @@ -9,7 +9,7 @@ movement_(GetMouseMovementFromNative(native_event)), #endif pointer_details_(GetMousePointerDetailsFromNative(native_event)) { -@@ -935,7 +935,7 @@ void KeyEvent::InitializeNative() { +@@ -919,7 +919,7 @@ void KeyEvent::InitializeNative() { if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent())) set_flags(flags() | EF_IS_REPEAT); diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index 774a4f24f059..ddffd3609420 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 2022-08-31 12:19:35 UTC +--- ui/gfx/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ ui/gfx/BUILD.gn -@@ -587,7 +587,7 @@ source_set("memory_buffer_sources") { +@@ -588,7 +588,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h index 607274805c3f..5a800b9658f8 100644 --- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h +++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h @@ -1,4 +1,4 @@ ---- ui/gfx/gpu_memory_buffer.h.orig 2022-08-31 12:19:35 UTC +--- ui/gfx/gpu_memory_buffer.h.orig 2022-09-24 10:57:32 UTC +++ ui/gfx/gpu_memory_buffer.h @@ -15,7 +15,7 @@ #include "ui/gfx/geometry/rect.h" @@ -9,10 +9,10 @@ #include "ui/gfx/native_pixmap_handle.h" #elif BUILDFLAG(IS_MAC) #include "ui/gfx/mac/io_surface.h" -@@ -77,7 +77,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle { +@@ -75,7 +75,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle { base::UnsafeSharedMemoryRegion region; uint32_t offset = 0; - int32_t stride = 0; + uint32_t stride = 0; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) NativePixmapHandle native_pixmap_handle; diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn index 94ed646623e6..482f0dc68fa1 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 2022-07-22 17:30:31 UTC +--- ui/gl/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ ui/gl/BUILD.gn @@ -166,8 +166,6 @@ component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] @@ -17,7 +17,7 @@ "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -420,7 +417,6 @@ component("gl") { +@@ -422,7 +419,6 @@ component("gl") { data_deps += [ "//third_party/angle:libEGL", "//third_party/angle:libGLESv2", @@ -25,7 +25,7 @@ ] if (enable_swiftshader) { data_deps += [ -@@ -639,7 +635,6 @@ test("gl_unittests") { +@@ -641,7 +637,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", diff --git a/www/chromium/files/patch-ui_gl_generate__bindings.py b/www/chromium/files/patch-ui_gl_generate__bindings.py index 150dcfdbfe8a..6a8634d9b752 100644 --- a/www/chromium/files/patch-ui_gl_generate__bindings.py +++ b/www/chromium/files/patch-ui_gl_generate__bindings.py @@ -1,6 +1,6 @@ ---- ui/gl/generate_bindings.py.orig 2022-08-31 12:19:35 UTC +--- ui/gl/generate_bindings.py.orig 2022-09-24 10:57:32 UTC +++ ui/gl/generate_bindings.py -@@ -2932,6 +2932,9 @@ GLX_FUNCTIONS = [ +@@ -2933,6 +2933,9 @@ GLX_FUNCTIONS = [ 'arguments': 'Display* dpy, GLXDrawable drawable, int32_t* numerator, ' 'int32_t* denominator' }, diff --git a/www/chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc b/www/chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc index 564226c11a10..f9dcdc6d3e65 100644 --- a/www/chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc +++ b/www/chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc @@ -1,4 +1,4 @@ ---- ui/ozone/platform/headless/headless_surface_factory.cc.orig 2022-08-31 12:19:35 UTC +--- ui/ozone/platform/headless/headless_surface_factory.cc.orig 2022-09-24 10:57:32 UTC +++ ui/ozone/platform/headless/headless_surface_factory.cc @@ -34,7 +34,7 @@ #include "ui/ozone/platform/headless/headless_window_manager.h" @@ -9,7 +9,7 @@ #include "ui/ozone/platform/headless/vulkan_implementation_headless.h" #endif -@@ -279,7 +279,7 @@ std::unique_ptr<gpu::VulkanImplementation> +@@ -282,7 +282,7 @@ std::unique_ptr<gpu::VulkanImplementation> HeadlessSurfaceFactory::CreateVulkanImplementation( bool use_swiftshader, bool allow_protected_memory) { 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 d30376651450..fe1ac69932dd 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 2022-08-31 12:19:35 UTC +--- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2022-09-24 10:57:32 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_ozone_public_ozone__platform.h b/www/chromium/files/patch-ui_ozone_public_ozone__platform.h index 0b17c29d986c..f471cc5c5cfd 100644 --- a/www/chromium/files/patch-ui_ozone_public_ozone__platform.h +++ b/www/chromium/files/patch-ui_ozone_public_ozone__platform.h @@ -1,6 +1,6 @@ ---- ui/ozone/public/ozone_platform.h.orig 2022-02-28 16:54:41 UTC +--- ui/ozone/public/ozone_platform.h.orig 2022-09-24 10:57:32 UTC +++ ui/ozone/public/ozone_platform.h -@@ -151,7 +151,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { +@@ -148,7 +148,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { // back via gpu extra info. bool fetch_buffer_formats_for_gmb_on_gpu = false; diff --git a/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h b/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h index b21e3c4fbbd8..904b8b31c442 100644 --- a/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h +++ b/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h @@ -1,6 +1,6 @@ ---- ui/platform_window/platform_window_init_properties.h.orig 2022-08-31 12:19:35 UTC +--- ui/platform_window/platform_window_init_properties.h.orig 2022-09-24 10:57:32 UTC +++ ui/platform_window/platform_window_init_properties.h -@@ -54,7 +54,7 @@ class WorkspaceExtensionDelegate; +@@ -56,7 +56,7 @@ class WorkspaceExtensionDelegate; class ScenicWindowDelegate; #endif @@ -9,7 +9,7 @@ class X11ExtensionDelegate; #endif -@@ -115,7 +115,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo +@@ -118,7 +118,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo PlatformWindowShadowType shadow_type = PlatformWindowShadowType::kDefault; @@ -17,4 +17,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool prefer_dark_theme = false; raw_ptr<gfx::ImageSkia> icon = nullptr; - absl::optional<int> background_color; + absl::optional<SkColor> background_color; diff --git a/www/chromium/files/patch-ui_strings_translations_app__locale__settings__bn.xtb b/www/chromium/files/patch-ui_strings_translations_app__locale__settings__bn.xtb index 0943ed5c5d0f..1726e72f6580 100644 --- a/www/chromium/files/patch-ui_strings_translations_app__locale__settings__bn.xtb +++ b/www/chromium/files/patch-ui_strings_translations_app__locale__settings__bn.xtb @@ -1,4 +1,4 @@ ---- ui/strings/translations/app_locale_settings_bn.xtb.orig 2022-07-22 17:30:31 UTC +--- ui/strings/translations/app_locale_settings_bn.xtb.orig 2022-09-24 10:57:32 UTC +++ ui/strings/translations/app_locale_settings_bn.xtb @@ -10,7 +10,7 @@ <translation id="IDS_WEB_FONT_FAMILY">Vrinda</translation> @@ -8,4 +8,4 @@ +<if expr="is_posix"> <translation id="IDS_WEB_FONT_FAMILY">Lohit Bengali</translation> </if> - <if expr="chromeos_ash or chromeos_lacros"> + <if expr="is_chromeos"> diff --git a/www/chromium/files/patch-ui_strings_translations_app__locale__settings__ja.xtb b/www/chromium/files/patch-ui_strings_translations_app__locale__settings__ja.xtb index 9ee691643011..36dfea3003d0 100644 --- a/www/chromium/files/patch-ui_strings_translations_app__locale__settings__ja.xtb +++ b/www/chromium/files/patch-ui_strings_translations_app__locale__settings__ja.xtb @@ -1,4 +1,4 @@ ---- ui/strings/translations/app_locale_settings_ja.xtb.orig 2022-07-22 17:30:31 UTC +--- ui/strings/translations/app_locale_settings_ja.xtb.orig 2022-09-24 10:57:32 UTC +++ ui/strings/translations/app_locale_settings_ja.xtb @@ -12,7 +12,7 @@ <if expr="is_ios"> @@ -8,4 +8,4 @@ +<if expr="is_posix"> <translation id="IDS_WEB_FONT_FAMILY">VL PGothic,Sazanami Gothic,Kochi Gothic,sans-serif</translation> </if> - <if expr="chromeos_ash or chromeos_lacros"> + <if expr="is_chromeos"> diff --git a/www/chromium/files/patch-ui_strings_translations_app__locale__settings__ko.xtb b/www/chromium/files/patch-ui_strings_translations_app__locale__settings__ko.xtb index e47a36bba5b5..48faa3043711 100644 --- a/www/chromium/files/patch-ui_strings_translations_app__locale__settings__ko.xtb +++ b/www/chromium/files/patch-ui_strings_translations_app__locale__settings__ko.xtb @@ -1,4 +1,4 @@ ---- ui/strings/translations/app_locale_settings_ko.xtb.orig 2022-07-22 17:30:31 UTC +--- ui/strings/translations/app_locale_settings_ko.xtb.orig 2022-09-24 10:57:32 UTC +++ ui/strings/translations/app_locale_settings_ko.xtb @@ -12,7 +12,7 @@ <if expr="is_ios"> @@ -8,4 +8,4 @@ +<if expr="is_posix"> <translation id="IDS_WEB_FONT_FAMILY">Noto Sans CJK KR,NanumGothic,UnDotum,Baekmuk Gulim,sans-serif</translation> </if> - <if expr="chromeos_ash or chromeos_lacros"> + <if expr="is_chromeos"> diff --git a/www/chromium/files/patch-ui_strings_translations_app__locale__settings__ml.xtb b/www/chromium/files/patch-ui_strings_translations_app__locale__settings__ml.xtb index eedd6e8ab654..00647e1e4e74 100644 --- a/www/chromium/files/patch-ui_strings_translations_app__locale__settings__ml.xtb +++ b/www/chromium/files/patch-ui_strings_translations_app__locale__settings__ml.xtb @@ -1,4 +1,4 @@ ---- ui/strings/translations/app_locale_settings_ml.xtb.orig 2022-07-22 17:30:31 UTC +--- ui/strings/translations/app_locale_settings_ml.xtb.orig 2022-09-24 10:57:32 UTC +++ ui/strings/translations/app_locale_settings_ml.xtb @@ -9,7 +9,7 @@ <translation id="IDS_WEB_FONT_FAMILY">'Segoe UI',Arial,AnjaliOldLipi,Rachana,Kartika</translation> @@ -8,4 +8,4 @@ +<if expr="is_posix"> <translation id="IDS_WEB_FONT_FAMILY">Arial,AnjaliOldLipi,Rachana,Kartika,sans-serif</translation> </if> - <if expr="chromeos_ash or chromeos_lacros"> + <if expr="is_chromeos"> diff --git a/www/chromium/files/patch-ui_strings_translations_app__locale__settings__th.xtb b/www/chromium/files/patch-ui_strings_translations_app__locale__settings__th.xtb index cea6e5589dc8..0aed42526f65 100644 --- a/www/chromium/files/patch-ui_strings_translations_app__locale__settings__th.xtb +++ b/www/chromium/files/patch-ui_strings_translations_app__locale__settings__th.xtb @@ -1,4 +1,4 @@ ---- ui/strings/translations/app_locale_settings_th.xtb.orig 2022-07-22 17:30:31 UTC +--- ui/strings/translations/app_locale_settings_th.xtb.orig 2022-09-24 10:57:32 UTC +++ ui/strings/translations/app_locale_settings_th.xtb @@ -6,7 +6,7 @@ <translation id="IDS_WEB_FONT_FAMILY">Tahoma,sans-serif</translation> @@ -8,4 +8,4 @@ +<if expr="is_posix"> <translation id="IDS_WEB_FONT_FAMILY">Norasi,Waree,Garuda,Loma,sans-serif</translation> </if> - <if expr="chromeos_ash or chromeos_lacros"> + <if expr="is_chromeos"> diff --git a/www/chromium/files/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb b/www/chromium/files/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb index dc0c733a6137..e721fbf1758d 100644 --- a/www/chromium/files/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb +++ b/www/chromium/files/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb @@ -1,4 +1,4 @@ ---- ui/strings/translations/app_locale_settings_zh-CN.xtb.orig 2022-07-22 17:30:31 UTC +--- ui/strings/translations/app_locale_settings_zh-CN.xtb.orig 2022-09-24 10:57:32 UTC +++ ui/strings/translations/app_locale_settings_zh-CN.xtb @@ -12,7 +12,7 @@ <if expr="is_ios"> @@ -8,4 +8,4 @@ +<if expr="is_posix"> <translation id="IDS_WEB_FONT_FAMILY">Noto Sans CJK SC, WenQuanYi Zen Hei, sans-serif</translation> </if> - <if expr="chromeos_ash or chromeos_lacros"> + <if expr="is_chromeos"> diff --git a/www/chromium/files/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb b/www/chromium/files/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb index 26ef171631ed..790fb098d64e 100644 --- a/www/chromium/files/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb +++ b/www/chromium/files/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb @@ -1,4 +1,4 @@ ---- ui/strings/translations/app_locale_settings_zh-TW.xtb.orig 2022-07-22 17:30:31 UTC +--- ui/strings/translations/app_locale_settings_zh-TW.xtb.orig 2022-09-24 10:57:32 UTC +++ ui/strings/translations/app_locale_settings_zh-TW.xtb @@ -12,7 +12,7 @@ <if expr="is_ios"> @@ -8,4 +8,4 @@ +<if expr="is_posix"> <translation id="IDS_WEB_FONT_FAMILY">Noto Sans CJK SC, WenQuanYi Zen Hei, sans-serif</translation> </if> - <if expr="chromeos_ash or chromeos_lacros"> + <if expr="is_chromeos"> diff --git a/www/chromium/files/patch-ui_views_controls_prefix__selector.cc b/www/chromium/files/patch-ui_views_controls_prefix__selector.cc index ea7e50a73daf..c0d111d1996c 100644 --- a/www/chromium/files/patch-ui_views_controls_prefix__selector.cc +++ b/www/chromium/files/patch-ui_views_controls_prefix__selector.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/prefix_selector.cc.orig 2022-08-31 12:19:35 UTC +--- ui/views/controls/prefix_selector.cc.orig 2022-09-24 10:57:32 UTC +++ ui/views/controls/prefix_selector.cc -@@ -173,7 +173,7 @@ bool PrefixSelector::ShouldDoLearning() { +@@ -174,7 +174,7 @@ bool PrefixSelector::ShouldDoLearning() { return false; } 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 792fd375337e..372dbdb4a53a 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,4 +1,4 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2022-08-31 12:19:35 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2022-09-24 10:57:32 UTC +++ ui/views/controls/textfield/textfield.cc @@ -70,7 +70,7 @@ #include "base/win/win_util.h" @@ -36,7 +36,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -1718,7 +1718,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1720,7 +1720,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( -@@ -2217,14 +2217,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2219,14 +2219,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 35a53deaa25a..6e8c5ab229d6 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.h +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.h @@ -1,4 +1,4 @@ ---- ui/views/controls/textfield/textfield.h.orig 2022-08-31 12:19:35 UTC +--- ui/views/controls/textfield/textfield.h.orig 2022-09-24 10:57:32 UTC +++ ui/views/controls/textfield/textfield.h @@ -42,7 +42,7 @@ #include "ui/views/view.h" @@ -9,7 +9,7 @@ #include <vector> #endif -@@ -447,7 +447,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -449,7 +449,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_focus_focus__manager.cc b/www/chromium/files/patch-ui_views_focus_focus__manager.cc index 99319733b80c..d3856ed9d0fe 100644 --- a/www/chromium/files/patch-ui_views_focus_focus__manager.cc +++ b/www/chromium/files/patch-ui_views_focus_focus__manager.cc @@ -1,6 +1,6 @@ ---- ui/views/focus/focus_manager.cc.orig 2022-08-31 12:19:35 UTC +--- ui/views/focus/focus_manager.cc.orig 2022-09-24 10:57:32 UTC +++ ui/views/focus/focus_manager.cc -@@ -629,7 +629,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -623,7 +623,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Processing an accelerator can delete things. Because we // need these objects afterwards on Linux, save widget_ as weak pointer and // save the close_on_deactivate property value of widget_delegate in a -@@ -646,7 +646,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -640,7 +640,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index e1b12db4eb58..4db6035cf8e5 100644 --- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,4 +1,4 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2022-08-31 12:19:35 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2022-09-24 10:57:32 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc @@ -40,7 +40,7 @@ #include "ui/wm/core/window_util.h" @@ -9,7 +9,7 @@ #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h" #endif -@@ -255,7 +255,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget: +@@ -256,7 +256,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; -@@ -327,7 +327,7 @@ std::unique_ptr<aura::client::DragDropClient> +@@ -328,7 +328,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); -@@ -1013,7 +1013,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis +@@ -1006,7 +1006,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index e90e0b4f78bf..f3dba14c0069 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 2022-08-31 12:19:35 UTC +--- v8/BUILD.gn.orig 2022-09-24 10:57:32 UTC +++ v8/BUILD.gn -@@ -1277,6 +1277,14 @@ config("toolchain") { +@@ -1327,6 +1327,14 @@ config("toolchain") { } else if (target_os == "win") { defines += [ "V8_HAVE_TARGET_OS" ] defines += [ "V8_TARGET_OS_WIN" ] @@ -15,7 +15,7 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -5406,7 +5414,7 @@ v8_component("v8_libbase") { +@@ -5571,7 +5579,7 @@ v8_component("v8_libbase") { } } @@ -24,7 +24,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -5417,6 +5425,18 @@ v8_component("v8_libbase") { +@@ -5582,6 +5590,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/chromium/files/patch-v8_include_v8-internal.h b/www/chromium/files/patch-v8_include_v8-internal.h new file mode 100644 index 000000000000..4830264c3c14 --- /dev/null +++ b/www/chromium/files/patch-v8_include_v8-internal.h @@ -0,0 +1,11 @@ +--- v8/include/v8-internal.h.orig 2022-09-24 10:57:32 UTC ++++ v8/include/v8-internal.h +@@ -179,7 +179,7 @@ using SandboxedPointer_t = Address; + #ifdef V8_ENABLE_SANDBOX + + // Size of the sandbox, excluding the guard regions surrounding it. +-#ifdef V8_TARGET_OS_ANDROID ++#if defined(V8_TARGET_OS_ANDROID) || defined(V8_TARGET_OS_OPENBSD) + // On Android, most 64-bit devices seem to be configured with only 39 bits of + // virtual address space for userspace. As such, limit the sandbox to 128GB (a + // quarter of the total available address space). diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc index aeec77b810cf..2fa697111476 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 2022-08-31 12:19:35 UTC +--- v8/src/api/api.cc.orig 2022-09-24 10:57:32 UTC +++ v8/src/api/api.cc @@ -138,7 +138,7 @@ #include "src/wasm/wasm-serialization.h" @@ -9,7 +9,7 @@ #include <signal.h> #if V8_ENABLE_WEBASSEMBLY -@@ -6129,7 +6129,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6113,7 +6113,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc index f49f01598238..29c4cb20499e 100644 --- a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,4 +1,4 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2022-08-31 12:19:35 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2022-09-24 10:57:32 UTC +++ v8/src/base/platform/platform-posix.cc @@ -68,7 +68,7 @@ #include <sys/syscall.h> @@ -25,7 +25,7 @@ uintptr_t raw_addr; { MutexGuard guard(rng_mutex.Pointer()); -@@ -386,6 +393,7 @@ void* OS::GetRandomMmapAddr() { +@@ -390,6 +397,7 @@ void* OS::GetRandomMmapAddr() { #endif return reinterpret_cast<void*>(raw_addr); } @@ -33,7 +33,7 @@ // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files. #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA -@@ -635,7 +643,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor +@@ -647,7 +655,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor // static bool OS::HasLazyCommits() { @@ -42,7 +42,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1210,7 +1218,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1224,7 +1232,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* // keep this version in POSIX as most Linux-compatible derivatives will // support it. MacOS and FreeBSD are different here. #if !defined(V8_OS_FREEBSD) && !defined(V8_OS_DARWIN) && !defined(_AIX) && \ diff --git a/www/chromium/files/patch-v8_src_sandbox_sandbox.cc b/www/chromium/files/patch-v8_src_sandbox_sandbox.cc new file mode 100644 index 000000000000..a280d073c0d3 --- /dev/null +++ b/www/chromium/files/patch-v8_src_sandbox_sandbox.cc @@ -0,0 +1,11 @@ +--- v8/src/sandbox/sandbox.cc.orig 2022-09-24 10:57:32 UTC ++++ v8/src/sandbox/sandbox.cc +@@ -49,7 +49,7 @@ static Address DetermineAddressSpaceLimit() { + } + #endif // V8_TARGET_ARCH_X64 + +-#if defined(V8_TARGET_ARCH_ARM64) && defined(V8_TARGET_OS_ANDROID) ++#if defined(V8_TARGET_ARCH_ARM64) && (defined(V8_TARGET_OS_ANDROID) || defined(V8_TARGET_OS_OPENBSD)) + // On Arm64 Android assume a 40-bit virtual address space (39 bits for + // userspace and kernel each) as that appears to be the most common + // configuration and there seems to be no easy way to retrieve the actual diff --git a/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h b/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h index 1d8bace64511..c1bb659b0a23 100644 --- a/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h +++ b/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h @@ -1,4 +1,4 @@ ---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2022-08-31 12:19:35 UTC +--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2022-09-24 10:57:32 UTC +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h @@ -432,7 +432,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst } @@ -7,7 +7,7 @@ - Register offset_reg, uint32_t offset_imm, + Register offset_reg, uintptr_t offset_imm, LoadType type, uint32_t* protected_load_pc, - bool is_load_mem, bool i64_offset) { + bool /* is_load_mem */, bool i64_offset) { // Offsets >=2GB are statically OOB on 32-bit systems. @@ -508,7 +508,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis } @@ -16,18 +16,18 @@ - uint32_t offset_imm, LiftoffRegister src, + uintptr_t offset_imm, LiftoffRegister src, StoreType type, LiftoffRegList pinned, - uint32_t* protected_store_pc, bool is_store_mem) { - DCHECK_EQ(type.value_type() == kWasmI64, src.is_gp_pair()); -@@ -576,7 +576,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist + uint32_t* protected_store_pc, + bool /* is_store_mem */, bool /* i64_offset */) { +@@ -577,7 +577,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist } void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr, - Register offset_reg, uint32_t offset_imm, + Register offset_reg, uintptr_t offset_imm, - LoadType type, LiftoffRegList pinned) { + LoadType type, LiftoffRegList /* pinned */) { if (type.value() != LoadType::kI64Load) { Load(dst, src_addr, offset_reg, offset_imm, type, nullptr, true); -@@ -595,7 +595,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, +@@ -596,7 +596,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, } void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg, @@ -36,7 +36,7 @@ StoreType type, LiftoffRegList pinned) { DCHECK_NE(offset_reg, no_reg); DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max()); -@@ -935,7 +935,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino +@@ -936,7 +936,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino } // namespace liftoff void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg, @@ -45,7 +45,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kAdd, dst_addr, offset_reg, -@@ -948,7 +948,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re +@@ -949,7 +949,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re } void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg, @@ -54,7 +54,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kSub, dst_addr, offset_reg, -@@ -960,7 +960,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re +@@ -961,7 +961,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re } void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg, @@ -63,7 +63,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kAnd, dst_addr, offset_reg, -@@ -973,7 +973,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re +@@ -974,7 +974,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re } void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg, @@ -72,7 +72,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kOr, dst_addr, offset_reg, offset_imm, -@@ -986,7 +986,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg +@@ -987,7 +987,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg } void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg, @@ -81,7 +81,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kXor, dst_addr, offset_reg, -@@ -999,7 +999,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re +@@ -1000,7 +1000,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re } void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg, @@ -90,7 +90,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { -@@ -1013,7 +1013,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add +@@ -1014,7 +1014,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add } void LiftoffAssembler::AtomicCompareExchange( diff --git a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc index 982777ace576..f22cc26d596b 100644 --- a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc +++ b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc @@ -1,4 +1,4 @@ ---- weblayer/browser/content_browser_client_impl.cc.orig 2022-06-17 14:20:10 UTC +--- weblayer/browser/content_browser_client_impl.cc.orig 2022-09-24 10:57:32 UTC +++ weblayer/browser/content_browser_client_impl.cc @@ -156,7 +156,7 @@ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is @@ -9,7 +9,7 @@ #include "content/public/common/content_descriptors.h" #endif -@@ -1002,7 +1002,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe +@@ -1010,7 +1010,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ |