diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2023-08-17 16:00:25 +0000 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2023-08-23 10:52:08 +0000 |
| commit | cf5f43d6efa033c4bbef799e1840b05bd98c109d (patch) | |
| tree | 874998777f47d378122442ff64a403be28093944 | |
| parent | ffeff794d8a47012f5fc79995fd337fc47847dee (diff) | |
| download | ports-cf5f43d6efa033c4bbef799e1840b05bd98c109d.tar.gz ports-cf5f43d6efa033c4bbef799e1840b05bd98c109d.zip | |
www/chromium: update to 116.0.5845.96
Security: https://vuxml.freebsd.org/freebsd/5666688f-803b-4cf0-9cb1-08c088f2225a.html
(cherry picked from commit 010eff12e836eec1163a43a71439732c2a561213)
316 files changed, 1699 insertions, 1387 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 5be882186137..c2c4d7e934e3 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,5 +1,5 @@ PORTNAME= chromium -PORTVERSION= 115.0.5790.170 +PORTVERSION= 116.0.5845.96 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:external @@ -111,7 +111,6 @@ GN_ARGS+= clang_use_chrome_plugins=false \ use_allocator_shim=false \ use_aura=true \ use_custom_libcxx=false \ - use_gnome_keyring=false \ use_lld=true \ use_partition_alloc=true \ use_partition_alloc_as_malloc=false \ diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 5bdd82bf12bc..2b6e14288aaf 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1691150715 -SHA256 (chromium-115.0.5790.170.tar.xz) = ff9862d2e748c56940ffc222c2e6b2066a19ea1de0bc3fd99ed81c0b231172c0 -SIZE (chromium-115.0.5790.170.tar.xz) = 1595419840 -SHA256 (chrome-linux-115.0.5790.170-llvm13.profdata.tar.xz) = 77c03ffebbbc0c5e20ea5747c2247c8c7cc40d3cf418c3a70c746c7758c96a5a -SIZE (chrome-linux-115.0.5790.170-llvm13.profdata.tar.xz) = 27615256 -SHA256 (chromium-115.0.5790.170-testdata.tar.xz) = a939490b5087ddffa47ae46bbd73edff33bc19e5cd7e7139040b9f31a7f4bc9c -SIZE (chromium-115.0.5790.170-testdata.tar.xz) = 258994144 +TIMESTAMP = 1692255968 +SHA256 (chromium-116.0.5845.96.tar.xz) = 1ec1052a959abced9642b36482549bc2ebefa428ed136289d8e0c54b4ccd1c81 +SIZE (chromium-116.0.5845.96.tar.xz) = 1599788748 +SHA256 (chrome-linux-116.0.5845.96-llvm13.profdata.tar.xz) = b770982155d6500331265ab0b6670692ab73c69a650d3398813b378bad1e6069 +SIZE (chrome-linux-116.0.5845.96-llvm13.profdata.tar.xz) = 27750072 +SHA256 (chromium-116.0.5845.96-testdata.tar.xz) = f626b0fb34dbf528df11830b9d1d7f5e56832d6770ccd3fad07cee31e9825606 +SIZE (chromium-116.0.5845.96-testdata.tar.xz) = 269310352 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 c5341baa29e3..9cd6188de6a7 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2023-07-16 15:47:57 UTC +--- BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ BUILD.gn @@ -61,7 +61,7 @@ declare_args() { root_extra_deps = [] @@ -17,7 +17,7 @@ "//net:net_unittests", "//sandbox:sandbox_unittests", "//services:services_unittests", -@@ -419,7 +418,7 @@ group("gn_all") { +@@ -422,7 +421,7 @@ group("gn_all") { } } @@ -26,7 +26,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -619,6 +618,15 @@ group("gn_all") { +@@ -622,6 +621,15 @@ group("gn_all") { } } @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:dump_syms", -@@ -665,7 +673,7 @@ group("gn_all") { +@@ -668,7 +676,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)" ] } -@@ -1094,7 +1102,7 @@ if (!is_ios && !is_cronet_build) { +@@ -1092,7 +1100,7 @@ if (!is_ios && !is_cronet_build) { ] } @@ -60,7 +60,7 @@ # WPT Webdriver tests runner # chrome/test/chromedriver/test/run_webdriver_tests.py script_test("webdriver_wpt_tests") { -@@ -1194,7 +1202,7 @@ if (!is_ios && !is_cronet_build) { +@@ -1196,7 +1204,7 @@ if (!is_ios && !is_cronet_build) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -69,7 +69,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1203,7 +1211,7 @@ if (!is_ios && !is_cronet_build) { +@@ -1205,7 +1213,7 @@ if (!is_ios && !is_cronet_build) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -78,7 +78,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1671,7 +1679,7 @@ group("chromium_builder_perf") { +@@ -1679,7 +1687,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/www/chromium/files/patch-ash_display_mirror__window__controller.cc b/www/chromium/files/patch-ash_display_mirror__window__controller.cc index 1246cfbe086e..004f8eb40192 100644 --- a/www/chromium/files/patch-ash_display_mirror__window__controller.cc +++ b/www/chromium/files/patch-ash_display_mirror__window__controller.cc @@ -1,6 +1,6 @@ ---- ash/display/mirror_window_controller.cc.orig 2023-05-31 08:12:17 UTC +--- ash/display/mirror_window_controller.cc.orig 2023-08-17 07:33:31 UTC +++ ash/display/mirror_window_controller.cc -@@ -296,7 +296,11 @@ void MirrorWindowController::UpdateWindow( +@@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindow( if (!base::Contains(display_info_list, iter->first, &display::ManagedDisplayInfo::id)) { CloseAndDeleteHost(iter->second, true); diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index c11cbff2d22f..c632a3f1830d 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,4 +1,4 @@ ---- base/BUILD.gn.orig 2023-07-16 15:47:57 UTC +--- base/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ base/BUILD.gn @@ -198,7 +198,7 @@ buildflag_header("ios_cronet_buildflags") { flags = [ "CRONET_BUILD=$is_cronet_build" ] @@ -9,7 +9,7 @@ buildflag_header("message_pump_buildflags") { header = "message_pump_buildflags.h" header_dir = "base/message_loop" -@@ -1099,11 +1099,23 @@ component("base") { +@@ -1150,11 +1150,23 @@ component("base") { # Needed for <atomic> if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -34,7 +34,7 @@ if (use_allocator_shim) { sources += [ "allocator/partition_allocator/shim/allocator_shim.cc", -@@ -1131,7 +1143,7 @@ component("base") { +@@ -1185,7 +1197,7 @@ component("base") { ] configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ] } @@ -43,7 +43,7 @@ sources += [ "allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h", "allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h", -@@ -1172,7 +1184,7 @@ component("base") { +@@ -1226,7 +1238,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -52,7 +52,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2130,6 +2142,43 @@ component("base") { +@@ -2185,6 +2197,43 @@ component("base") { } } @@ -96,7 +96,7 @@ # iOS if (is_ios) { sources += [ -@@ -2238,7 +2287,7 @@ component("base") { +@@ -2285,7 +2334,7 @@ component("base") { } if (dep_libevent) { @@ -105,7 +105,7 @@ } if (use_libevent) { -@@ -3552,7 +3601,7 @@ test("base_unittests") { +@@ -3619,7 +3668,7 @@ test("base_unittests") { ] } @@ -114,7 +114,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3601,7 +3650,7 @@ test("base_unittests") { +@@ -3640,7 +3689,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -123,7 +123,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3612,7 +3661,7 @@ test("base_unittests") { +@@ -3651,7 +3700,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -132,7 +132,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3837,7 +3886,7 @@ test("base_unittests") { +@@ -3907,7 +3956,7 @@ test("base_unittests") { } } diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h index a701e44b4d4b..bce33a480544 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/page_allocator.h.orig 2023-07-16 15:47:57 UTC +--- base/allocator/partition_allocator/page_allocator.h.orig 2023-08-17 07:33:31 UTC +++ base/allocator/partition_allocator/page_allocator.h -@@ -241,7 +241,7 @@ void DecommitAndZeroSystemPages(void* address, size_t +@@ -245,7 +245,7 @@ void DecommitAndZeroSystemPages(void* address, size_t // recommitted. Do not assume that this will not change over time. constexpr PA_COMPONENT_EXPORT( PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() { diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h index 972462e38587..0235bce561a4 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-07-16 15:47:57 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-08-17 07:33:31 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -394,8 +394,12 @@ bool TryRecommitSystemPagesInternal( +@@ -396,8 +396,12 @@ bool TryRecommitSystemPagesInternal( void DiscardSystemPagesInternal(uintptr_t address, size_t length) { void* ptr = reinterpret_cast<void*>(address); diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni index 0c2c47b1b30c..6a8337c9519a 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni @@ -1,9 +1,9 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-07-16 15:47:57 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-08-17 07:33:31 UTC +++ base/allocator/partition_allocator/partition_alloc.gni -@@ -291,7 +291,7 @@ declare_args() { - # pkeys support is explicitly disabled in all Cronet builds, as some test dependencies that - # use partition_allocator are compiled in AOSP against a version of glibc that does not - # include pkeys syscall numbers. +@@ -317,7 +317,7 @@ declare_args() { + # pkeys support is explicitly disabled in all Cronet builds, as some test + # dependencies that use partition_allocator are compiled in AOSP against a + # version of glibc that does not include pkeys syscall numbers. - enable_pkeys = is_linux && target_cpu == "x64" && !is_cronet_build + enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64" && !is_cronet_build } diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__forward.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__forward.h index 816b59743e8e..54cb3fd3b9f8 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__forward.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__forward.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc_forward.h.orig 2023-03-09 06:31:50 UTC +--- base/allocator/partition_allocator/partition_alloc_forward.h.orig 2023-08-17 07:33:31 UTC +++ base/allocator/partition_allocator/partition_alloc_forward.h -@@ -27,9 +27,13 @@ namespace internal { +@@ -28,9 +28,13 @@ namespace internal { // the second one 16. We could technically return something different for // malloc() and operator new(), but this would complicate things, and most of // our allocations are presumably coming from operator new() anyway. 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 deleted file mode 100644 index 3ac49d6b4a95..000000000000 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/allocator/partition_allocator/partition_page.h.orig 2023-04-28 17:01:32 UTC -+++ base/allocator/partition_allocator/partition_page.h -@@ -141,7 +141,7 @@ struct SlotSpanMetadata { - // PartitionPageSize() is 4 times the OS page size. - static constexpr size_t kMaxSlotsPerSlotSpan = - 4 * (1 << 14) / kSmallestBucket; --#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) -+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) - // System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is - // currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code, - // so we use the 16 kiB maximum (64 kiB will crash). diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__page__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__page__constants.h new file mode 100644 index 000000000000..894474e95464 --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__page__constants.h @@ -0,0 +1,11 @@ +--- base/allocator/partition_allocator/partition_page_constants.h.orig 2023-08-17 07:33:31 UTC ++++ base/allocator/partition_allocator/partition_page_constants.h +@@ -16,7 +16,7 @@ namespace partition_alloc::internal { + // (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And + // PartitionPageSize() is 4 times the OS page size. + static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 14) / kSmallestBucket; +-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) ++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) + // System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is + // currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code, + // so we use the 16 kiB maximum (64 kiB will crash). diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc index 7c955d52174c..282ddee1f3ca 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 2023-07-16 15:47:57 UTC +--- base/allocator/partition_allocator/partition_root.cc.orig 2023-08-17 07:33:31 UTC +++ base/allocator/partition_allocator/partition_root.cc @@ -46,7 +46,7 @@ #include "wow64apiset.h" @@ -9,7 +9,7 @@ #include <pthread.h> #endif -@@ -286,7 +286,7 @@ void PartitionAllocMallocInitOnce() { +@@ -284,7 +284,7 @@ void PartitionAllocMallocInitOnce() { return; } @@ -18,7 +18,7 @@ // When fork() is called, only the current thread continues to execute in the // child process. If the lock is held, but *not* by this thread when fork() is // called, we have a deadlock. -@@ -380,7 +380,7 @@ static size_t PartitionPurgeSlotSpan( +@@ -376,7 +376,7 @@ static size_t PartitionPurgeSlotSpan(internal::SlotSpa constexpr size_t kMaxSlotCount = (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) / MinPurgeableSlotSize(); @@ -27,7 +27,7 @@ // It's better for slot_usage to be stack-allocated and fixed-size, which // demands that its size be constexpr. On IS_APPLE and Linux on arm64, // PartitionPageSize() is always SystemPageSize() << 2, so regardless of -@@ -880,7 +880,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions +@@ -853,7 +853,7 @@ void PartitionRoot::Init(PartitionOptions opts) { // apple OSes. PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || (internal::SystemPageSize() == (size_t{1} << 14))); diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h index 52fe8e99173b..921d4f5ef390 100644 --- a/www/chromium/files/patch-base_system_sys__info.h +++ b/www/chromium/files/patch-base_system_sys__info.h @@ -1,7 +1,7 @@ ---- base/system/sys_info.h.orig 2023-07-16 15:47:57 UTC +--- base/system/sys_info.h.orig 2023-08-17 07:33:31 UTC +++ base/system/sys_info.h -@@ -258,6 +258,8 @@ class BASE_EXPORT SysInfo { - static void SetIsCpuSecurityMitigationsEnabled(bool is_enabled); +@@ -261,6 +261,8 @@ class BASE_EXPORT SysInfo { + static void ResetCpuSecurityMitigationsEnabledForTesting(); #endif + static uint64_t MaxSharedMemorySize(); @@ -9,7 +9,7 @@ private: friend class test::ScopedAmountOfPhysicalMemoryOverride; FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); -@@ -270,7 +272,7 @@ class BASE_EXPORT SysInfo { +@@ -273,7 +275,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/chromium/files/patch-base_system_sys__info__posix.cc b/www/chromium/files/patch-base_system_sys__info__posix.cc index 18541a4b9001..53dab4f47d3d 100644 --- a/www/chromium/files/patch-base_system_sys__info__posix.cc +++ b/www/chromium/files/patch-base_system_sys__info__posix.cc @@ -1,21 +1,24 @@ ---- base/system/sys_info_posix.cc.orig 2023-03-09 06:31:50 UTC +--- base/system/sys_info_posix.cc.orig 2023-08-17 07:33:31 UTC +++ base/system/sys_info_posix.cc -@@ -165,12 +165,12 @@ int NumberOfProcessors() { +@@ -117,7 +117,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, - } // namespace internal + namespace base { -#if !BUILDFLAG(IS_OPENBSD) +#if !BUILDFLAG(IS_BSD) int SysInfo::NumberOfProcessors() { - static int number_of_processors = internal::NumberOfProcessors(); - return number_of_processors; + #if BUILDFLAG(IS_MAC) + absl::optional<int> number_of_physical_cores = +@@ -161,7 +161,7 @@ int SysInfo::NumberOfProcessors() { + + return num_cpus; } -#endif // !BUILDFLAG(IS_OPENBSD) +#endif // !BUILDFLAG(IS_BSD) // static uint64_t SysInfo::AmountOfVirtualMemory() { -@@ -260,6 +260,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -251,6 +251,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; 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 c95c6b922bad..df6c32372718 100644 --- a/www/chromium/files/patch-base_system_sys__info__unittest.cc +++ b/www/chromium/files/patch-base_system_sys__info__unittest.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_unittest.cc.orig 2023-02-08 09:03:45 UTC +--- base/system/sys_info_unittest.cc.orig 2023-08-17 07:33:31 UTC +++ base/system/sys_info_unittest.cc -@@ -259,12 +259,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) { +@@ -263,12 +263,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) { EXPECT_TRUE(IsStringUTF8(hardware_info->model)); bool empty_result_expected = #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || \ diff --git a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc index aa10a5248912..9ddff081cbed 100644 --- a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc +++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,4 +1,4 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2023-02-08 09:03:45 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2023-08-17 07:33:31 UTC +++ base/trace_event/malloc_dump_provider.cc @@ -25,6 +25,8 @@ @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -187,7 +189,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, +@@ -188,7 +190,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, #if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \ (!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \ @@ -18,7 +18,7 @@ void ReportMallinfoStats(ProcessMemoryDump* pmd, size_t* total_virtual_size, size_t* resident_size, -@@ -358,6 +360,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -359,6 +361,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump &allocated_objects_count); #elif BUILDFLAG(IS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn index 0b2b20e511f8..2722052c9507 100644 --- a/www/chromium/files/patch-build_config_BUILD.gn +++ b/www/chromium/files/patch-build_config_BUILD.gn @@ -1,22 +1,13 @@ ---- build/config/BUILD.gn.orig 2023-03-09 06:31:50 UTC +--- build/config/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ build/config/BUILD.gn -@@ -218,13 +218,17 @@ config("default_libs") { - "CoreText.framework", - "Foundation.framework", - ] -- } else if (is_linux || is_chromeos) { -+ } else if ((is_linux && !is_bsd) || is_chromeos) { - libs = [ - "dl", - "pthread", - "rt", - ] -- } +@@ -214,6 +214,10 @@ config("default_libs") { + # Targets should choose to explicitly link frameworks they require. Since + # linking can have run-time side effects, nothing should be listed here. + libs = [] + } else if (is_bsd) { + libs = [ + "pthread", + ] -+ } - } - - group("common_deps") { + } else if (is_linux || is_chromeos) { + libs = [ + "dl", diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index cd7e373a54da..9430268463cf 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/compiler/BUILD.gn.orig 2023-07-16 15:47:57 UTC +--- build/config/compiler/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ build/config/compiler/BUILD.gn @@ -249,13 +249,16 @@ config("default_include_dirs") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in @@ -18,7 +18,7 @@ } # compiler --------------------------------------------------------------------- -@@ -497,6 +500,10 @@ config("compiler") { +@@ -500,6 +503,10 @@ config("compiler") { } } @@ -29,7 +29,7 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_gold) { -@@ -572,7 +579,7 @@ config("compiler") { +@@ -575,7 +582,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -38,7 +38,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -757,7 +764,7 @@ config("compiler") { +@@ -760,7 +767,7 @@ config("compiler") { ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ] @@ -47,7 +47,7 @@ # TODO(https://crbug.com/972449): turn on for ChromeOS when that # toolchain has this flag. # We only use one version of LLVM within a build so there's no need to -@@ -860,7 +867,7 @@ config("compiler") { +@@ -867,7 +874,7 @@ config("compiler") { # * Apple platforms (e.g. MacOS, iPhone, iPad) aren't supported because xcode # lldb doesn't have the needed changes yet. # TODO(crbug.com/1379070): Remove if the upstream default ever changes. @@ -56,7 +56,7 @@ cflags_cc += [ "-gsimple-template-names" ] } -@@ -1095,7 +1102,7 @@ config("compiler_cpu_abi") { +@@ -1109,7 +1116,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -65,7 +65,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -1110,7 +1117,7 @@ config("compiler_cpu_abi") { +@@ -1124,7 +1131,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -74,7 +74,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1445,7 +1452,7 @@ config("compiler_deterministic") { +@@ -1459,7 +1466,7 @@ config("compiler_deterministic") { # different build directory like "out/feature_a" and "out/feature_b" if # we build same files with same compile flag. # Other paths are already given in relative, no need to normalize them. @@ -83,7 +83,7 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1497,7 +1504,7 @@ config("compiler_deterministic") { +@@ -1511,7 +1518,7 @@ config("compiler_deterministic") { } config("clang_revision") { @@ -92,7 +92,7 @@ update_args = [ "--print-revision", "--verify-version=$clang_version", -@@ -1735,7 +1742,7 @@ config("default_warnings") { +@@ -1759,7 +1766,7 @@ config("default_warnings") { "-Wno-ignored-pragma-optimize", ] @@ -101,7 +101,7 @@ cflags += [ # TODO(crbug.com/1343975) Evaluate and possibly enable. "-Wno-deprecated-builtins", -@@ -1926,7 +1933,7 @@ config("no_chromium_code") { +@@ -1962,7 +1969,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] @@ -110,7 +110,7 @@ cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -2436,7 +2443,7 @@ config("afdo_optimize_size") { +@@ -2472,7 +2479,7 @@ config("afdo_optimize_size") { # There are some targeted places that AFDO regresses, so we provide a separate # config to allow AFDO to be disabled per-target. config("afdo") { @@ -119,7 +119,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2455,7 +2462,7 @@ config("afdo") { +@@ -2491,7 +2498,7 @@ config("afdo") { } inputs = [ _clang_sample_profile ] } @@ -128,7 +128,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2613,7 +2620,8 @@ config("symbols") { +@@ -2649,7 +2656,8 @@ config("symbols") { configs += [ "//build/config:compress_debug_sections" ] } diff --git a/www/chromium/files/patch-build_config_compiler_pgo_BUILD.gn b/www/chromium/files/patch-build_config_compiler_pgo_BUILD.gn index d62341deffdb..e1f892d75ca1 100644 --- a/www/chromium/files/patch-build_config_compiler_pgo_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_pgo_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/pgo/BUILD.gn.orig 2023-07-16 15:47:57 UTC +--- build/config/compiler/pgo/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ build/config/compiler/pgo/BUILD.gn -@@ -121,13 +121,14 @@ config("pgo_optimization_flags") { +@@ -128,13 +128,14 @@ config("pgo_optimization_flags") { # Enable basic block layout based on the extended TSP problem. This aims to # improve icache utilization and reduce the binary size. diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index 4ed0eee7d3e5..c030ce75abc6 100644 --- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2023-07-16 15:47:57 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2023-08-17 07:33:31 UTC +++ build/toolchain/gcc_toolchain.gni @@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -14,7 +14,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -869,22 +876,12 @@ template("gcc_toolchain") { +@@ -876,22 +883,12 @@ template("gcc_toolchain") { # use_gold too. template("clang_toolchain") { gcc_toolchain(target_name) { diff --git a/www/chromium/files/patch-build_toolchain_toolchain.gni b/www/chromium/files/patch-build_toolchain_toolchain.gni new file mode 100644 index 000000000000..df5a4d2ec1f3 --- /dev/null +++ b/www/chromium/files/patch-build_toolchain_toolchain.gni @@ -0,0 +1,11 @@ +--- build/toolchain/toolchain.gni.orig 2023-08-17 07:33:31 UTC ++++ build/toolchain/toolchain.gni +@@ -62,7 +62,7 @@ if (host_os == "mac") { + host_shlib_extension = ".dylib" + } else if (host_os == "win") { + host_shlib_extension = ".dll" +-} else if (host_os == "linux") { ++} else if (is_posix) { + host_shlib_extension = ".so" + } else { + assert(false, "Host platform not supported") diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index 017ab0893c61..3decb239c31d 100644 --- a/www/chromium/files/patch-cc_BUILD.gn +++ b/www/chromium/files/patch-cc_BUILD.gn @@ -1,6 +1,6 @@ ---- cc/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- cc/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ cc/BUILD.gn -@@ -672,7 +672,7 @@ cc_test_static_library("test_support") { +@@ -670,7 +670,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -922,7 +922,6 @@ cc_test("cc_unittests") { +@@ -918,7 +918,6 @@ cc_test("cc_unittests") { data = [ "//components/test/data/viz/" ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/chromium/files/patch-cc_paint_paint__op__writer.h b/www/chromium/files/patch-cc_paint_paint__op__writer.h new file mode 100644 index 000000000000..c82f3aa3b09a --- /dev/null +++ b/www/chromium/files/patch-cc_paint_paint__op__writer.h @@ -0,0 +1,41 @@ +--- cc/paint/paint_op_writer.h.orig 2023-08-17 07:33:31 UTC ++++ cc/paint/paint_op_writer.h +@@ -114,10 +114,17 @@ class CC_PAINT_EXPORT PaintOpWriter { + // easier to keep serialized size calculation in sync with serialization and + // deserialization, and make it possible to allow dynamic sizing for some + // data types (see the specialized/overloaded functions). ++#if defined(__clang__) && (__clang_major__ >= 15) + template <typename T> + static constexpr size_t SerializedSize(); + template <typename T> + static constexpr size_t SerializedSize(const T& data); ++#else ++ template <typename T> ++ static size_t SerializedSize(); ++ template <typename T> ++ static size_t SerializedSize(const T& data); ++#endif + static size_t SerializedSize(const PaintImage& image); + static size_t SerializedSize(const PaintRecord& record); + static size_t SerializedSize(const SkHighContrastConfig& config); +@@ -386,12 +393,20 @@ constexpr size_t PaintOpWriter::SerializedSize<SkGainm + } + + template <typename T> ++#if defined(__clang__) && (__clang_major__ >= 15) + constexpr size_t PaintOpWriter::SerializedSize() { ++#else ++size_t PaintOpWriter::SerializedSize() { ++#endif + static_assert(std::is_arithmetic_v<T> || std::is_enum_v<T>); + return SerializedSizeSimple<T>(); + } + template <typename T> ++#if defined(__clang__) && (__clang_major__ >= 15) + constexpr size_t PaintOpWriter::SerializedSize(const T& data) { ++#else ++size_t PaintOpWriter::SerializedSize(const T& data) { ++#endif + return SerializedSizeSimple<T>(); + } + diff --git a/www/chromium/files/patch-chrome_app_app__management__strings.grdp b/www/chromium/files/patch-chrome_app_app__management__strings.grdp index 1468f983b4a2..909c3363aa16 100644 --- a/www/chromium/files/patch-chrome_app_app__management__strings.grdp +++ b/www/chromium/files/patch-chrome_app_app__management__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/app_management_strings.grdp.orig 2023-07-16 15:47:57 UTC +--- chrome/app/app_management_strings.grdp.orig 2023-08-17 07:33:31 UTC +++ chrome/app/app_management_strings.grdp -@@ -188,7 +188,7 @@ +@@ -191,7 +191,7 @@ You can open and edit supported files with this app from Finder or other apps. To control which files open this app by default, <ph name="BEGIN_LINK"><a href="#"></ph>learn how to set default apps on your device<ph name="END_LINK"></a></ph>. </message> </if> diff --git a/www/chromium/files/patch-chrome_app_chrome__command__ids.h b/www/chromium/files/patch-chrome_app_chrome__command__ids.h index 1d54541f1349..94c0929f4adc 100644 --- a/www/chromium/files/patch-chrome_app_chrome__command__ids.h +++ b/www/chromium/files/patch-chrome_app_chrome__command__ids.h @@ -1,6 +1,6 @@ ---- chrome/app/chrome_command_ids.h.orig 2023-07-16 15:47:57 UTC +--- chrome/app/chrome_command_ids.h.orig 2023-08-17 07:33:31 UTC +++ chrome/app/chrome_command_ids.h -@@ -70,12 +70,12 @@ +@@ -69,12 +69,12 @@ #define IDC_TOGGLE_MULTITASK_MENU 34050 #endif diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc index fda51b850b03..da5482f91f16 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -138,7 +138,7 @@ +@@ -139,7 +139,7 @@ #include "components/about_ui/credit_utils.h" #endif @@ -29,7 +29,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -328,7 +328,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -330,7 +330,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 -@@ -413,7 +413,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) || -@@ -527,7 +527,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -529,7 +529,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. -@@ -616,7 +616,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -618,7 +618,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( -@@ -958,7 +958,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { +@@ -967,7 +967,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { base::InitializeCpuReductionExperiment(); base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures(); base::sequence_manager::internal::ThreadController::InitializeFeatures(); @@ -74,7 +74,7 @@ base::MessagePumpLibevent::InitializeFeatures(); #elif BUILDFLAG(IS_MAC) base::PlatformThread::InitFeaturesPostFieldTrial(); -@@ -1096,7 +1096,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo +@@ -1106,7 +1106,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo // TODO(crbug.com/1052397): Revisit the macro expression once build flag // switch of lacros-chrome is complete. @@ -83,7 +83,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1126,7 +1126,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo +@@ -1136,7 +1136,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -92,7 +92,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1500,7 +1500,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1510,7 +1510,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -101,7 +101,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) { -@@ -1602,7 +1602,7 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1612,7 +1612,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_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd index 4091596e90ab..1349e990fb28 100644 --- a/www/chromium/files/patch-chrome_app_chromium__strings.grd +++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/chromium_strings.grd.orig 2023-07-16 15:47:57 UTC +--- chrome/app/chromium_strings.grd.orig 2023-08-17 07:33:31 UTC +++ chrome/app/chromium_strings.grd -@@ -296,7 +296,7 @@ If you update this file, be sure also to update google +@@ -315,7 +315,7 @@ If you update this file, be sure also to update google Welcome to Chromium; new browser window opened </message> </if> @@ -9,7 +9,7 @@ <message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar"> Welcome to Chromium </message> -@@ -437,7 +437,7 @@ If you update this file, be sure also to update google +@@ -456,7 +456,7 @@ If you update this file, be sure also to update google To get future Chromium updates, you'll need Windows 10 or later. This computer is using Windows 8.1. </message> </if> @@ -18,7 +18,7 @@ <message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported."> Chromium may not function correctly because it is no longer supported on this Linux distribution </message> -@@ -812,7 +812,7 @@ Permissions you've already given to websites and apps +@@ -860,7 +860,7 @@ Permissions you've already given to websites and apps </message> </if> @@ -27,7 +27,7 @@ <message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item" translateable="false"> Not used in Chromium. Placeholder to keep resource maps in sync. </message> -@@ -1170,7 +1170,7 @@ Permissions you've already given to websites and apps +@@ -1234,7 +1234,7 @@ Permissions you've already given to websites and apps </message> </if> diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd index ec4f805c40cb..e9d1c4df2859 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/generated_resources.grd.orig 2023-07-16 15:47:57 UTC +--- chrome/app/generated_resources.grd.orig 2023-08-17 07:33:31 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. --> -@@ -3304,7 +3304,7 @@ You can send it to Google to check if it's unsafe. Sca +@@ -3426,7 +3426,7 @@ You can send it to Google to check if it's unsafe. Sca </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> -@@ -5036,7 +5036,7 @@ You can send it to Google to check if it's unsafe. Sca +@@ -5172,7 +5172,7 @@ You can send it to Google to check if it's unsafe. Sca Read information about your browser, OS, device, installed software, registry values and files </message> </if> @@ -27,7 +27,7 @@ <message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS" desc="Permission string for enterprise private reporting permission on Linux and MacOS."> Read information about your browser, OS, device, installed software and files </message> -@@ -5691,7 +5691,7 @@ Keep your key file in a safe place. You will need it t +@@ -5845,7 +5845,7 @@ Keep your key file in a safe place. You will need it t Old versions of Chrome Apps won't open on Windows devices after December 2022. Contact your administrator to update to a new version or remove this app. </message> </if> @@ -36,7 +36,7 @@ <message name="IDS_FORCE_INSTALLED_DEPRECATED_APPS_CONTENT" desc="Content of the force installed deprecated app dialog"> Old versions of Chrome Apps won't open on Linux devices after December 2022. Contact your administrator to update to a new version or remove this app. </message> -@@ -5737,7 +5737,7 @@ Keep your key file in a safe place. You will need it t +@@ -5891,7 +5891,7 @@ Keep your key file in a safe place. You will need it t Old versions of Chrome apps won't open on Windows devices after December 2022. You can check if there's a new version available. </message> </if> @@ -45,7 +45,7 @@ <message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch."> Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available. </message> -@@ -9560,7 +9560,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -9884,7 +9884,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW <message name="IDS_APP_MENU_BUTTON_UPDATE" desc="Short label next to app-menu button when an update is available."> Update </message> @@ -54,7 +54,7 @@ <message name="IDS_APP_MENU_BUTTON_UPDATE_ALT1" desc="Alternate short label next to app-menu button when an update is available."> Finish update </message> -@@ -9891,7 +9891,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -10220,7 +10220,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW Google Pay </message> @@ -63,16 +63,16 @@ <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> -@@ -10856,7 +10856,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -11193,7 +11193,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW </message> <!-- Device Trust Consent dialog --> -- <if expr="is_win or is_macosx or is_linux"> -+ <if expr="is_win or is_macosx or is_posix"> +- <if expr="is_win or is_macosx or is_linux or is_chromeos"> ++ <if expr="is_win or is_macosx or is_posix or is_chromeos"> <message name="IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE" desc="Title of the dialog shown when user consent is required to share device signals."> Share device signals? </message> -@@ -11246,7 +11246,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -11592,7 +11592,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> @@ -81,7 +81,7 @@ <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window."> Minimize </message> -@@ -13426,7 +13426,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -13784,7 +13784,7 @@ Please help our engineers fix this problem. Tell us wh Open Anyway </message> diff --git a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd index 8b2b57047749..3d9d265780de 100644 --- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,4 +1,4 @@ ---- chrome/app/google_chrome_strings.grd.orig 2023-07-16 15:47:57 UTC +--- chrome/app/google_chrome_strings.grd.orig 2023-08-17 07:33:31 UTC +++ chrome/app/google_chrome_strings.grd @@ -301,7 +301,7 @@ chromium_strings.grd. --> Welcome to Chrome; new browser window opened @@ -18,7 +18,7 @@ <message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported."> Google Chrome may not function correctly because it is no longer supported on this Linux distribution </message> -@@ -844,7 +844,7 @@ Permissions you've already given to websites and apps +@@ -855,7 +855,7 @@ Permissions you've already given to websites and apps </if> </if> @@ -27,7 +27,7 @@ <if expr="use_titlecase"> <message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item"> Relaunch to Update - Your tabs will reopen -@@ -1249,7 +1249,7 @@ Permissions you've already given to websites and apps +@@ -1276,7 +1276,7 @@ Permissions you've already given to websites and apps </message> </if> diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn new file mode 100644 index 000000000000..6a68e1168d9f --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_BUILD.gn @@ -0,0 +1,16 @@ +--- chrome/browser/BUILD.gn.orig 2023-08-17 07:33:31 UTC ++++ chrome/browser/BUILD.gn +@@ -6296,6 +6296,13 @@ static_library("browser") { + } + } + ++ if (is_bsd) { ++ sources -= [ ++ "metrics/bluetooth_metrics_provider.cc", ++ "metrics/bluetooth_metrics_provider.h", ++ ] ++ } ++ + if (is_linux && use_dbus) { + sources += [ + "dbus_memory_pressure_evaluator_linux.cc", diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index 018660733e7e..0bd535a581db 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/about_flags.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/about_flags.cc -@@ -222,7 +222,7 @@ +@@ -223,7 +223,7 @@ #include "ui/ui_features.h" #include "url/url_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -316,7 +316,7 @@ +@@ -319,7 +319,7 @@ #include "device/vr/public/cpp/features.h" #endif @@ -18,7 +18,7 @@ #include "ui/ozone/buildflags.h" #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -422,7 +422,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -429,7 +429,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, -@@ -1478,7 +1478,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 +@@ -1481,7 +1481,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 std::size(kChromeRefresh2023Level1), nullptr}}; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -36,7 +36,7 @@ const FeatureEntry::FeatureParam kShortcutBoostSearchAndUrl1414[] = { {"ShortcutBoostSearchScore", "1414"}, {"ShortcutBoostUrlScore", "1414"}}; -@@ -4974,13 +4974,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4962,13 +4962,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -52,7 +52,7 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -5265,7 +5265,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5253,7 +5253,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(feed::kFeedDynamicColors)}, #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -61,7 +61,7 @@ {"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName, flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop, FEATURE_VALUE_TYPE(feed::kWebUiFeed)}, -@@ -5911,7 +5911,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5919,7 +5919,7 @@ const FeatureEntry kFeatureEntries[] = { kOsAll, FEATURE_VALUE_TYPE(omnibox::kUseExistingAutocompleteClient)}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -70,7 +70,7 @@ {"omnibox-domain-suggestions", flag_descriptions::kOmniboxDomainSuggestionsName, flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, -@@ -6674,7 +6674,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6678,7 +6678,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kParallelDownloadingDescription, kOsAll, FEATURE_VALUE_TYPE(download::features::kParallelDownloading)}, @@ -79,16 +79,7 @@ {"enable-async-dns", flag_descriptions::kAsyncDnsName, flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, FEATURE_VALUE_TYPE(features::kAsyncDns)}, -@@ -7566,7 +7566,7 @@ const FeatureEntry kFeatureEntries[] = { - #endif // BUILDFLAG(IS_CHROMEOS) - - #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) - {"global-media-controls-modern-ui", - flag_descriptions::kGlobalMediaControlsModernUIName, - flag_descriptions::kGlobalMediaControlsModernUIDescription, -@@ -8345,7 +8345,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8368,7 +8368,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -97,7 +88,7 @@ {"quick-commands", flag_descriptions::kQuickCommandsName, flag_descriptions::kQuickCommandsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kQuickCommands)}, -@@ -8600,7 +8600,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8629,7 +8629,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -106,7 +97,7 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -8661,7 +8661,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8690,7 +8690,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -115,7 +106,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9243,7 +9243,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9258,7 +9258,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -124,7 +115,7 @@ {"document-picture-in-picture-api", flag_descriptions::kDocumentPictureInPictureApiName, flag_descriptions::kDocumentPictureInPictureApiDescription, -@@ -9942,7 +9942,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9978,7 +9978,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebUIOmniboxPopupDescription, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopup)}, @@ -133,7 +124,7 @@ {"webui-system-font", flag_descriptions::kWebUiSystemFontName, flag_descriptions::kWebUiSystemFontDescription, kOsAll, FEATURE_VALUE_TYPE(features::kWebUiSystemFont)}, -@@ -10134,7 +10134,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10163,7 +10163,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ @@ -142,3 +133,12 @@ {"data-retention-policies-disable-sync-types-needed", flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededName, flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededDescription, +@@ -10571,7 +10571,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, + + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + {"camera-mic-preview", flag_descriptions::kCameraMicPreviewName, + flag_descriptions::kCameraMicPreviewDescription, + static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux | kOsFuchsia), diff --git a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc index f34db76c1a81..11ff07a15410 100644 --- a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc +++ b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/background/background_mode_manager.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/background/background_mode_manager.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/background/background_mode_manager.cc -@@ -874,7 +874,7 @@ gfx::ImageSkia GetStatusTrayIcon() { +@@ -870,7 +870,7 @@ gfx::ImageSkia GetStatusTrayIcon() { return gfx::ImageSkia(); return family->CreateExact(size).AsImageSkia(); 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 c05cdcd656cd..b4d19239060e 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/browser_process_impl.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/browser_process_impl.cc -@@ -215,7 +215,7 @@ +@@ -213,7 +213,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck #endif -@@ -1207,7 +1207,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1185,7 +1185,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); @@ -18,7 +18,7 @@ ChromeJsErrorReportProcessor::Create(); #endif -@@ -1464,7 +1464,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1442,7 +1442,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 016f1954177c..61afc52f3664 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 2023-07-16 15:47:57 UTC +--- chrome/browser/browser_process_impl.h.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/browser_process_impl.h -@@ -378,7 +378,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -374,7 +374,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_chrome__browser__interface__binders.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc index 939479e241a9..00e9be94f9c2 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 2023-07-16 15:47:57 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -119,13 +119,13 @@ +@@ -124,13 +124,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 -@@ -199,7 +199,7 @@ +@@ -208,7 +208,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" -@@ -886,7 +886,7 @@ void PopulateChromeFrameBinders( +@@ -915,7 +915,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)); -@@ -894,7 +894,7 @@ void PopulateChromeFrameBinders( +@@ -923,7 +923,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->GetParentOrOuterDocument()) { // The service binder will reject non-primary main frames, but we still need -@@ -963,14 +963,14 @@ void PopulateChromeWebUIFrameBinders( +@@ -997,7 +997,7 @@ void PopulateChromeWebUIFrameBinders( commerce::CommerceInternalsUI>(map); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -52,6 +52,7 @@ RegisterWebUIControllerInterfaceBinder< connectors_internals::mojom::PageHandler, enterprise_connectors::ConnectorsInternalsUI>(map); +@@ -1011,7 +1011,7 @@ void PopulateChromeWebUIFrameBinders( #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -60,7 +61,7 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); #endif -@@ -1428,7 +1428,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1477,7 +1477,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 d199d3c54631..11847306adc2 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -244,11 +244,11 @@ +@@ -245,11 +245,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -14,7 +14,7 @@ #include "components/crash/core/app/crashpad.h" #endif -@@ -283,14 +283,14 @@ +@@ -284,14 +284,14 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -30,8 +30,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck #include "chrome/browser/headless/headless_mode_util.h" // nogncheck - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) -@@ -1005,7 +1005,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { + #include "components/headless/select_file_dialog/headless_select_file_dialog.h" +@@ -1028,7 +1028,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -40,7 +40,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -1061,7 +1061,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1084,7 +1084,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -49,7 +49,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( -@@ -1295,7 +1295,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1320,7 +1320,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* *UrlLanguageHistogramFactory::GetForBrowserContext(profile)); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -58,3 +58,12 @@ if (headless::IsHeadlessMode()) { headless::ReportHeadlessActionMetrics(); } +@@ -1429,7 +1429,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( + // In headless mode provide alternate SelectFileDialog factory overriding + // any platform specific SelectFileDialog implementation that may have been + // set. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + if (headless::IsHeadlessMode()) { + headless::HeadlessSelectFileDialogFactory::SetUp(); + } diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc index 8c3d451ff285..8ff4c05148f3 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2023-04-28 17:01:32 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/chrome_browser_main_linux.cc -@@ -54,13 +54,15 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLi +@@ -53,13 +53,15 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLi } void ChromeBrowserMainPartsLinux::PostCreateMainMessageLoop() { @@ -17,7 +17,7 @@ // Set up crypt config. This needs to be done before anything starts the // network service, as the raw encryption key needs to be shared with the -@@ -120,7 +122,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() { +@@ -117,7 +119,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() { #endif // defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS) void ChromeBrowserMainPartsLinux::PostDestroyThreads() { diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index cb0ba74a8806..8ff257fe4d88 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -427,7 +427,7 @@ +@@ -425,7 +425,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" -@@ -516,12 +516,12 @@ +@@ -514,12 +514,12 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -24,7 +24,7 @@ #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -530,14 +530,14 @@ +@@ -528,14 +528,14 @@ #include "components/crash/content/browser/crash_handler_host_linux.h" #endif @@ -41,7 +41,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -566,11 +566,11 @@ +@@ -564,11 +564,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -55,7 +55,7 @@ #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif BUILDFLAG(IS_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -1583,7 +1583,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre +@@ -1580,7 +1580,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre prefs::kThrottleNonVisibleCrossOriginIframesAllowed, true); registry->RegisterBooleanPref(prefs::kNewBaseUrlInheritanceBehaviorAllowed, true); @@ -64,7 +64,7 @@ registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled, true); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) -@@ -1697,7 +1697,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1701,7 +1701,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( is_integration_test, &startup_data_); @@ -73,7 +73,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1736,7 +1736,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1740,7 +1740,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -82,7 +82,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1757,7 +1757,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1761,7 +1761,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); #endif @@ -91,7 +91,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1776,7 +1776,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1780,7 +1780,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -100,7 +100,7 @@ main_parts->AddParts( std::make_unique< chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2599,6 +2599,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2603,6 +2603,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin #elif BUILDFLAG(IS_POSIX) #if BUILDFLAG(IS_ANDROID) bool enable_crash_reporter = true; @@ -109,7 +109,7 @@ #elif BUILDFLAG(IS_CHROMEOS) bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { -@@ -2996,7 +2998,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -3008,7 +3010,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); @@ -118,7 +118,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4468,7 +4470,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4511,7 +4513,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -127,7 +127,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4989,7 +4991,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5032,7 +5034,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -136,7 +136,7 @@ MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -4999,7 +5001,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5042,7 +5044,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -145,7 +145,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -5038,7 +5040,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5081,7 +5083,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati handle)); } @@ -154,7 +154,7 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -6755,7 +6757,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -6906,7 +6908,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS } bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() { diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h index 2d92f0eba5ec..e3a3fbb8989a 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -459,7 +459,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -465,7 +465,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_chrome__process__singleton.cc b/www/chromium/files/patch-chrome_browser_chrome__process__singleton.cc new file mode 100644 index 000000000000..fa300977747f --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_chrome__process__singleton.cc @@ -0,0 +1,46 @@ +--- chrome/browser/chrome_process_singleton.cc.orig 2023-08-17 07:33:31 UTC ++++ chrome/browser/chrome_process_singleton.cc +@@ -11,7 +11,7 @@ + #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" + #include "chrome/common/chrome_switches.h" + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/hash/hash.h" + #include "chrome/common/channel_info.h" + #include "components/version_info/channel.h" +@@ -22,7 +22,7 @@ + #include "base/win/registry.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/files/file_util.h" + #endif + +@@ -33,14 +33,14 @@ constexpr char kEarlySingletonEnabledGroup[] = "Enable + constexpr char kEarlySingletonDisabledMergeGroup[] = "Disabled_Merge3"; + constexpr char kEarlySingletonDefaultGroup[] = "Default3"; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + constexpr char kEarlySingletonDisabledGroup[] = "Disabled3"; + #endif // BUILDFLAG(IS_WIN) + + const char* g_early_singleton_feature_group_ = nullptr; + ChromeProcessSingleton* g_chrome_process_singleton_ = nullptr; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + std::string GetMachineGUID() { + std::string machine_guid; +@@ -171,7 +171,7 @@ void ChromeProcessSingleton::SetupEarlySingletonFeatur + return; + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + g_early_singleton_feature_group_ = EnrollMachineInEarlySingletonFeature(); + #else + g_early_singleton_feature_group_ = kEarlySingletonDefaultGroup; diff --git a/www/chromium/files/patch-chrome_browser_content__settings_one__time__permission__provider.cc b/www/chromium/files/patch-chrome_browser_content__settings_one__time__permission__provider.cc new file mode 100644 index 000000000000..9752539ef51c --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_content__settings_one__time__permission__provider.cc @@ -0,0 +1,30 @@ +--- chrome/browser/content_settings/one_time_permission_provider.cc.orig 2023-08-17 07:33:31 UTC ++++ chrome/browser/content_settings/one_time_permission_provider.cc +@@ -207,8 +207,13 @@ void OneTimePermissionProvider::OnSuspend() { + + while (rule_iterator && rule_iterator->HasNext()) { + auto rule = rule_iterator->Next(); ++#if defined(__clang__) && (__clang_major__ >= 16) + patterns_to_delete.emplace_back(setting_type, rule->primary_pattern, + rule->secondary_pattern); ++#else ++ patterns_to_delete.emplace_back(ContentSettingEntry{setting_type, rule->primary_pattern, ++ rule->secondary_pattern}); ++#endif + permissions::PermissionUmaUtil::RecordOneTimePermissionEvent( + setting_type, + permissions::OneTimePermissionEvent::EXPIRED_ON_SUSPEND); +@@ -302,8 +307,13 @@ void OneTimePermissionProvider::DeleteEntriesMatchingG + auto rule = rule_iterator->Next(); + if (rule->primary_pattern.Matches(origin_gurl) && + rule->secondary_pattern.Matches(origin_gurl)) { ++#if defined(__clang__) && (__clang_major__ >= 16) + patterns_to_delete.emplace_back( + content_setting_type, rule->primary_pattern, rule->secondary_pattern); ++#else ++ patterns_to_delete.emplace_back( ++ ContentSettingEntry{content_setting_type, rule->primary_pattern, rule->secondary_pattern}); ++#endif + permissions::PermissionUmaUtil::RecordOneTimePermissionEvent( + content_setting_type, trigger_event); + } 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 deleted file mode 100644 index 55fbd4b9187c..000000000000 --- a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/dev_ui_browser_resources.grd.orig 2023-07-16 15:47:57 UTC -+++ chrome/browser/dev_ui_browser_resources.grd -@@ -35,7 +35,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 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 58c59eaafed2..d5cbe958169b 100644 --- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1567,7 +1567,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1572,7 +1572,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); } -@@ -1686,7 +1686,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1691,7 +1691,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow content::CheckDownloadAllowedCallback check_download_allowed_cb) { DCHECK_CURRENTLY_ON(BrowserThread::UI); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +18,7 @@ // Don't download pdf if it is a file URL, as that might cause an infinite // download loop if Chrome is not the system pdf viewer. if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) { -@@ -1732,7 +1732,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl +@@ -1737,7 +1737,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl DCHECK(download_item->IsSavePackageDownload()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.h b/www/chromium/files/patch-chrome_browser_download_download__commands.h index f715e5ab6d78..67453941c086 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.h +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.h.orig 2023-03-09 06:31:50 UTC +--- chrome/browser/download/download_commands.h.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/download/download_commands.h -@@ -56,7 +56,7 @@ class DownloadCommands { +@@ -58,7 +58,7 @@ class DownloadCommands { void ExecuteCommand(Command command); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc index 65a798f665cc..c4a831dc233f 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_item_model.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/download/download_item_model.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/download/download_item_model.cc -@@ -766,7 +766,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -764,7 +764,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(); -@@ -809,7 +809,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -808,7 +808,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand base::UmaHistogramBoolean("Download.SetAlwaysOpenTo", !is_checked); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +18,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); -@@ -1232,7 +1232,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1252,7 +1252,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe return; } diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_content__analysis__delegate.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_content__analysis__delegate.cc index b166f15a3fe1..09a6f2eab6e8 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_content__analysis__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_content__analysis__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc @@ -52,7 +52,7 @@ #include "ui/base/l10n/l10n_util.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/connectors/analysis/content_analysis_sdk_manager.h" // nogncheck #endif -@@ -555,7 +555,7 @@ void ContentAnalysisDelegate::PageRequestCallback( +@@ -557,7 +557,7 @@ void ContentAnalysisDelegate::PageRequestCallback( bool ContentAnalysisDelegate::UploadData() { upload_start_time_ = base::TimeTicks::Now(); diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc index b8459feeaca5..96dd05bda740 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2023-04-05 11:05:06 UTC +--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/enterprise/connectors/connectors_service.cc -@@ -511,7 +511,7 @@ bool ConnectorsService::ConnectorsEnabled() const { +@@ -527,7 +527,7 @@ bool ConnectorsService::ConnectorsEnabled() const { Profile* profile = Profile::FromBrowserContext(context_); 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 2a1138dc1dd5..f34a9996e12d 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc @@ -11,7 +11,7 @@ #include "chrome/browser/profiles/profile.h" @@ -9,7 +9,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/enterprise/connectors/device_trust/browser/signing_key_policy_observer.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" -@@ -41,7 +41,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi +@@ -42,7 +42,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi bool DeviceTrustConnectorServiceFactory::ServiceIsCreatedWithBrowserContext() const { @@ -18,7 +18,7 @@ return IsDeviceTrustConnectorFeatureEnabled(); #else return false; -@@ -77,7 +77,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil +@@ -78,7 +78,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil auto* service = new DeviceTrustConnectorService(profile->GetPrefs()); 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 d4f3a44d7122..164f4331b707 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,15 +1,24 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc -@@ -21,7 +21,7 @@ +@@ -23,7 +23,7 @@ #include "components/policy/core/common/management/management_service.h" #include "content/public/browser/browser_context.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" - #include "chrome/browser/enterprise/connectors/device_trust/attestation/desktop/desktop_attestation_service.h" - #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" -@@ -78,7 +78,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory() + #include "chrome/browser/enterprise/connectors/device_trust/attestation/browser/browser_attestation_service.h" + #include "chrome/browser/enterprise/connectors/device_trust/attestation/browser/device_attester.h" +@@ -55,7 +55,7 @@ bool IsProfileManaged(Profile* profile) { + return management_service && management_service->IsManaged(); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + policy::CloudPolicyStore* GetUserCloudPolicyStore(Profile* profile) { + policy::CloudPolicyManager* user_policy_manager = + profile->GetUserCloudPolicyManager(); +@@ -105,7 +105,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory() DependsOn(DeviceTrustConnectorServiceFactory::GetInstance()); DependsOn(policy::ManagementServiceFactory::GetInstance()); @@ -17,4 +26,4 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Depends on this service via the SignalsService having a dependency on it. DependsOn(enterprise_signals::SignalsAggregatorFactory::GetInstance()); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + // Depends on this service via the ProfileAttester having a dependency on it 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 f006b6a7f929..230d780ef316 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 2023-03-09 06:31:50 UTC +--- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc @@ -13,7 +13,7 @@ @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/linux_key_rotation_command.h" #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 +@@ -46,7 +46,7 @@ std::unique_ptr<KeyRotationCommand> KeyRotationCommand scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory) { #if BUILDFLAG(IS_WIN) return std::make_unique<WinKeyRotationCommand>(); diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc index 8268b3ffef16..fb6820846a59 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc @@ -13,7 +13,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/win_key_persistence_delegate.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/linux_key_persistence_delegate.h" #endif -@@ -44,7 +44,7 @@ KeyPersistenceDelegateFactory::CreateKeyPersistenceDel +@@ -45,7 +45,7 @@ KeyPersistenceDelegateFactory::CreateKeyPersistenceDel return std::make_unique<WinKeyPersistenceDelegate>(); #elif BUILDFLAG(IS_MAC) return std::make_unique<MacKeyPersistenceDelegate>(); diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc index 57c00c7f02ed..93836ab0884c 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc -@@ -18,7 +18,7 @@ +@@ -21,7 +21,7 @@ #include "chrome/browser/profiles/profile.h" #include "components/policy/core/common/management/management_service.h" @@ -8,13 +8,13 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "base/check.h" #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h" - #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" -@@ -56,7 +56,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P + #include "chrome/browser/enterprise/connectors/device_trust/signals/dependency_factory.h" +@@ -58,7 +58,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P enterprise_signals::ContextInfoFetcher::CreateInstance( profile, ConnectorsServiceFactory::GetForBrowserContext(profile)))); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - policy::CloudPolicyStore* browser_cloud_policy_store = nullptr; + policy::CloudPolicyManager* browser_policy_manager = nullptr; if (management_service->HasManagementAuthority( diff --git a/www/chromium/files/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc index 255d96a1e284..c79dc71aa426 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/remote_commands/cbcm_remote_commands_factory.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/enterprise/remote_commands/cbcm_remote_commands_factory.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/enterprise/remote_commands/cbcm_remote_commands_factory.cc @@ -11,7 +11,7 @@ #include "chrome/browser/profiles/profile_manager.h" @@ -6,7 +6,7 @@ -#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/enterprise/connectors/device_trust/device_trust_features.h" + #include "chrome/browser/enterprise/connectors/device_trust/device_trust_features.h" // nogncheck #include "chrome/browser/enterprise/remote_commands/rotate_attestation_credential_job.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" @@ -31,7 +31,7 @@ CBCMRemoteCommandsFactory::BuildJobForType( diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index 2ace0098adcb..08229d9ec911 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1350,6 +1350,10 @@ static_library("extensions") { +@@ -1352,6 +1352,10 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc index e856e4e5093c..d7a954ed8aa7 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2023-04-28 17:01:32 UTC +--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc @@ -42,7 +42,7 @@ #include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h" @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h" #endif -@@ -102,7 +102,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt +@@ -106,7 +106,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt extensions::SettingsPrivateEventRouterFactory::GetInstance(); extensions::SettingsOverridesAPI::GetFactoryInstance(); extensions::SidePanelService::GetFactoryInstance(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc index c799727df626..eebfe35d606d 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -534,7 +534,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall( +@@ -582,7 +582,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall( } void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() { diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 6ef479601b22..78b9bcc6c0e4 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -194,7 +194,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -195,7 +195,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] = settings_api::PrefType::PREF_TYPE_BOOLEAN; @@ -9,7 +9,7 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -206,7 +206,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -207,7 +207,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist settings_api::PrefType::PREF_TYPE_STRING; (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::PREF_TYPE_NUMBER; diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc index 5b64312d2efb..48a5bfc565b7 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2023-04-05 11:05:06 UTC +--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/extensions/api/tabs/tabs_api.cc -@@ -831,7 +831,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio +@@ -833,7 +833,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio // ui::SHOW_STATE_MINIMIZED above, on Linux the window is not created as // minimized. // TODO(crbug.com/1410400): Remove this workaround when linux is fixed. diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc new file mode 100644 index 000000000000..2c7254a01b64 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc @@ -0,0 +1,11 @@ +--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2023-08-17 07:33:31 UTC ++++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +@@ -917,7 +917,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: + RequestExtensionApproval(contents); + return; + } +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // Shows a parental permission dialog directly bypassing the extension + // install dialog view. The parental permission dialog contains a superset + // of data from the extension install dialog: requested extension diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index 0ce65be49048..486e2aa80cb1 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/flag_descriptions.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/flag_descriptions.cc -@@ -2423,7 +2423,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P +@@ -2512,7 +2512,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P const char kWebUIOmniboxPopupDescription[] = "If enabled, shows the omnibox suggestions popup in WebUI."; @@ -9,7 +9,7 @@ const char kWebUiSystemFontName[] = "WebUI System font"; const char kWebUiSystemFontDescription[] = "If enabled, all WebUI surfaces will use the default UI font of the " -@@ -6695,7 +6695,7 @@ const char kLibAssistantV2MigrationDescription[] = +@@ -6832,7 +6832,7 @@ const char kLibAssistantV2MigrationDescription[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -18,7 +18,7 @@ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -6926,7 +6926,7 @@ const char kSearchWebInSidePanelDescription[] = +@@ -7072,7 +7072,7 @@ const char kSearchWebInSidePanelDescription[] = // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ const char kQuickCommandsName[] = "Quick Commands"; const char kQuickCommandsDescription[] = "Enable a text interface to browser features. Invoke with Ctrl-Space."; -@@ -6935,7 +6935,7 @@ const char kQuickCommandsDescription[] = +@@ -7081,7 +7081,7 @@ const char kQuickCommandsDescription[] = // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -6957,7 +6957,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] +@@ -7103,7 +7103,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] "instead of JSON."; #endif @@ -45,7 +45,7 @@ const char kUseOutOfProcessVideoDecodingName[] = "Use out-of-process video decoding (OOP-VD)"; const char kUseOutOfProcessVideoDecodingDescription[] = -@@ -6975,7 +6975,7 @@ const char kWebShareDescription[] = +@@ -7121,7 +7121,7 @@ const char kWebShareDescription[] = "platforms."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -54,7 +54,7 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -6995,7 +6995,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -7141,7 +7141,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -63,7 +63,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -7009,7 +7009,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail +@@ -7155,7 +7155,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail "storage and requests initial sync."; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -72,7 +72,7 @@ const char kAsyncDnsName[] = "Async DNS resolver"; const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -@@ -7110,7 +7110,7 @@ const char kElasticOverscrollDescription[] = +@@ -7256,7 +7256,7 @@ const char kElasticOverscrollDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -81,7 +81,7 @@ const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -7139,7 +7139,7 @@ const char kSigninInterceptBubbleV2Description[] = +@@ -7285,7 +7285,7 @@ const char kSigninInterceptBubbleV2Description[] = #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 05f1bf643acf..900f57ca5e2c 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.h.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/flag_descriptions.h.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/flag_descriptions.h -@@ -1360,7 +1360,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd +@@ -1412,7 +1412,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd extern const char kWebUIOmniboxPopupName[]; extern const char kWebUIOmniboxPopupDescription[]; @@ -9,7 +9,7 @@ extern const char kWebUiSystemFontName[]; extern const char kWebUiSystemFontDescription[]; #endif -@@ -3856,7 +3856,7 @@ extern const char kLacrosMergeIcuDataFileName[]; +@@ -3928,7 +3928,7 @@ extern const char kLacrosMergeIcuDataFileName[]; extern const char kLacrosMergeIcuDataFileDescription[]; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -18,7 +18,7 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -3980,14 +3980,14 @@ extern const char kSearchWebInSidePanelDescription[]; +@@ -4058,14 +4058,14 @@ extern const char kSearchWebInSidePanelDescription[]; // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -35,7 +35,7 @@ extern const char kWebShareName[]; extern const char kWebShareDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -3997,7 +3997,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4075,7 +4075,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -44,7 +44,7 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4007,7 +4007,7 @@ extern const char kOzonePlatformHintName[]; +@@ -4085,7 +4085,7 @@ extern const char kOzonePlatformHintName[]; extern const char kOzonePlatformHintDescription[]; #endif // BUILDFLAG(IS_LINUX) @@ -53,7 +53,7 @@ extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -4015,13 +4015,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt +@@ -4093,13 +4093,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -69,7 +69,7 @@ extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -4037,7 +4037,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; +@@ -4115,7 +4115,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; extern const char kEnableProtoApiForClassifyUrlDescription[]; #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) @@ -78,7 +78,7 @@ extern const char kUseOutOfProcessVideoDecodingName[]; extern const char kUseOutOfProcessVideoDecodingDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -4111,7 +4111,7 @@ extern const char kElasticOverscrollDescription[]; +@@ -4189,7 +4189,7 @@ extern const char kElasticOverscrollDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -87,7 +87,7 @@ extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; -@@ -4129,7 +4129,7 @@ extern const char kSigninInterceptBubbleV2Description[ +@@ -4207,7 +4207,7 @@ extern const char kSigninInterceptBubbleV2Description[ #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc index 66d669e63ab6..81891bede59d 100644 --- a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc +++ b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2022-10-24 13:33:33 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -585,7 +585,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI +@@ -586,7 +586,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc index d20da39a3685..e5f1c6f4bef3 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/media/webrtc/capture_policy_utils.cc -@@ -124,7 +124,7 @@ AllowedScreenCaptureLevel GetAllowedCaptureLevel(const +@@ -139,7 +139,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry } bool IsGetAllScreensMediaAllowedForAnySite(content::BrowserContext* context) { @@ -9,7 +9,7 @@ Profile* profile = Profile::FromBrowserContext(context); if (!profile) { return false; -@@ -160,7 +160,7 @@ bool IsGetAllScreensMediaAllowedForAnySite(content::Br +@@ -174,7 +174,7 @@ bool IsGetAllScreensMediaAllowedForAnySite(content::Br bool IsGetAllScreensMediaAllowed(content::BrowserContext* context, const GURL& url) { diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc index 37697c3d04ef..2200e315e7f5 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2023-04-28 17:01:32 UTC +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -372,6 +372,10 @@ void WebRtcLogUploader::SetupMultipart( +@@ -373,6 +373,10 @@ void WebRtcLogUploader::SetupMultipart( const char product[] = "Chrome_ChromeOS"; #elif BUILDFLAG(IS_FUCHSIA) const char product[] = "Chrome_Fuchsia"; 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 881b2b99fc06..e2a4e290b2e0 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -67,8 +67,10 @@ +@@ -77,8 +77,10 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -12,25 +12,25 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" -@@ -102,7 +104,7 @@ - #include "chromeos/startup/startup_switches.h" - #endif // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -107,7 +109,7 @@ + #include "chromeos/crosapi/cpp/crosapi_constants.h" + #endif // BUILDFLAG(IS_CHROMEOS_LACROS) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h" #endif // BUILDFLAG(IS_LINUX) -@@ -111,7 +113,7 @@ +@@ -116,7 +118,7 @@ #include "components/user_manager/user_manager.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/power_metrics/system_power_monitor.h" #endif -@@ -533,7 +535,7 @@ void RecordStartupMetrics() { +@@ -538,7 +540,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. @@ -39,7 +39,7 @@ shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -742,11 +744,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt +@@ -812,11 +814,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt } #endif // !BUILDFLAG(IS_ANDROID) @@ -48,8 +48,8 @@ pressure_metrics_reporter_ = std::make_unique<PressureMetricsReporter>(); #endif // BUILDFLAG(IS_LINUX) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::trace_event::TraceLog::GetInstance()->AddEnabledStateObserver( power_metrics::SystemPowerMonitor::GetInstance()); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) 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 93b370294e33..ff5373dd2611 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,4 +1,4 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc @@ -183,7 +183,7 @@ #include "chrome/notification_helper/notification_helper_constants.h" @@ -18,7 +18,7 @@ #include "chrome/browser/metrics/family_link_user_metrics_provider.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS_LACROS))||BUILDFLAG(IS_ANDROID)) -@@ -795,7 +795,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -788,7 +788,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::CPUMetricsProvider>()); @@ -27,7 +27,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::MotherboardMetricsProvider>()); #endif -@@ -877,7 +877,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -870,7 +870,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,16 +36,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); -@@ -886,7 +886,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic - - #if BUILDFLAG(ENABLE_SUPERVISED_USERS) && \ - (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS)) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - if (base::FeatureList::IsEnabled( - kExtendFamilyLinkUserLogSegmentToAllPlatforms)) { - metrics_service_->RegisterMetricsProvider( -@@ -1002,7 +1002,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -983,7 +983,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -54,7 +45,7 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1201,7 +1201,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1182,7 +1182,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 0b66c74b7fcc..e9bc18add080 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 2023-07-16 15:47:57 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -93,7 +93,7 @@ @@ -54,7 +54,7 @@ // Note that the default value is not relevant because the pref is only // evaluated when it is managed. registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled, -@@ -992,7 +992,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor +@@ -977,7 +977,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc index 06f62efc6a91..05f7ca6f1d37 100644 --- a/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc +++ b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc @@ -1,4 +1,4 @@ ---- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2023-02-08 09:03:45 UTC +--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc @@ -48,7 +48,7 @@ #include "chrome/browser/policy/browser_dm_token_storage_mac.h" @@ -15,7 +15,7 @@ -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #include "chrome/browser/enterprise/connectors/device_trust/device_trust_features.h" + #include "chrome/browser/enterprise/connectors/device_trust/device_trust_features.h" // nogncheck #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h" #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher.h" @@ -90,7 +90,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: 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 97717307baf3..ea3e28cdcf87 100644 --- a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -210,12 +210,12 @@ +@@ -211,12 +211,12 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -15,7 +15,7 @@ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) #include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -780,14 +780,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -784,14 +784,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -32,7 +32,7 @@ { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1444,7 +1444,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1460,7 +1460,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -41,7 +41,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1514,18 +1514,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1530,18 +1530,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -63,7 +63,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1538,7 +1538,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1554,7 +1554,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) \ @@ -72,7 +72,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1642,7 +1642,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1658,7 +1658,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -81,14 +81,16 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -1738,13 +1738,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1754,7 +1754,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS) --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - { key::kGetDisplayMediaSetSelectAllScreensAllowedForUrls, - prefs::kManagedGetDisplayMediaSetSelectAllScreensAllowedForUrls, +-#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/1454054): replace the + // kGetDisplayMediaSetSelectAllScreensAllowedForUrls policy by a policy that + // matches the name of the new `getAllScreensMedia` API. +@@ -1763,7 +1763,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::LIST }, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) @@ -97,7 +99,7 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -1775,7 +1775,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1794,7 +1794,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -106,7 +108,7 @@ { key::kEnforceLocalAnchorConstraintsEnabled, prefs::kEnforceLocalAnchorConstraintsEnabled, base::Value::Type::BOOLEAN }, -@@ -1857,7 +1857,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1873,7 +1873,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -115,7 +117,7 @@ { key::kBatterySaverModeAvailability, performance_manager::user_tuning::prefs::kBatterySaverModeState, base::Value::Type::INTEGER }, -@@ -1888,7 +1888,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1904,7 +1904,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kCloudApAuthEnabled, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) @@ -124,7 +126,7 @@ { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -1978,7 +1978,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2011,7 +2011,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // Policies for all platforms - End #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -133,7 +135,7 @@ handlers->AddHandler( std::make_unique<performance_manager::HighEfficiencyPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -2177,7 +2177,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2215,7 +2215,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -142,7 +144,7 @@ handlers->AddHandler( std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); handlers->AddHandler( -@@ -2234,7 +2234,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2272,7 +2272,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -151,7 +153,7 @@ handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); handlers->AddHandler( -@@ -2275,7 +2275,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2313,7 +2313,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) || \ @@ -160,7 +162,7 @@ signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>( key::kForceBrowserSignin, prefs::kForceBrowserSignin, base::Value::Type::BOOLEAN)); -@@ -2633,7 +2633,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2671,7 +2671,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -169,7 +171,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -2641,7 +2641,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2679,7 +2679,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -178,7 +180,7 @@ handlers->AddHandler(std::make_unique<SimplePolicyHandler>( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -2654,7 +2654,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2692,7 +2692,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH handlers->AddHandler( std::make_unique<first_party_sets::FirstPartySetsOverridesPolicyHandler>( chrome_schema)); diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index 2721bb27c0d5..a75ccb4bd576 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -464,13 +464,13 @@ +@@ -465,13 +465,13 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -16,7 +16,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -503,7 +503,7 @@ +@@ -504,7 +504,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -25,7 +25,7 @@ #include "ui/color/system_theme.h" #endif -@@ -708,7 +708,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li +@@ -709,7 +709,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li const char kPluginsShowDetails[] = "plugins.show_details"; // Deprecated 02/2023. @@ -34,7 +34,7 @@ const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -902,7 +902,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS +@@ -952,7 +952,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS #endif // BUILDFLAG(IS_CHROMEOS_ASH) // Deprecated 02/2023. @@ -43,7 +43,7 @@ registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -1027,7 +1027,7 @@ void RegisterProfilePrefsForMigration( +@@ -1103,7 +1103,7 @@ void RegisterProfilePrefsForMigration( registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0); #endif @@ -52,7 +52,7 @@ // Deprecated 08/2022. registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false); #endif -@@ -1762,12 +1762,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1862,12 +1862,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -67,7 +67,7 @@ browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif -@@ -1920,7 +1920,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local +@@ -2020,7 +2020,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local #endif // BUILDFLAG(IS_CHROMEOS_ASH) // Added 02/2023 @@ -76,7 +76,7 @@ local_state->ClearPref(kWebAppsUrlHandlerInfo); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -2060,7 +2060,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { +@@ -2185,7 +2185,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { profile_prefs->ClearPref(kProfileAvatarTutorialShown); #endif diff --git a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc index 7b39985588f0..30dd8e385a1a 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -165,7 +165,7 @@ const char* const kPersistentPrefNames[] = { +@@ -168,7 +168,7 @@ const char* const kPersistentPrefNames[] = { prefs::kShowFullscreenToolbar, #endif diff --git a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc index 7c02b36917bb..f3cc0f283d98 100644 --- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,15 +1,15 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2023-02-08 09:03:45 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/process_singleton_posix.cc -@@ -96,7 +96,7 @@ - #include "net/base/network_interfaces.h" +@@ -97,7 +97,7 @@ #include "ui/base/l10n/l10n_util.h" + #include "ui/base/resource/scoped_startup_resource_bundle.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/process_singleton_dialog_linux.h" #endif -@@ -350,7 +350,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo +@@ -355,7 +355,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo if (g_disable_prompt) return g_user_opted_unlock_in_use_profile; 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 a2c6101720e9..b56038e4b633 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -364,18 +364,18 @@ +@@ -375,18 +375,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -22,7 +22,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h" #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" -@@ -545,7 +545,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -567,7 +567,7 @@ void ChromeBrowserMainExtraPartsProfiles:: BreadcrumbManagerKeyedServiceFactory::GetInstance(); } browser_sync::UserEventServiceFactory::GetInstance(); @@ -31,7 +31,7 @@ browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); #endif BrowsingDataHistoryObserverService::Factory::GetInstance(); -@@ -616,17 +616,17 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -644,17 +644,17 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !BUILDFLAG(IS_ANDROID) DriveServiceFactory::GetInstance(); #endif @@ -52,7 +52,7 @@ enterprise_connectors::LocalBinaryUploadServiceFactory::GetInstance(); #endif #if BUILDFLAG(ENABLE_SESSION_SERVICE) -@@ -732,12 +732,12 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -765,12 +765,12 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -67,7 +67,7 @@ enterprise_idle::IdleServiceFactory::GetInstance(); #endif ModelTypeStoreServiceFactory::GetInstance(); -@@ -805,7 +805,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -844,7 +844,7 @@ void ChromeBrowserMainExtraPartsProfiles:: PredictionServiceFactory::GetInstance(); PrimaryAccountPolicyManagerFactory::GetInstance(); diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts index 6c0105951b25..1b7fd97144a4 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts -@@ -16,7 +16,7 @@ export interface AppearanceBrowserProxy { +@@ -18,7 +18,7 @@ export interface AppearanceBrowserProxy { useDefaultTheme(): void; @@ -9,7 +9,7 @@ useGtkTheme(): void; useQtTheme(): void; // </if> -@@ -41,7 +41,7 @@ export class AppearanceBrowserProxyImpl implements App +@@ -48,7 +48,7 @@ export class AppearanceBrowserProxyImpl implements App chrome.send('useDefaultTheme'); } diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html index 01f9a99a0ed6..4347c94ad305 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html @@ -1,4 +1,4 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.html @@ -27,7 +27,7 @@ <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]" @@ -18,7 +18,7 @@ <div class="settings-row continuation" hidden="[[!showThemesSecondary_( prefs.extensions.theme.id.value, systemTheme_)]]" -@@ -142,7 +142,7 @@ +@@ -154,7 +154,7 @@ </div> </template> diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts index e67de708371b..d9936e12400d 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2022-10-24 13:33:33 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.ts -@@ -63,7 +63,7 @@ export interface SettingsAppearancePageElement { +@@ -64,7 +64,7 @@ export interface SettingsAppearancePageElement { export enum SystemTheme { // Either classic or web theme. DEFAULT = 0, @@ -9,7 +9,7 @@ GTK = 1, QT = 2, // </if> -@@ -155,7 +155,7 @@ export class SettingsAppearancePageElement extends +@@ -156,7 +156,7 @@ export class SettingsAppearancePageElement extends 'prefs.autogenerated.theme.policy.color.controlledBy)', }, @@ -18,7 +18,7 @@ /** * Whether to show the "Custom Chrome Frame" setting. */ -@@ -184,7 +184,7 @@ export class SettingsAppearancePageElement extends +@@ -192,7 +192,7 @@ export class SettingsAppearancePageElement extends 'themeChanged_(' + 'prefs.extensions.theme.id.value, systemTheme_, isForcedTheme_)', @@ -27,16 +27,16 @@ 'systemThemePrefChanged_(prefs.extensions.theme.system_theme.value)', // </if> ]; -@@ -203,7 +203,7 @@ export class SettingsAppearancePageElement extends - private showReaderModeOption_: boolean; +@@ -212,7 +212,7 @@ export class SettingsAppearancePageElement extends private isForcedTheme_: boolean; + private showHoverCardImagesOption_: boolean; - // <if expr="is_linux"> + // <if expr="is_posix"> private showCustomChromeFrame_: boolean; // </if> -@@ -281,7 +281,7 @@ export class SettingsAppearancePageElement extends +@@ -290,7 +290,7 @@ export class SettingsAppearancePageElement extends this.appearanceBrowserProxy_.useDefaultTheme(); } @@ -45,7 +45,7 @@ private systemThemePrefChanged_(systemTheme: SystemTheme) { this.systemTheme_ = systemTheme; } -@@ -354,7 +354,7 @@ export class SettingsAppearancePageElement extends +@@ -363,7 +363,7 @@ export class SettingsAppearancePageElement extends } let i18nId; @@ -54,7 +54,7 @@ switch (this.systemTheme_) { case SystemTheme.GTK: i18nId = 'gtkTheme'; -@@ -367,7 +367,7 @@ export class SettingsAppearancePageElement extends +@@ -376,7 +376,7 @@ export class SettingsAppearancePageElement extends break; } // </if> 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 23d3b7137343..e52f71e87a33 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_route.ts +++ b/www/chromium/files/patch-chrome_browser_resources_settings_route.ts @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/route.ts.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/resources/settings/route.ts.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/resources/settings/route.ts -@@ -232,7 +232,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes +@@ -241,7 +241,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes r.ACCESSIBILITY = r.ADVANCED.createSection( '/accessibility', 'a11y', loadTimeData.getString('a11yPageTitle')); diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc index 4645679da96e..b5b0362cc202 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc @@ -18,7 +18,7 @@ #include "net/base/url_util.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" #endif -@@ -383,7 +383,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil +@@ -397,7 +397,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil Profile* profile, const enterprise_connectors::AnalysisSettings& settings) { // Local content analysis is supported only on desktop platforms. diff --git a/www/chromium/files/patch-chrome_browser_signin_bound__session__credentials_bound__session__refresh__cookie__fetcher__impl.cc b/www/chromium/files/patch-chrome_browser_signin_bound__session__credentials_bound__session__refresh__cookie__fetcher__impl.cc deleted file mode 100644 index 45a485329af7..000000000000 --- a/www/chromium/files/patch-chrome_browser_signin_bound__session__credentials_bound__session__refresh__cookie__fetcher__impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc.orig 2023-07-16 15:47:57 UTC -+++ chrome/browser/signin/bound_session_credentials/bound_session_refresh_cookie_fetcher_impl.cc -@@ -103,6 +103,6 @@ void BoundSessionRefreshCookieFetcherImpl::OnURLLoader - net::Error net_error = static_cast<net::Error>(url_loader_->NetError()); - - std::move(callback_).Run( -- Result(net_error, headers ? absl::optional<int>(headers->response_code()) -- : absl::nullopt)); -+ Result({net_error, headers ? absl::optional<int>(headers->response_code()) -+ : absl::nullopt})); - } diff --git a/www/chromium/files/patch-chrome_browser_signin_bound__session__credentials_fake__bound__session__refresh__cookie__fetcher.cc b/www/chromium/files/patch-chrome_browser_signin_bound__session__credentials_fake__bound__session__refresh__cookie__fetcher.cc deleted file mode 100644 index 068a01efe47d..000000000000 --- a/www/chromium/files/patch-chrome_browser_signin_bound__session__credentials_fake__bound__session__refresh__cookie__fetcher.cc +++ /dev/null @@ -1,32 +0,0 @@ ---- chrome/browser/signin/bound_session_credentials/fake_bound_session_refresh_cookie_fetcher.cc.orig 2023-07-16 15:47:57 UTC -+++ chrome/browser/signin/bound_session_credentials/fake_bound_session_refresh_cookie_fetcher.cc -@@ -51,7 +51,11 @@ void FakeBoundSessionRefreshCookieFetcher::SimulateCom - // Synchronous since tests use `BoundSessionTestCookieManager`. - OnRefreshCookieCompleted(CreateFakeCookie(cookie_expiration.value())); - } else { -+#if defined(__clang__) && (__clang_major__ >= 15) - std::move(callback_).Run(Result(net::Error::OK, net::HTTP_FORBIDDEN)); -+#else -+ std::move(callback_).Run(Result({net::Error::OK, net::HTTP_FORBIDDEN})); -+#endif - } - } - -@@ -83,9 +87,17 @@ void FakeBoundSessionRefreshCookieFetcher::OnCookieSet - net::CookieAccessResult access_result) { - bool success = access_result.status.IsInclude(); - if (!success) { -+#if defined(__clang__) && (__clang_major__ >= 15) - std::move(callback_).Run(Result(net::Error::OK, net::HTTP_FORBIDDEN)); -+#else -+ std::move(callback_).Run(Result({net::Error::OK, net::HTTP_FORBIDDEN})); -+#endif - } else { -+#if defined(__clang__) && (__clang_major__ >= 15) - std::move(callback_).Run(Result(net::Error::OK, net::HTTP_OK)); -+#else -+ std::move(callback_).Run(Result({net::Error::OK, net::HTTP_OK})); -+#endif - } - // |This| may be destroyed - } diff --git a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc index 4254c53da5d5..6f4ead5cf1ae 100644 --- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -127,7 +127,7 @@ +@@ -129,7 +129,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,16 +9,16 @@ #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h" #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || -@@ -475,7 +475,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -477,7 +477,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled(features::kTabGroupsSaveSyncIntegration)) { + if (base::FeatureList::IsEnabled(features::kTabGroupsSave)) { controllers.push_back(std::make_unique<syncer::ModelTypeController>( syncer::SAVED_TAB_GROUP, -@@ -488,7 +488,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -490,7 +490,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy // Chrome prefers OS provided spell checkers where they exist. So only sync the // custom dictionary on platforms that typically don't provide one. @@ -27,12 +27,12 @@ // Dictionary sync is enabled by default. if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { controllers.push_back( -@@ -655,7 +655,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate> +@@ -661,7 +661,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate> ChromeSyncClient::GetControllerDelegateForModelType(syncer::ModelType type) { switch (type) { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) case syncer::SAVED_TAB_GROUP: { - DCHECK(base::FeatureList::IsEnabled( - features::kTabGroupsSaveSyncIntegration)); + DCHECK(base::FeatureList::IsEnabled(features::kTabGroupsSave)); + return SavedTabGroupServiceFactory::GetForProfile(profile_) diff --git a/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc b/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc index 5ccfd03a2f19..324ef00bc142 100644 --- a/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/sync_service_factory.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/sync/sync_service_factory.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/sync/sync_service_factory.cc -@@ -74,7 +74,7 @@ +@@ -75,7 +75,7 @@ #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || // BUILDFLAG(IS_WIN) -@@ -119,7 +119,7 @@ std::unique_ptr<KeyedService> BuildSyncService( +@@ -124,7 +124,7 @@ std::unique_ptr<KeyedService> BuildSyncService( // TODO(crbug.com/1052397): Reassess whether the following block needs to be // included in lacros-chrome once build flag switch of lacros-chrome is // complete. @@ -18,7 +18,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) syncer::SyncPrefs prefs(profile->GetPrefs()); local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); -@@ -244,7 +244,7 @@ SyncServiceFactory::SyncServiceFactory() +@@ -252,7 +252,7 @@ SyncServiceFactory::SyncServiceFactory() DependsOn(ThemeServiceFactory::GetInstance()); #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__service.cc b/www/chromium/files/patch-chrome_browser_themes_theme__service.cc index e86cab39ab67..70c0116adf97 100644 --- a/www/chromium/files/patch-chrome_browser_themes_theme__service.cc +++ b/www/chromium/files/patch-chrome_browser_themes_theme__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/themes/theme_service.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/themes/theme_service.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/themes/theme_service.cc -@@ -73,7 +73,7 @@ +@@ -75,7 +75,7 @@ #include "extensions/browser/extension_registry_observer.h" #endif @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -315,7 +315,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() +@@ -317,7 +317,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() } bool ThemeService::ShouldUseCustomFrame() const { diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc index 492e7c4a6bf6..7f4ae61de9b2 100644 --- a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/themes/theme_service_factory.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/themes/theme_service_factory.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/themes/theme_service_factory.cc -@@ -23,11 +23,11 @@ +@@ -26,11 +26,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -14,7 +14,7 @@ #include "ui/linux/linux_ui_factory.h" #endif -@@ -86,7 +86,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; +@@ -102,7 +102,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; KeyedService* ThemeServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { @@ -23,7 +23,7 @@ using ThemeService = ThemeServiceAuraLinux; #endif -@@ -100,9 +100,9 @@ void ThemeServiceFactory::RegisterProfilePrefs( +@@ -116,9 +116,9 @@ void ThemeServiceFactory::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { // 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_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index dc3c23a46a60..7d1179c0a896 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -119,7 +119,7 @@ - #define ENABLED_VLOG_LEVEL 1 +@@ -123,7 +123,7 @@ + #include "components/user_manager/user_manager.h" #endif -#if BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -310,7 +310,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -304,7 +304,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } @@ -18,7 +18,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. auto* linux_ui = ui::LinuxUi::instance(); -@@ -561,7 +561,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -555,7 +555,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -573,7 +573,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -567,7 +567,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -36,7 +36,7 @@ case IDC_USE_SYSTEM_TITLE_BAR: { PrefService* prefs = profile()->GetPrefs(); prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -1175,12 +1175,12 @@ void BrowserCommandController::InitCommandState() { +@@ -1209,12 +1209,12 @@ void BrowserCommandController::InitCommandState() { #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_ui_chrome__pages.cc b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc index ac36ccd988cc..160e8a5361b4 100644 --- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc +++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/chrome_pages.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/chrome_pages.cc -@@ -69,7 +69,7 @@ +@@ -71,7 +71,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,8 +9,8 @@ #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -662,7 +662,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, - #endif +@@ -623,7 +623,7 @@ void ShowShortcutCustomizationApp(Profile* profile) { + } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) 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 cd1ebc7182ec..c9076543679d 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 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/chrome_pages.h.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/chrome_pages.h @@ -34,7 +34,7 @@ enum class ConsentLevel; } // namespace signin @@ -9,7 +9,7 @@ namespace web_app { enum class AppSettingsPageEntryPoint; } // namespace web_app -@@ -245,7 +245,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, +@@ -233,7 +233,7 @@ void ShowShortcutCustomizationApp(Profile* profile); #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_managed__ui.cc b/www/chromium/files/patch-chrome_browser_ui_managed__ui.cc index 8511b1e8e5d9..4d1eb7df0fe3 100644 --- a/www/chromium/files/patch-chrome_browser_ui_managed__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_managed__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/managed_ui.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/managed_ui.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/managed_ui.cc -@@ -92,7 +92,7 @@ bool ShouldDisplayManagedByParentUi(Profile* profile) +@@ -95,7 +95,7 @@ bool ShouldDisplayManagedByParentUi(Profile* profile) return false; #else @@ -8,4 +8,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // The EnableManagedByParentUiOnDesktop flag depends on // EnableSupervisionOnDesktopAndIOS. - CHECK( + DCHECK( diff --git a/www/chromium/files/patch-chrome_browser_ui_omnibox_chrome__omnibox__client.cc b/www/chromium/files/patch-chrome_browser_ui_omnibox_chrome__omnibox__client.cc new file mode 100644 index 000000000000..46782bba575a --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_omnibox_chrome__omnibox__client.cc @@ -0,0 +1,21 @@ +--- chrome/browser/ui/omnibox/chrome_omnibox_client.cc.orig 2023-08-17 07:33:31 UTC ++++ chrome/browser/ui/omnibox/chrome_omnibox_client.cc +@@ -470,10 +470,18 @@ void ChromeOmniboxClient::OnAutocompleteAccept( + alternative_nav_match); + + // Store the details necessary to open the omnibox match via browser commands. ++#if defined(__clang__) && (__clang_major__ >= 16) + location_bar_->set_navigation_params(LocationBar::NavigationParams( + destination_url, disposition, transition, match_selection_timestamp, + destination_url_entered_without_scheme, + destination_url_entered_with_http_scheme)); ++#else ++ LocationBar::NavigationParams np = { ++ destination_url, disposition, transition, match_selection_timestamp, ++ destination_url_entered_without_scheme, ++ destination_url_entered_with_http_scheme }; ++ location_bar_->set_navigation_params(np); ++#endif + + if (browser_) { + auto navigation = chrome::OpenCurrentURL(browser_); diff --git a/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc b/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc index c657ac76f19f..0ca38deb1cb9 100644 --- a/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc +++ b/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc -@@ -1954,7 +1954,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() { - return OmniboxFieldTrial::IsChromeRefreshIconsEnabled() +@@ -1960,7 +1960,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() { + OmniboxFieldTrial::IsChromeRefreshActionChipIconsEnabled() ? omnibox::kShareWinChromeRefreshIcon : omnibox::kShareWinIcon; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return OmniboxFieldTrial::IsChromeRefreshIconsEnabled() + return OmniboxFieldTrial::IsChromeRefreshIconsEnabled() || + OmniboxFieldTrial::IsChromeRefreshActionChipIconsEnabled() ? omnibox::kShareLinuxChromeRefreshIcon - : omnibox::kShareIcon; diff --git a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc index c61af2352d4f..9cfa67211283 100644 --- a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/signin_view_controller.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/signin_view_controller.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/signin_view_controller.cc -@@ -276,7 +276,7 @@ void SigninViewController::ShowModalEnterpriseConfirma - SkColor profile_color, +@@ -275,7 +275,7 @@ void SigninViewController::ShowModalEnterpriseConfirma + bool show_link_data_option, signin::SigninChoiceCallback callback) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) 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 cdc9117e6de7..7492fa3e296a 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-10-24 13:33:33 UTC +--- chrome/browser/ui/signin_view_controller_delegate.h.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/signin_view_controller_delegate.h -@@ -84,7 +84,7 @@ class SigninViewControllerDelegate { +@@ -83,7 +83,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 72b8cb958dee..2afa7672acea 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -211,7 +211,7 @@ +@@ -217,7 +217,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/hats/hats_helper.h" -@@ -560,12 +560,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -584,12 +584,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc index 06ba75614acd..63ca2f127a35 100644 --- a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/test/test_browser_ui.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/test/test_browser_ui.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/test/test_browser_ui.cc @@ -22,7 +22,7 @@ @@ -7,9 +7,9 @@ -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + #include "content/public/common/content_switches.h" #include "ui/base/test/skia_gold_matching_algorithm.h" - #include "ui/compositor/compositor.h" -@@ -34,7 +34,7 @@ +@@ -35,7 +35,7 @@ // TODO(https://crbug.com/958242) support Mac for pixel tests. // 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_ui__features.cc b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc index df4e5ff58bc6..25f0de4ce8e2 100644 --- a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc +++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/ui_features.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/ui_features.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/ui_features.cc -@@ -298,7 +298,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, +@@ -271,7 +271,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, "TopChromeWebUIUsesSpareRenderer", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.h b/www/chromium/files/patch-chrome_browser_ui_ui__features.h index fd96b2371070..39f12e60ff97 100644 --- a/www/chromium/files/patch-chrome_browser_ui_ui__features.h +++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/ui_features.h.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/ui_features.h.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/ui_features.h -@@ -201,7 +201,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw); +@@ -183,7 +183,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw); BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc index dcde17f2a16a..5f9443861899 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/views/accelerator_table.cc -@@ -69,11 +69,11 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -72,11 +72,11 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, @@ -14,7 +14,7 @@ {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT}, {ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_PREVIOUS}, -@@ -101,7 +101,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -104,7 +104,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6}, {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, @@ -23,7 +23,7 @@ {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1}, -@@ -146,7 +146,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -149,7 +149,7 @@ const AcceleratorMapping kAcceleratorMap[] = { IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. @@ -32,7 +32,7 @@ {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK}, {ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD}, {ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME}, -@@ -247,7 +247,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -244,7 +244,7 @@ const AcceleratorMapping kAcceleratorMap[] = { #endif // !BUILDFLAG(IS_CHROMEOS) #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \ diff --git a/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc index 1ef2802c3c51..fbef8cf0b49b 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc.orig 2022-05-19 14:06:27 UTC +--- chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc -@@ -86,7 +86,7 @@ void EyeDropperView::MoveViewToFront() { +@@ -87,7 +87,7 @@ void EyeDropperView::MoveViewToFront() { } void EyeDropperView::CaptureInputIfNeeded() { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc index e4a228027064..a99330398fdd 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc @@ -51,7 +51,7 @@ #include "components/user_manager/user_manager.h" @@ -27,7 +27,7 @@ // If the window was sent to a different workspace, prioritize it if // it was sent to the current workspace and deprioritize it // otherwise. This is done by MoveBrowsersInWorkspaceToFront() -@@ -490,7 +490,7 @@ void BrowserFrame::SelectNativeTheme() { +@@ -508,7 +508,7 @@ void BrowserFrame::SelectNativeTheme() { return; } @@ -36,7 +36,7 @@ const auto* linux_ui_theme = ui::LinuxUiTheme::GetForWindow(GetNativeWindow()); // Ignore the system theme for web apps with window-controls-overlay as the -@@ -507,7 +507,7 @@ void BrowserFrame::SelectNativeTheme() { +@@ -525,7 +525,7 @@ void BrowserFrame::SelectNativeTheme() { bool BrowserFrame::RegenerateFrameOnThemeChange( BrowserThemeChangeType theme_change_type) { bool need_regenerate = false; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h index cb2cd4f6e153..7287157dcc9d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/views/frame/browser_frame.h @@ -12,7 +12,7 @@ #include "ui/views/context_menu_controller.h" @@ -18,7 +18,7 @@ // Returns which edges of the frame are tiled. const ui::WindowTiledEdges& tiled_edges() const { return tiled_edges_; } void set_tiled_edges(ui::WindowTiledEdges tiled_edges) { -@@ -233,7 +233,7 @@ class BrowserFrame : public views::Widget, public view +@@ -231,7 +231,7 @@ class BrowserFrame : public views::Widget, public view // contents for smoother dragging. TabDragKind tab_drag_kind_ = TabDragKind::kNone; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index 5c91256ff922..ba358483f436 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2004,7 +2004,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2015,7 +2015,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra // CrOS cleanup is done. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc index 24c65300a1bc..71a5b295cd13 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc -@@ -45,7 +45,7 @@ +@@ -46,7 +46,7 @@ #include "ui/aura/window.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h" #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h" #endif -@@ -67,7 +67,7 @@ constexpr int kBackToTabImageSize = 16; +@@ -68,7 +68,7 @@ constexpr int kBackToTabImageSize = 16; // The height of the controls bar at the top of the window. constexpr int kTopControlsHeight = 30; @@ -18,7 +18,7 @@ // Frame border when window shadow is not drawn. constexpr int kFrameBorderThickness = 4; #endif -@@ -159,7 +159,7 @@ class WindowEventObserver : public ui::EventObserver { +@@ -160,7 +160,7 @@ class WindowEventObserver : public ui::EventObserver { gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds(); @@ -27,7 +27,7 @@ // Calculate input bounds for Linux. This is needed because the input bounds // is not necessary the same as the local bounds on Linux. if (pip_browser_frame_view_->ShouldDrawFrameShadow()) { -@@ -358,7 +358,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow +@@ -359,7 +359,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow hide_close_button_animation_.set_continuous(false); hide_close_button_animation_.set_delegate(this); @@ -36,7 +36,7 @@ frame_background_ = std::make_unique<views::FrameBackground>(); #endif -@@ -491,7 +491,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( +@@ -492,7 +492,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( for (ContentSettingImageView* view : content_setting_views_) view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground)); @@ -45,7 +45,7 @@ // On Linux the top bar background will be drawn in OnPaint(). top_bar_container_view_->SetBackground(views::CreateSolidBackground( color_provider->GetColor(kColorPipWindowTopBarBackground))); -@@ -536,7 +536,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg +@@ -537,7 +537,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg BrowserNonClientFrameView::RemovedFromWidget(); } @@ -54,7 +54,7 @@ gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -743,7 +743,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre +@@ -745,7 +745,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre // views::View implementations: void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) { @@ -63,7 +63,7 @@ // Draw the PiP window frame borders and shadows, including the top bar // background. if (window_frame_provider_) { -@@ -866,7 +866,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -868,7 +868,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie } gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const { @@ -72,7 +72,7 @@ if (window_frame_provider_) { const auto insets = window_frame_provider_->GetFrameThicknessDip(); const auto tiled_edges = frame()->tiled_edges(); -@@ -887,7 +887,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor +@@ -889,7 +889,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor } gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const { @@ -81,7 +81,7 @@ return FrameBorderInsets(); #elif BUILDFLAG(IS_CHROMEOS_ASH) return gfx::Insets(chromeos::kResizeInsideBoundsSize); -@@ -908,7 +908,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie +@@ -910,7 +910,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie top_height + border_thickness.bottom()); } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h index 556410cb9d91..b1bd67742eb1 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h -@@ -20,7 +20,7 @@ +@@ -22,7 +22,7 @@ #include "ui/views/controls/image_view.h" #include "ui/views/widget/widget_observer.h" @@ -9,7 +9,7 @@ #include "ui/linux/window_frame_provider.h" #endif -@@ -78,7 +78,7 @@ class PictureInPictureBrowserFrameView +@@ -80,7 +80,7 @@ class PictureInPictureBrowserFrameView void Layout() override; void AddedToWidget() override; void RemovedFromWidget() override; @@ -18,7 +18,7 @@ gfx::Insets MirroredFrameBorderInsets() const override; gfx::Insets GetInputInsets() const override; SkRRect GetRestoredClipRegion() const override; -@@ -164,7 +164,7 @@ class PictureInPictureBrowserFrameView +@@ -166,7 +166,7 @@ class PictureInPictureBrowserFrameView // Called when mouse entered or exited the pip window. void OnMouseEnteredOrExitedWindow(bool entered); @@ -27,7 +27,7 @@ // Sets the window frame provider so that it will be used for drawing. void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider); -@@ -239,7 +239,7 @@ class PictureInPictureBrowserFrameView +@@ -241,7 +241,7 @@ class PictureInPictureBrowserFrameView gfx::MultiAnimation show_close_button_animation_; gfx::MultiAnimation hide_close_button_animation_; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc index fe62fe68241c..a3b7fa51e507 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc @@ -76,7 +76,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser ui::SimpleMenuModel* model) { @@ -18,7 +18,7 @@ model->AddSeparator(ui::NORMAL_SEPARATOR); bool supports_server_side_decorations = true; #if BUILDFLAG(IS_OZONE) && !BUILDFLAG(IS_CHROMEOS) -@@ -144,7 +144,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo +@@ -148,7 +148,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } 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 2c5a2c87c646..e367b45cda2f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -605,7 +605,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -639,7 +639,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 b56929e34345..5db9ec601f54 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2023-04-28 17:01:32 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc -@@ -50,7 +50,7 @@ namespace { +@@ -49,7 +49,7 @@ namespace { const int kModalDialogWidth = 448; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const int kEnterpriseConfirmationDialogWidth = 512; const int kEnterpriseConfirmationDialogHeight = 576; #endif -@@ -170,7 +170,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom +@@ -169,7 +169,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView( -@@ -448,7 +448,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati +@@ -446,7 +446,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 d18ae58faf7e..efc87955225c 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-10-24 13:33:33 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h -@@ -77,7 +77,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_tab__search__bubble__host.cc b/www/chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc new file mode 100644 index 000000000000..0e83aa899824 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/tab_search_bubble_host.cc.orig 2023-08-17 07:33:31 UTC ++++ chrome/browser/ui/views/tab_search_bubble_host.cc +@@ -171,7 +171,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT + // Mac should have tabsearch on the right side. Windows >= Win10 has the + // Tab Search button as a FrameCaptionButton, but it still needs to be on the + // left if it exists. +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + return features::IsChromeRefresh2023(); + #else + return false; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc index 9b9ff2e49da7..c312884cd4c0 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -582,7 +582,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -584,7 +584,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled()) return; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index f6085133ae92..5e24b1fdd20f 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 2023-05-31 08:12:17 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -81,7 +81,7 @@ +@@ -86,7 +86,7 @@ #include "components/remote_cocoa/browser/window.h" #endif @@ -9,7 +9,7 @@ #include "ui/aura/client/drag_drop_client.h" #endif -@@ -189,7 +189,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { +@@ -203,7 +203,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { void UpdateSystemDnDDragImage(TabDragContext* attached_context, const gfx::ImageSkia& image) { @@ -18,7 +18,7 @@ aura::Window* root_window = attached_context->GetWidget()->GetNativeWindow()->GetRootWindow(); if (aura::client::GetDragDropClient(root_window)) { -@@ -363,7 +363,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -383,7 +383,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. // - ChromeOS Ash // Releasing capture on Ash cancels gestures so avoid it. @@ -27,7 +27,7 @@ can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); -@@ -952,7 +952,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -994,7 +994,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +36,7 @@ // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -1978,7 +1978,7 @@ void TabDragController::CompleteDrag() { +@@ -2033,7 +2033,7 @@ void TabDragController::CompleteDrag() { } // If source window was maximized - maximize the new window as well. @@ -45,7 +45,7 @@ // Keeping maximized state breaks snap to Grid on Windows when dragging // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in -@@ -2361,7 +2361,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2440,7 +2440,7 @@ TabDragController::Liveness TabDragController::GetLoca } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc index f7e4232efae6..b09955e0923d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc -@@ -387,7 +387,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta +@@ -364,7 +364,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta // not become active. Setting this to false creates the need to explicitly // hide the hovercard on press, touch, and keyboard events. SetCanActivate(false); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc index 2077e412ed9b..66cb010fb4e6 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2023-04-05 11:05:06 UTC +--- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/views/tabs/tab_hover_card_controller.cc -@@ -78,7 +78,7 @@ void FixWidgetStackOrder(views::Widget* widget, const +@@ -81,7 +81,7 @@ void FixWidgetStackOrder(views::Widget* widget, const return; } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc b/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc index 064cfcc4762a..fa6a52026f32 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc -@@ -406,7 +406,7 @@ std::string GetFileExtension(FileExtension file_extens +@@ -409,7 +409,7 @@ std::string GetFileExtension(FileExtension file_extens } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ ASSERT_TRUE(override_registration_->test_override->IsShortcutCreated( profile(), app_id, app_name)); ASSERT_TRUE( -@@ -3009,7 +3009,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna +@@ -3069,7 +3069,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna app_state->id, app_state->name); ASSERT_TRUE(icon_color.has_value()); ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value())); @@ -36,7 +36,7 @@ ASSERT_TRUE(override_registration_->test_override->IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3024,7 +3024,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3084,7 +3084,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site); ASSERT_TRUE(app_state); base::ScopedAllowBlockingForTesting allow_blocking; @@ -45,7 +45,7 @@ ASSERT_FALSE(override_registration_->test_override->IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3034,7 +3034,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3094,7 +3094,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis void WebAppIntegrationTestDriver::CheckSiteHandlesFile( Site site, FileExtension file_extension) { @@ -54,7 +54,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3050,7 +3050,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile +@@ -3110,7 +3110,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile( Site site, FileExtension file_extension) { @@ -63,7 +63,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3799,7 +3799,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu +@@ -3859,7 +3859,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu base::FilePath shortcut_dir, const std::string& app_name, const AppId& app_id) { @@ -72,7 +72,7 @@ return override_registration_->test_override->GetShortcutPath( profile(), shortcut_dir, app_id, app_name); #else -@@ -3982,7 +3982,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre +@@ -4042,7 +4042,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre const AppId& id) { base::ScopedAllowBlockingForTesting allow_blocking; bool is_shortcut_and_icon_correct = false; @@ -81,7 +81,7 @@ bool is_shortcut_correct = override_registration_->test_override->IsShortcutCreated(profile, id, name); -@@ -4026,7 +4026,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr +@@ -4086,7 +4086,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr do_icon_colors_match = (expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value()); } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index bab7c4b5501f..22de298b5079 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 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -209,7 +209,7 @@ +@@ -212,7 +212,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 -@@ -235,17 +235,17 @@ +@@ -238,17 +238,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 -@@ -391,7 +391,7 @@ bool IsAboutUI(const GURL& url) { +@@ -398,7 +398,7 @@ bool IsAboutUI(const GURL& url) { #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -39,7 +39,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -651,7 +651,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -664,7 +664,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUIMobileSetupHost) return &NewWebUI<ash::cellular_setup::MobileSetupUI>; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -48,7 +48,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -706,7 +706,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -726,7 +726,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) -@@ -774,27 +774,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -793,27 +793,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc index 0deea1a619e3..346aa59a24d8 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc @@ -1,6 +1,15 @@ ---- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/webui/management/management_ui_handler.cc -@@ -172,7 +172,7 @@ enum class ReportingType { +@@ -86,7 +86,7 @@ + #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/enterprise/signals/user_permission_service_factory.h" + #include "components/device_signals/core/browser/user_permission_service.h" // nogncheck + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +@@ -178,12 +178,12 @@ enum class ReportingType { kUserActivity }; @@ -9,7 +18,22 @@ const char kManagementScreenCaptureEvent[] = "managementScreenCaptureEvent"; const char kManagementScreenCaptureData[] = "managementScreenCaptureData"; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -973,7 +973,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const char kManagementDeviceSignalsDisclosure[] = + "managementDeviceSignalsDisclosure"; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +@@ -738,7 +738,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value + GetReportingTypeValue(report_definition.reporting_type)); + report_sources->Append(std::move(data)); + } +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Insert the device signals consent disclosure at the end of browser + // reporting section. + auto* user_permission_service = GetUserPermissionService(); +@@ -1015,7 +1015,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec kManagementOnPageVisitedVisibleData, &info); } @@ -18,3 +42,12 @@ if (capture_policy::IsGetAllScreensMediaAllowedForAnySite(profile)) { AddThreatProtectionPermission(kManagementScreenCaptureEvent, kManagementScreenCaptureData, &info); +@@ -1060,7 +1060,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS + ->policy_service(); + } + +-#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::UserPermissionService* + ManagementUIHandler::GetUserPermissionService() { + return enterprise_signals::UserPermissionServiceFactory::GetForProfile( diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h index fa4a6d34ef2f..c47588df2edb 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h +++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/management/management_ui_handler.h.orig 2023-03-09 06:31:50 UTC +--- chrome/browser/ui/webui/management/management_ui_handler.h.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/webui/management/management_ui_handler.h -@@ -24,7 +24,7 @@ +@@ -24,14 +24,14 @@ #include "extensions/common/extension_id.h" #include "url/gurl.h" @@ -9,3 +9,29 @@ // Constants defining the IDs for the localized strings sent to the page as // load time data. extern const char kManagementScreenCaptureEvent[]; + extern const char kManagementScreenCaptureData[]; + #endif // BUILDFLAG(IS_CHROMEOS) || 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) + extern const char kManagementDeviceSignalsDisclosure[]; + #endif // #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + +@@ -114,7 +114,7 @@ class StatusCollector; + class SystemLogUploader; + } // namespace policy + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + namespace device_signals { + class UserPermissionService; + } // namespace device_signals +@@ -173,7 +173,7 @@ class ManagementUIHandler : public content::WebUIMessa + base::Value::Dict GetThreatProtectionInfo(Profile* profile); + base::Value::List GetManagedWebsitesInfo(Profile* profile) const; + virtual policy::PolicyService* GetPolicyService(); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + virtual device_signals::UserPermissionService* GetUserPermissionService(); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc index 07b46ec43e5d..50e018cf3173 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/realbox/realbox_handler.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/webui/realbox/realbox_handler.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/webui/realbox/realbox_handler.cc -@@ -141,7 +141,7 @@ constexpr char kMacShareIconResourceName[] = +@@ -144,7 +144,7 @@ constexpr char kMacShareIconResourceName[] = #elif BUILDFLAG(IS_WIN) constexpr char kWinShareIconResourceName[] = "//resources/cr_components/omnibox/icons/win_share.svg"; @@ -9,7 +9,7 @@ constexpr char kLinuxShareIconResourceName[] = "//resources/cr_components/omnibox/icons/share.svg"; #else -@@ -688,7 +688,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN +@@ -735,7 +735,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN icon.name == omnibox::kShareWinChromeRefreshIcon.name) { return kWinShareIconResourceName; } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index 65cb588923da..769bfa1700e8 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,15 +1,15 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -131,7 +131,7 @@ +@@ -134,7 +134,7 @@ #include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h" #endif -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) ++#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) #include "ui/display/screen.h" #endif -@@ -151,7 +151,7 @@ +@@ -154,7 +154,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -18,16 +18,16 @@ #include "ui/linux/linux_ui_factory.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -243,7 +243,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s - html_source->AddBoolean( - "allowDeletingBrowserHistory", - profile->GetPrefs()->GetBoolean(prefs::kAllowDeletingBrowserHistory)); +@@ -254,7 +254,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s + base::FeatureList::IsEnabled( + supervised_user::kClearingCookiesKeepsSupervisedUsersSignedIn)); + -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt); #else bool allow_qt_theme = false; -@@ -389,7 +389,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -409,7 +409,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, {"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT}, {"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT}, @@ -36,21 +36,21 @@ {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -399,7 +399,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -419,7 +419,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) ++#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -421,7 +421,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -444,7 +444,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) ++#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) bool show_custom_chrome_frame = ui::OzonePlatform::GetInstance() ->GetPlatformRuntimeProperties() .supports_server_side_window_decorations; 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 96930b52ca31..e01104f3935a 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 2023-03-09 06:31:50 UTC +--- chrome/browser/ui/window_sizer/window_sizer.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/ui/window_sizer/window_sizer.cc -@@ -203,7 +203,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( +@@ -215,7 +215,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( browser, window_bounds, show_state); } diff --git a/www/chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc b/www/chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc index de9378576d71..60c285f4d9d2 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/commands/install_app_locally_command.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/browser/web_applications/commands/install_app_locally_command.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/web_applications/commands/install_app_locally_command.cc -@@ -81,7 +81,7 @@ void InstallAppLocallyCommand::StartWithLock( +@@ -80,7 +80,7 @@ void InstallAppLocallyCommand::StartWithLock( options.os_hooks[OsHookType::kUninstallationViaOsSettings] = web_app->CanUserUninstallWebApp(); diff --git a/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc b/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc index 89bd7e6e93ab..180cd5f069e9 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/web_applications/test/os_integration_test_override_impl.cc @@ -127,7 +127,7 @@ std::vector<std::wstring> GetFileExtensionsForProgId( } @@ -117,7 +117,7 @@ auto callback = base::BindRepeating([](base::FilePath filename_in, std::string xdg_command, std::string file_contents) { -@@ -767,7 +767,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr +@@ -769,7 +769,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr } } } 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 a80c8d67055b..112afc0d18ab 100644 --- a/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -561,7 +561,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl +@@ -572,7 +572,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl g_observer->ConfiguringCable(request_type); } diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index 58f41c471032..0cad98d0a35b 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/chromium/files/patch-chrome_common_chrome__features.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/common/chrome_features.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/common/chrome_features.cc -@@ -82,7 +82,7 @@ BASE_FEATURE(kAsyncDns, +@@ -76,7 +76,7 @@ BASE_FEATURE(kAsyncDns, ); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // Enables or disables the Autofill survey triggered by opening a prompt to // save address info. BASE_FEATURE(kAutofillAddressSurvey, -@@ -100,7 +100,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, +@@ -94,7 +94,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, base::FEATURE_DISABLED_BY_DEFAULT); #endif @@ -18,7 +18,7 @@ // Enables the Restart background mode optimization. When all Chrome UI is // closed and it goes in the background, allows to restart the browser to // discard memory. -@@ -291,7 +291,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, +@@ -287,7 +287,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, // Enables or disables Desktop PWAs to be auto-started on OS login. BASE_FEATURE(kDesktopPWAsRunOnOsLogin, "DesktopPWAsRunOnOsLogin", @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -326,7 +326,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles, +@@ -322,7 +322,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles, base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ // Controls whether Chrome Apps are supported. See https://crbug.com/1221251. // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome // Apps will not launch and will be marked in the UI as deprecated. -@@ -353,7 +353,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati +@@ -349,7 +349,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati BASE_FEATURE(kDnsOverHttps, "DnsOverHttps", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -45,7 +45,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -369,7 +369,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa +@@ -365,7 +365,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 -@@ -793,7 +793,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, +@@ -789,7 +789,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, "KAnonymityServiceStorage", base::FEATURE_ENABLED_BY_DEFAULT); @@ -63,7 +63,7 @@ BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -806,7 +806,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -802,7 +802,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 285c57156957..6eed2dcd3664 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.h +++ b/www/chromium/files/patch-chrome_common_chrome__features.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.h.orig 2023-07-16 15:47:57 UTC +--- chrome/common/chrome_features.h.orig 2023-08-17 07:33:31 UTC +++ chrome/common/chrome_features.h -@@ -64,13 +64,13 @@ BASE_DECLARE_FEATURE(kAppShimNewCloseBehavior); +@@ -59,13 +59,13 @@ BASE_DECLARE_FEATURE(kAppShimNewCloseBehavior); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAsyncDns); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -16,7 +16,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -202,7 +202,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); +@@ -196,7 +196,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsWebBundles); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -25,7 +25,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kKeepForceInstalledPreinstalledApps); -@@ -465,7 +465,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); +@@ -459,7 +459,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kKAnonymityServiceStorage); @@ -34,7 +34,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor); COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel; -@@ -473,7 +473,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -467,7 +467,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index 7cdb479699ff..8ac841205df6 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,4 +1,4 @@ ---- chrome/common/chrome_paths.cc.orig 2023-04-28 17:01:32 UTC +--- chrome/common/chrome_paths.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/common/chrome_paths.cc @@ -48,14 +48,14 @@ @@ -27,7 +27,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -418,10 +418,12 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -419,10 +419,12 @@ bool PathProvider(int key, base::FilePath* result) { if (!base::PathExists(cur)) // We don't want to create this return false; break; @@ -41,7 +41,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -433,7 +435,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -434,7 +436,7 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(IS_CHROMEOS_ASH) || \ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) || \ @@ -50,7 +50,7 @@ case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) return false; -@@ -441,7 +443,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -442,7 +444,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -59,7 +59,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -485,7 +487,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -486,7 +488,7 @@ bool PathProvider(int key, base::FilePath* result) { break; #endif @@ -68,7 +68,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if BUILDFLAG(IS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -499,6 +501,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -500,6 +502,9 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath(FILE_PATH_LITERAL( "/etc/opt/chrome/native-messaging-hosts")); diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index ed185b31c6c6..3b668c16b62b 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/common/chrome_switches.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/common/chrome_switches.cc -@@ -862,14 +862,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -850,14 +850,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index 6caecd579442..9de3cf09f435 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 2023-07-16 15:47:57 UTC +--- chrome/common/pref_names.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/common/pref_names.cc -@@ -1193,7 +1193,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox +@@ -1207,7 +1207,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 kUsesSystemThemeDeprecated[] = "extensions.theme.use_system"; const char kSystemTheme[] = "extensions.theme.system_theme"; -@@ -1298,7 +1298,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1319,7 +1319,7 @@ const char kShowUpdatePromotionInfoBar[] = "browser.show_update_promotion_info_bar"; #endif @@ -18,7 +18,7 @@ // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -1811,7 +1811,7 @@ const char kDownloadDirUpgraded[] = "download.director +@@ -1837,7 +1837,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 -@@ -2259,7 +2259,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled +@@ -2285,7 +2285,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled // requests. const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -36,7 +36,7 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. const char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3272,7 +3272,7 @@ const char kFileOrDirectoryPickerWithoutGestureAllowed +@@ -3296,7 +3296,7 @@ const char kFileOrDirectoryPickerWithoutGestureAllowed const char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -45,7 +45,7 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. const char kAllowSystemNotifications[] = "system_notifications.allowed"; -@@ -3325,7 +3325,7 @@ const char kCACertificateManagementAllowed[] = +@@ -3349,7 +3349,7 @@ const char kCACertificateManagementAllowed[] = const char kChromeRootStoreEnabled[] = "chrome_root_store_enabled"; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -54,7 +54,7 @@ const char kEnforceLocalAnchorConstraintsEnabled[] = "enforce_local_anchor_constraints_enabled"; #endif -@@ -3642,7 +3642,7 @@ const char kThrottleNonVisibleCrossOriginIframesAllowe +@@ -3663,7 +3663,7 @@ const char kThrottleNonVisibleCrossOriginIframesAllowe const char kNewBaseUrlInheritanceBehaviorAllowed[] = "new_base_url_inheritance_behavior_allowed"; diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index 7b1fc63f8fe6..da1ce56589b8 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.h +++ b/www/chromium/files/patch-chrome_common_pref__names.h @@ -1,4 +1,4 @@ ---- chrome/common/pref_names.h.orig 2023-07-16 15:47:57 UTC +--- chrome/common/pref_names.h.orig 2023-08-17 07:33:31 UTC +++ chrome/common/pref_names.h @@ -378,7 +378,7 @@ extern const char kUseAshProxy[]; #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -9,7 +9,7 @@ // TODO(https://crbug.com/1317782): Remove in M110. extern const char kUsesSystemThemeDeprecated[]; extern const char kSystemTheme[]; -@@ -398,7 +398,7 @@ extern const char kDefaultBrowserSettingEnabled[]; +@@ -400,7 +400,7 @@ extern const char kDefaultBrowserSettingEnabled[]; #if BUILDFLAG(IS_MAC) extern const char kShowUpdatePromotionInfoBar[]; #endif @@ -18,7 +18,7 @@ extern const char kUseCustomChromeFrame[]; #endif extern const char kPartitionDefaultZoomLevel[]; -@@ -586,7 +586,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[ +@@ -589,7 +589,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) -@@ -709,7 +709,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps +@@ -712,7 +712,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 -@@ -836,7 +836,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] +@@ -837,7 +837,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) -@@ -1110,7 +1110,7 @@ extern const char kFileOrDirectoryPickerWithoutGesture +@@ -1112,7 +1112,7 @@ extern const char kFileOrDirectoryPickerWithoutGesture #endif extern const char kSandboxExternalProtocolBlocked[]; @@ -54,7 +54,7 @@ extern const char kAllowSystemNotifications[]; #endif -@@ -1136,7 +1136,7 @@ extern const char kCACertificateManagementAllowed[]; +@@ -1138,7 +1138,7 @@ extern const char kCACertificateManagementAllowed[]; extern const char kChromeRootStoreEnabled[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -63,7 +63,7 @@ // TODO(https://crbug.com/1406103): delete this after a few milestones. extern const char kEnforceLocalAnchorConstraintsEnabled[]; #endif -@@ -1287,7 +1287,7 @@ extern const char kDIPSTimerLastUpdate[]; +@@ -1289,7 +1289,7 @@ extern const char kDIPSTimerLastUpdate[]; extern const char kThrottleNonVisibleCrossOriginIframesAllowed[]; extern const char kNewBaseUrlInheritanceBehaviorAllowed[]; diff --git a/www/chromium/files/patch-chrome_common_url__constants.cc b/www/chromium/files/patch-chrome_common_url__constants.cc index 8a2eec776dc8..8c1309cb8c5e 100644 --- a/www/chromium/files/patch-chrome_common_url__constants.cc +++ b/www/chromium/files/patch-chrome_common_url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/url_constants.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/common/url_constants.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/common/url_constants.cc -@@ -534,7 +534,7 @@ const char kPhoneHubPermissionLearnMoreURL[] = +@@ -537,7 +537,7 @@ const char kPhoneHubPermissionLearnMoreURL[] = "https://support.google.com/chromebook/?p=multidevice"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_common_url__constants.h b/www/chromium/files/patch-chrome_common_url__constants.h index e81f9c632d91..8fa7453eeb16 100644 --- a/www/chromium/files/patch-chrome_common_url__constants.h +++ b/www/chromium/files/patch-chrome_common_url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/url_constants.h.orig 2023-07-16 15:47:57 UTC +--- chrome/common/url_constants.h.orig 2023-08-17 07:33:31 UTC +++ chrome/common/url_constants.h -@@ -512,7 +512,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; +@@ -516,7 +516,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; extern const char kPhoneHubPermissionLearnMoreURL[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc index 2f5a8371f969..54e4d6f50926 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/common/webui_url_constants.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/common/webui_url_constants.cc -@@ -514,18 +514,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os:// +@@ -485,18 +485,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os:// const char kOsUIVersionURL[] = "os://version"; #endif @@ -22,7 +22,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -@@ -540,14 +540,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr +@@ -511,14 +511,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[] = -@@ -564,7 +564,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro +@@ -535,7 +535,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"; -@@ -643,7 +643,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan +@@ -614,7 +614,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 -@@ -869,7 +869,7 @@ const char* const kChromeDebugURLs[] = { +@@ -845,7 +845,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 2ef4d429d7b4..4ea4e3dfab10 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.h +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.h.orig 2023-07-16 15:47:57 UTC +--- chrome/common/webui_url_constants.h.orig 2023-08-17 07:33:31 UTC +++ chrome/common/webui_url_constants.h -@@ -437,24 +437,24 @@ extern const char kOsUIShortcutCustomizationAppURL[]; +@@ -407,24 +407,24 @@ extern const char kOsUIShortcutCustomizationAppURL[]; extern const char kOsUIVersionURL[]; #endif @@ -29,7 +29,7 @@ extern const char kChromeUIWebAppSettingsURL[]; extern const char kChromeUIWebAppSettingsHost[]; #endif -@@ -469,14 +469,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; +@@ -439,7 +439,7 @@ extern const char kChromeUILinuxProxyConfigHost[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -38,15 +38,16 @@ extern const char kChromeUISandboxHost[]; #endif +@@ -451,7 +451,7 @@ extern const char kChromeUIWaffleHost[]; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIEnterpriseProfileWelcomeHost[]; -@@ -490,7 +490,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -465,7 +465,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif diff --git a/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc b/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc index 337fec372adc..9f22324c8362 100644 --- a/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc +++ b/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc @@ -1,6 +1,6 @@ ---- chrome/renderer/chrome_render_frame_observer.cc.orig 2023-05-31 08:12:17 UTC +--- chrome/renderer/chrome_render_frame_observer.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/renderer/chrome_render_frame_observer.cc -@@ -346,7 +346,7 @@ void ChromeRenderFrameObserver::OnDestruct() { +@@ -351,7 +351,7 @@ void ChromeRenderFrameObserver::OnDestruct() { void ChromeRenderFrameObserver::DraggableRegionsChanged() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index 5071fe1c218e..2debd65cb639 100644 --- a/www/chromium/files/patch-chrome_test_BUILD.gn +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2023-08-04 12:03:57 UTC +--- chrome/test/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ chrome/test/BUILD.gn -@@ -10597,7 +10597,7 @@ test("chrome_app_unittests") { +@@ -10600,7 +10600,7 @@ test("chrome_app_unittests") { "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", ] diff --git a/www/chromium/files/patch-chrome_test_chromedriver_capabilities.cc b/www/chromium/files/patch-chrome_test_chromedriver_capabilities.cc index e43785fe91a1..d528b4300d3f 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_capabilities.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_capabilities.cc @@ -1,4 +1,4 @@ ---- chrome/test/chromedriver/capabilities.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/test/chromedriver/capabilities.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/test/chromedriver/capabilities.cc @@ -355,7 +355,11 @@ Status ParseMobileEmulation(const base::Value& option, "'version' field of type string"); @@ -7,7 +7,7 @@ +#if defined(__clang__) && (__clang_major__ >= 15) brands.emplace_back(*brand, *version); +#else -+ brands.emplace_back(BrandVersion{*brand, *version}); ++ brands.emplace_back() = {*brand, *version}; +#endif } @@ -19,7 +19,7 @@ +#if defined(__clang__) && (__clang_major__ >= 15) full_version_list.emplace_back(*brand, *version); +#else -+ full_version_list.emplace_back(BrandVersion{*brand, *version}); ++ full_version_list.emplace_back() = {*brand, *version}; +#endif } diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc index de642082f665..a68c1a310e30 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/chrome_launcher.cc.orig 2023-07-16 15:47:57 UTC +--- chrome/test/chromedriver/chrome_launcher.cc.orig 2023-08-17 07:33:31 UTC +++ chrome/test/chromedriver/chrome_launcher.cc -@@ -66,6 +66,7 @@ +@@ -67,6 +67,7 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> diff --git a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc index 18f89586f6ba..a52f0205d817 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/personal_data_manager.cc.orig 2023-07-16 15:47:57 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2023-08-17 07:33:31 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -2311,7 +2311,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2418,7 +2418,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 9660b486aa5a..c42030522ea4 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2023-07-16 15:47:57 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2023-08-17 07:33:31 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -281,7 +281,7 @@ const base::FeatureParam<int> +@@ -301,7 +301,7 @@ BASE_FEATURE(kAutofillUseTwoDotsForLastFourDigits, 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_components__chromium__strings.grd b/www/chromium/files/patch-components_components__chromium__strings.grd index affeda3751bf..c44ef07feb3f 100644 --- a/www/chromium/files/patch-components_components__chromium__strings.grd +++ b/www/chromium/files/patch-components_components__chromium__strings.grd @@ -1,6 +1,6 @@ ---- components/components_chromium_strings.grd.orig 2023-02-08 09:03:45 UTC +--- components/components_chromium_strings.grd.orig 2023-08-17 07:33:31 UTC +++ components/components_chromium_strings.grd -@@ -220,7 +220,7 @@ +@@ -226,7 +226,7 @@ </message> </if> <!-- The ChromeOS version of this string is defined in //components/error_page_strings.grdp. --> diff --git a/www/chromium/files/patch-components_components__google__chrome__strings.grd b/www/chromium/files/patch-components_components__google__chrome__strings.grd index 53ff1e162e3d..8d2c8c0d55b4 100644 --- a/www/chromium/files/patch-components_components__google__chrome__strings.grd +++ b/www/chromium/files/patch-components_components__google__chrome__strings.grd @@ -1,6 +1,6 @@ ---- components/components_google_chrome_strings.grd.orig 2023-02-08 09:03:45 UTC +--- components/components_google_chrome_strings.grd.orig 2023-08-17 07:33:31 UTC +++ components/components_google_chrome_strings.grd -@@ -220,7 +220,7 @@ +@@ -226,7 +226,7 @@ </message> </if> <!-- The ChromeOS version of this string is defined in //components/error_page_strings.grdp. --> 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 index 692a21145196..776994b16213 100644 --- 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 @@ -1,11 +1,11 @@ ---- components/device_signals/core/common/signals_features.cc.orig 2022-11-30 08:12:58 UTC +--- components/device_signals/core/common/signals_features.cc.orig 2023-08-17 07:33:31 UTC +++ components/device_signals/core/common/signals_features.cc -@@ -19,7 +19,7 @@ const base::FeatureParam<bool> kDisableAntiVirus{&kNew - const base::FeatureParam<bool> kDisableHotfix{&kNewEvSignalsEnabled, - "DisableHotfix", false}; +@@ -46,7 +46,7 @@ bool IsNewFunctionEnabled(NewEvFunction new_ev_functio + } --#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) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + // Enables the triggering of device signals consent dialog when conditions met + // This feature also requires UnmanagedDeviceSignalsConsentFlowEnabled policy to + // be 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 index 7297e4463359..14669ecc9c48 100644 --- 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 @@ -1,11 +1,11 @@ ---- components/device_signals/core/common/signals_features.h.orig 2022-11-30 08:12:58 UTC +--- components/device_signals/core/common/signals_features.h.orig 2023-08-17 07:33:31 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; +@@ -28,7 +28,7 @@ enum class NewEvFunction { kFileSystemInfo, kSettings, + bool IsNewFunctionEnabled(NewEvFunction new_ev_function); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - BASE_DECLARE_FEATURE(kDeviceSignalsPromoAfterSigninIntercept); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + BASE_DECLARE_FEATURE(kDeviceSignalsConsentDialog); + // Returns true if device signals consent dialog has been enabled for diff --git a/www/chromium/files/patch-components_device__signals_test_signals__contract.cc b/www/chromium/files/patch-components_device__signals_test_signals__contract.cc index d84f5ffe5d37..4d8eb827bb91 100644 --- a/www/chromium/files/patch-components_device__signals_test_signals__contract.cc +++ b/www/chromium/files/patch-components_device__signals_test_signals__contract.cc @@ -1,6 +1,6 @@ ---- components/device_signals/test/signals_contract.cc.orig 2023-04-28 17:01:32 UTC +--- components/device_signals/test/signals_contract.cc.orig 2023-08-17 07:33:31 UTC +++ components/device_signals/test/signals_contract.cc -@@ -186,7 +186,7 @@ GetSignalsContract() { +@@ -187,7 +187,7 @@ GetSignalsContract() { base::BindRepeating(VerifyUnset, names::kCrowdStrike); #endif diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc index 81ae8eac72e6..89ce72f9a696 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 2023-07-16 15:47:57 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2023-08-17 07:33:31 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -40,7 +40,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; -@@ -1197,7 +1197,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf +@@ -1267,7 +1267,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 bb57c7c5d8a4..8d9289787f0e 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 2023-07-16 15:47:57 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2023-08-17 07:33:31 UTC +++ components/feature_engagement/public/feature_constants.cc -@@ -20,7 +20,7 @@ BASE_FEATURE(kUseClientConfigIPH, +@@ -21,7 +21,7 @@ BASE_FEATURE(kUseClientConfigIPH, BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ BASE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature, "IPH_AutofillFeedbackNewBadge", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -498,7 +498,8 @@ BASE_FEATURE(kIPHiOSDefaultBrowserVideoPromoTriggerFea +@@ -508,7 +508,8 @@ BASE_FEATURE(kIPHiOSPromoPostRestoreDefaultBrowserFeat #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 972cab291183..184e763ef8d4 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,6 +1,6 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2023-07-16 15:47:57 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2023-08-17 07:33:31 UTC +++ components/feature_engagement/public/feature_constants.h -@@ -22,7 +22,7 @@ BASE_DECLARE_FEATURE(kUseClientConfigIPH); +@@ -23,7 +23,7 @@ BASE_DECLARE_FEATURE(kUseClientConfigIPH); BASE_DECLARE_FEATURE(kIPHDummyFeature); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ BASE_DECLARE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature); BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature); BASE_DECLARE_FEATURE(kIPHCompanionSidePanelFeature); -@@ -202,7 +202,8 @@ BASE_DECLARE_FEATURE(kIPHiOSDefaultBrowserVideoPromoTr +@@ -206,7 +206,8 @@ BASE_DECLARE_FEATURE(kIPHiOSPromoPostRestoreDefaultBro #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 27057f7ce13a..0ff493fb6c83 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc @@ -1,7 +1,7 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2023-07-16 15:47:57 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2023-08-17 07:33:31 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -138,7 +138,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHiOSDefaultBrowserVideoPromoTriggerFeature, +@@ -139,7 +139,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHiOSPromoPostRestoreDefaultBrowserFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -9,7 +9,7 @@ &kIPHAutofillFeedbackNewBadgeFeature, &kIPHBatterySaverModeFeature, &kIPHCompanionSidePanelFeature, -@@ -179,7 +179,8 @@ const base::Feature* const kAllFeatures[] = { +@@ -182,7 +182,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 57016a992d40..001818769833 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_list.h.orig 2023-07-16 15:47:57 UTC +--- components/feature_engagement/public/feature_list.h.orig 2023-08-17 07:33:31 UTC +++ components/feature_engagement/public/feature_list.h -@@ -255,7 +255,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSDefaultBrowserVideoPromo +@@ -257,7 +257,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSPromoPostRestoreDefaultB #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ DEFINE_VARIATION_PARAM(kIPHAutofillFeedbackNewBadgeFeature, "IPH_AutofillFeedbackNewBadge"); DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode"); -@@ -319,7 +319,8 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, +@@ -325,7 +325,8 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,16 +19,16 @@ DEFINE_VARIATION_PARAM(kIPHAutofillExternalAccountProfileSuggestionFeature, "IPH_AutofillExternalAccountProfileSuggestion"); DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardSuggestionFeature, -@@ -453,7 +454,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHiOSHistoryOnOverflowMenuFeature), +@@ -465,7 +466,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHiOSShareToolbarItemFeature), + VARIATION_ENTRY(kIPHiOSPromoPostRestoreDefaultBrowserFeature), #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) VARIATION_ENTRY(kIPHAutofillFeedbackNewBadgeFeature), VARIATION_ENTRY(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHCompanionSidePanelFeature), -@@ -495,7 +496,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -509,7 +510,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_management__strings.grdp b/www/chromium/files/patch-components_management__strings.grdp new file mode 100644 index 000000000000..54fa142b4630 --- /dev/null +++ b/www/chromium/files/patch-components_management__strings.grdp @@ -0,0 +1,11 @@ +--- components/management_strings.grdp.orig 2023-08-17 07:33:31 UTC ++++ components/management_strings.grdp +@@ -321,7 +321,7 @@ + </if> + + <!-- Strings related to Chrome Enterprise Device Signals Sharing --> +- <if expr="is_win or is_linux or is_macosx"> ++ <if expr="is_win or is_posix or is_macosx"> + <message name="IDS_MANAGEMENT_DEVICE_SIGNALS_DISCLOSURE" desc="Disclosure message explaining that device signals can be shared."> + Information about your browser, OS, device, installed software, and files + </message> diff --git a/www/chromium/files/patch-components_os__crypt_sync_keyring__util__linux.cc b/www/chromium/files/patch-components_os__crypt_sync_keyring__util__linux.cc deleted file mode 100644 index f75edd93f370..000000000000 --- a/www/chromium/files/patch-components_os__crypt_sync_keyring__util__linux.cc +++ /dev/null @@ -1,26 +0,0 @@ ---- components/os_crypt/sync/keyring_util_linux.cc.orig 2023-04-28 17:01:32 UTC -+++ components/os_crypt/sync/keyring_util_linux.cc -@@ -65,15 +65,21 @@ const GnomeKeyringLoader::FunctionInfo GnomeKeyringLoa - - /* Load the library and initialize the function pointers. */ - bool GnomeKeyringLoader::LoadGnomeKeyring() { -+#if BUILDFLAG(IS_BSD) -+ const char* kGkr = "libgnome-keyring.so"; -+#else -+ const char* kGkr = "libgnome-keyring.so.0"; -+#endif -+ - if (keyring_loaded) - return true; - -- void* handle = dlopen("libgnome-keyring.so.0", RTLD_NOW | RTLD_GLOBAL); -+ void* handle = dlopen(kGkr, RTLD_NOW | RTLD_GLOBAL); - if (!handle) { - // We wanted to use GNOME Keyring, but we couldn't load it. Warn, because - // either the user asked for this, or we autodetected it incorrectly. (Or - // the system has broken libraries, which is also good to warn about.) -- LOG(WARNING) << "Could not load libgnome-keyring.so.0: " << dlerror(); -+ LOG(WARNING) << "Could not load " << kGkr << ": " << dlerror(); - return false; - } - diff --git a/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc b/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc index 319350bade40..eb15dc8102a9 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/login_database.cc.orig 2023-07-16 15:47:57 UTC +--- components/password_manager/core/browser/login_database.cc.orig 2023-08-17 07:33:31 UTC +++ components/password_manager/core/browser/login_database.cc -@@ -842,7 +842,7 @@ std::string GeneratePlaceholders(size_t count) { +@@ -843,7 +843,7 @@ std::string GeneratePlaceholders(size_t count) { return result; } @@ -9,7 +9,7 @@ // Fills |form| with necessary data required to be removed from the database // and returns it. PasswordForm GetFormForRemoval(sql::Statement& statement) { -@@ -859,7 +859,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme +@@ -860,7 +860,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme // Whether we should try to return the decryptable passwords while the // encryption service fails for some passwords. bool ShouldReturnPartialPasswords() { @@ -18,7 +18,7 @@ return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords); #else return false; -@@ -1716,7 +1716,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { +@@ -1713,7 +1713,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { } DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() { 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 514eedd50d9d..64380ab3716b 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 2023-04-28 17:01:32 UTC +--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2023-08-17 07:33:31 UTC +++ components/password_manager/core/browser/sync/password_sync_bridge.cc -@@ -186,7 +186,7 @@ bool IsCredentialPhished(const sync_pb::PasswordSpecif +@@ -188,7 +188,7 @@ bool IsCredentialPhished(const sync_pb::PasswordSpecif // merge. bool ShouldRecoverPasswordsDuringMerge() { // Delete the local undecryptable copy when this is MacOS or Linux only. @@ -9,7 +9,7 @@ return true; #else return false; -@@ -194,7 +194,7 @@ bool ShouldRecoverPasswordsDuringMerge() { +@@ -196,7 +196,7 @@ bool ShouldRecoverPasswordsDuringMerge() { } bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() { diff --git a/www/chromium/files/patch-components_password__manager_core_browser_ui_passwords__grouper.cc b/www/chromium/files/patch-components_password__manager_core_browser_ui_passwords__grouper.cc new file mode 100644 index 000000000000..21710d467d67 --- /dev/null +++ b/www/chromium/files/patch-components_password__manager_core_browser_ui_passwords__grouper.cc @@ -0,0 +1,21 @@ +--- components/password_manager/core/browser/ui/passwords_grouper.cc.orig 2023-08-17 12:40:56 UTC ++++ components/password_manager/core/browser/ui/passwords_grouper.cc +@@ -399,6 +399,7 @@ absl::optional<PasskeyCredential> PasswordsGrouper::Ge + if (group_id_iterator == map_signon_realm_to_group_id_.end()) { + return absl::nullopt; + } ++#if BUILDFLAG(IS_OPENBSD) || (BUILDFLAG(IS_FREEBSD) && (_LIBCPP_VERSION > 15000)) + // Find the passkey in the group. + const std::vector<PasskeyCredential>& passkeys = + map_group_id_to_credentials_[group_id_iterator->second].passkeys; +@@ -410,6 +411,10 @@ absl::optional<PasskeyCredential> PasswordsGrouper::Ge + return absl::nullopt; + } + return *passkey_it; ++#else ++ LOG(ERROR) << "Unable to lookup in password group"; ++ return absl::nullopt; ++#endif + } + + void PasswordsGrouper::ClearCache() { 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 ca57ee797749..57c8095ceb6a 100644 --- a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc +++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc @@ -1,4 +1,4 @@ ---- components/password_manager/core/common/password_manager_features.cc.orig 2023-07-16 15:47:57 UTC +--- components/password_manager/core/common/password_manager_features.cc.orig 2023-08-17 07:33:31 UTC +++ components/password_manager/core/common/password_manager_features.cc @@ -96,7 +96,7 @@ BASE_FEATURE(kPasswordManagerLogToTerminal, "PasswordManagerLogToTerminal", @@ -9,9 +9,9 @@ // When enabled, initial sync will be forced during startup if the password // store has encryption service failures. BASE_FEATURE(kForceInitialSyncWhenDecryptionFails, -@@ -216,7 +216,7 @@ BASE_FEATURE(kPasswordStrengthIndicator, - "PasswordStrengthIndicator", +@@ -211,7 +211,7 @@ BASE_FEATURE(kRevampedPasswordManagementBubble, base::FEATURE_DISABLED_BY_DEFAULT); + #endif -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h index f38b5204ec7c..3cc2ce3765d6 100644 --- a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h +++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h @@ -1,4 +1,4 @@ ---- components/password_manager/core/common/password_manager_features.h.orig 2023-05-31 08:12:17 UTC +--- components/password_manager/core/common/password_manager_features.h.orig 2023-08-17 07:33:31 UTC +++ components/password_manager/core/common/password_manager_features.h @@ -44,7 +44,7 @@ BASE_DECLARE_FEATURE(kFillingAcrossAffiliatedWebsites) BASE_DECLARE_FEATURE(kFillingAcrossGroupedSites); @@ -9,7 +9,7 @@ BASE_DECLARE_FEATURE(kForceInitialSyncWhenDecryptionFails); #endif BASE_DECLARE_FEATURE(kInferConfirmationPasswordField); -@@ -74,7 +74,7 @@ BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid); +@@ -73,7 +73,7 @@ BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid); #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) // Desktop BASE_DECLARE_FEATURE(kRevampedPasswordManagementBubble); #endif diff --git a/www/chromium/files/patch-components_power__metrics_BUILD.gn b/www/chromium/files/patch-components_power__metrics_BUILD.gn index eafab62a6e56..ea57894568d4 100644 --- a/www/chromium/files/patch-components_power__metrics_BUILD.gn +++ b/www/chromium/files/patch-components_power__metrics_BUILD.gn @@ -1,11 +1,11 @@ ---- components/power_metrics/BUILD.gn.orig 2023-07-16 15:47:57 UTC +--- components/power_metrics/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ components/power_metrics/BUILD.gn @@ -42,7 +42,7 @@ static_library("power_metrics") { ldflags = [ "/DELAYLOAD:setupapi.dll" ] } -- if (is_linux) { -+ if (is_linux && !is_bsd) { +- if (is_linux || is_chromeos) { ++ if ((is_linux && !is_bsd) || is_chromeos) { sources += [ "energy_metrics_provider_linux.cc", "energy_metrics_provider_linux.h", diff --git a/www/chromium/files/patch-components_power__metrics_energy__metrics__provider.cc b/www/chromium/files/patch-components_power__metrics_energy__metrics__provider.cc index 091b2fe7321b..65fa8d60dd78 100644 --- a/www/chromium/files/patch-components_power__metrics_energy__metrics__provider.cc +++ b/www/chromium/files/patch-components_power__metrics_energy__metrics__provider.cc @@ -1,8 +1,8 @@ ---- components/power_metrics/energy_metrics_provider.cc.orig 2023-07-16 15:47:57 UTC +--- components/power_metrics/energy_metrics_provider.cc.orig 2023-08-17 07:33:31 UTC +++ components/power_metrics/energy_metrics_provider.cc @@ -9,6 +9,8 @@ #include "components/power_metrics/energy_metrics_provider_win.h" - #elif BUILDFLAG(IS_LINUX) + #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #include "components/power_metrics/energy_metrics_provider_linux.h" +#elif BUILDFLAG(IS_BSD) +#include "base/notreached.h" @@ -11,7 +11,7 @@ namespace power_metrics { @@ -22,6 +24,9 @@ std::unique_ptr<EnergyMetricsProvider> EnergyMetricsPr return EnergyMetricsProviderWin::Create(); - #elif BUILDFLAG(IS_LINUX) + #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) return EnergyMetricsProviderLinux::Create(); +#elif BUILDFLAG(IS_BSD) + NOTIMPLEMENTED(); 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 dc962f939730..0ec0e3f85d5a 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,4 +1,4 @@ ---- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2023-04-05 11:05:06 UTC +--- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2023-08-17 07:33:31 UTC +++ components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc @@ -53,6 +53,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi } @@ -8,7 +8,7 @@ auto* instance = sandbox::policy::SandboxLinux::GetInstance(); std::vector<BrokerFilePermission> permissions{ -@@ -76,6 +77,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi +@@ -80,6 +81,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi sandbox::syscall_broker::COMMAND_OPEN}), permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), options); instance->EngageNamespaceSandboxIfPossible(); diff --git a/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc b/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc index 9bf6972e15a6..fd556febde54 100644 --- a/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc +++ b/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc @@ -1,6 +1,6 @@ ---- components/supervised_user/core/browser/supervised_user_service.cc.orig 2023-07-16 15:47:57 UTC +--- components/supervised_user/core/browser/supervised_user_service.cc.orig 2023-08-17 07:33:31 UTC +++ components/supervised_user/core/browser/supervised_user_service.cc -@@ -69,7 +69,7 @@ void SupervisedUserService::Init() { +@@ -70,7 +70,7 @@ void SupervisedUserService::Init() { supervised_user::FirstTimeInterstitialBannerState banner_state = static_cast<supervised_user::FirstTimeInterstitialBannerState>( user_prefs_->GetInteger(prefs::kFirstTimeInterstitialBannerState)); diff --git a/www/chromium/files/patch-components_translate_core_browser_translate__ui__languages__manager.h b/www/chromium/files/patch-components_translate_core_browser_translate__ui__languages__manager.h deleted file mode 100644 index f6fae38e980b..000000000000 --- a/www/chromium/files/patch-components_translate_core_browser_translate__ui__languages__manager.h +++ /dev/null @@ -1,10 +0,0 @@ ---- components/translate/core/browser/translate_ui_languages_manager.h.orig 2023-04-28 17:01:32 UTC -+++ components/translate/core/browser/translate_ui_languages_manager.h -@@ -8,6 +8,7 @@ - #include <stddef.h> - - #include <string> -+#include <vector> - - #include "base/memory/weak_ptr.h" - #include "third_party/icu/source/i18n/unicode/coll.h" diff --git a/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc b/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc index 7442203355b9..aa5e6a1f43fa 100644 --- a/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc +++ b/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc @@ -1,6 +1,6 @@ ---- components/user_education/views/help_bubble_view.cc.orig 2023-07-16 15:47:57 UTC +--- components/user_education/views/help_bubble_view.cc.orig 2023-08-17 07:33:31 UTC +++ components/user_education/views/help_bubble_view.cc -@@ -766,7 +766,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { +@@ -947,7 +947,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params, views::Widget* widget) const { BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget); diff --git a/www/chromium/files/patch-components_variations_service_google__groups__updater__service.cc b/www/chromium/files/patch-components_variations_service_google__groups__updater__service.cc new file mode 100644 index 000000000000..b31a4759aac7 --- /dev/null +++ b/www/chromium/files/patch-components_variations_service_google__groups__updater__service.cc @@ -0,0 +1,11 @@ +--- components/variations/service/google_groups_updater_service.cc.orig 2023-08-17 07:33:31 UTC ++++ components/variations/service/google_groups_updater_service.cc +@@ -29,7 +29,7 @@ const char kDogfoodGroupsSyncPrefGaiaIdKey[] = "gaia_i + // information from per-profile data to local-state. + BASE_FEATURE(kVariationsGoogleGroupFiltering, + "VariationsGoogleGroupFiltering", +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + // TODO(b/286365351): launch on Android, iOS and ChromeOS. diff --git a/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc b/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc deleted file mode 100644 index bc6c3e67b2e0..000000000000 --- a/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/viz/common/gpu/dawn_context_provider.cc.orig 2023-07-16 15:47:57 UTC -+++ components/viz/common/gpu/dawn_context_provider.cc -@@ -38,7 +38,7 @@ void LogFatal(WGPUDeviceLostReason reason, - wgpu::BackendType GetDefaultBackendType() { - #if BUILDFLAG(IS_WIN) - return wgpu::BackendType::D3D11; --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - return wgpu::BackendType::Vulkan; - #elif BUILDFLAG(IS_MAC) - return wgpu::BackendType::Metal; diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc index 301902404409..bb09581a4878 100644 --- a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc +++ b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2023-07-16 15:47:57 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2023-08-17 07:33:31 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1433,7 +1433,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1444,7 +1444,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetDeviceQueue() ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, ycbcr_info); diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc new file mode 100644 index 000000000000..fab89193a148 --- /dev/null +++ b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc @@ -0,0 +1,15 @@ +--- components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc.orig 2023-08-17 07:33:31 UTC ++++ components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc +@@ -1496,7 +1496,12 @@ void SkiaOutputSurfaceImplOnGpu::CopyOutputNV12( + + // Issue readbacks from the surfaces: + for (size_t i = 0; i < CopyOutputResult::kNV12MaxPlanes; ++i) { ++#if defined(__clang__) && (__clang_major__ >= 16) + SkISize size(plane_surfaces[i]->width(), plane_surfaces[i]->height()); ++#else ++ SkISize s = { plane_surfaces[i]->width(), plane_surfaces[i]->height() }; ++ SkISize size(s); ++#endif + SkImageInfo dst_info = SkImageInfo::Make( + size, (i == 0) ? kAlpha_8_SkColorType : kR8G8_unorm_SkColorType, + kUnpremul_SkAlphaType); 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 ace40611e692..4a4b25d75024 100644 --- a/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc +++ b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display/skia_renderer.cc.orig 2023-07-16 15:47:57 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2023-08-17 07:33:31 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1174,7 +1174,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1216,7 +1216,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_webauthn_core_browser_passkey__sync__bridge.cc b/www/chromium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc new file mode 100644 index 000000000000..3706546c7e46 --- /dev/null +++ b/www/chromium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc @@ -0,0 +1,38 @@ +--- components/webauthn/core/browser/passkey_sync_bridge.cc.orig 2023-08-17 12:40:56 UTC ++++ components/webauthn/core/browser/passkey_sync_bridge.cc +@@ -267,6 +267,7 @@ PasskeySyncBridge::GetAllPasskeys() const { + + bool PasskeySyncBridge::DeletePasskey(const std::string& credential_id) { + // Find the credential with the given |credential_id|. ++#if BUILDFLAG(IS_OPENBSD) || (BUILDFLAG(IS_FREEBSD) && (_LIBCPP_VERSION > 15000)) + const auto passkey_it = + std::ranges::find_if(data_, [&credential_id](const auto& passkey) { + return passkey.second.credential_id() == credential_id; +@@ -313,11 +314,16 @@ bool PasskeySyncBridge::DeletePasskey(const std::strin + weak_ptr_factory_.GetWeakPtr())); + NotifyPasskeysChanged(); + return true; ++#else ++ LOG(ERROR) << "Unable to delete passkey"; ++ return false; ++#endif + } + + bool PasskeySyncBridge::UpdatePasskey(const std::string& credential_id, + PasskeyChange change) { + // Find the credential with the given |credential_id|. ++#if BUILDFLAG(IS_OPENBSD) || (BUILDFLAG(IS_FREEBSD) && (_LIBCPP_VERSION > 15000)) + const auto passkey_it = + std::ranges::find_if(data_, [&credential_id](const auto& passkey) { + return passkey.second.credential_id() == credential_id; +@@ -341,6 +347,10 @@ bool PasskeySyncBridge::UpdatePasskey(const std::strin + weak_ptr_factory_.GetWeakPtr())); + NotifyPasskeysChanged(); + return true; ++#else ++ LOG(ERROR) << "Unable to update passkey"; ++ return false; ++#endif + } + + std::string PasskeySyncBridge::AddNewPasskeyForTesting( 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 ffcbe837b053..fab7a1ba9424 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 2023-07-16 15:47:57 UTC +--- content/app/content_main_runner_impl.cc.orig 2023-08-17 07:33:31 UTC +++ content/app/content_main_runner_impl.cc -@@ -144,13 +144,13 @@ +@@ -143,13 +143,13 @@ #include "content/browser/posix_file_descriptor_info_impl.h" #include "content/public/common/content_descriptors.h" @@ -16,8 +16,8 @@ #include "base/files/file_path_watcher_inotify.h" #include "base/native_library.h" #include "base/rand_util.h" -@@ -193,6 +193,10 @@ - #include "chromeos/startup/startup_switches.h" +@@ -187,6 +187,10 @@ + #include "media/base/media_switches.h" #endif +#if BUILDFLAG(IS_BSD) @@ -27,7 +27,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -394,7 +398,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -372,7 +376,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE) @@ -36,7 +36,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -432,7 +436,10 @@ void PreloadLibraryCdms() { +@@ -410,7 +414,10 @@ void PreloadLibraryCdms() { void PreSandboxInit() { // Ensure the /dev/urandom is opened. @@ -47,7 +47,7 @@ // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/ // files. -@@ -443,9 +450,16 @@ void PreSandboxInit() { +@@ -421,9 +428,16 @@ void PreSandboxInit() { // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md CRYPTO_pre_sandbox_init(); @@ -64,7 +64,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -830,11 +844,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -808,11 +822,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -78,7 +78,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1029,8 +1042,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1007,8 +1020,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } @@ -99,7 +99,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1098,7 +1123,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1076,7 +1101,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { ->ReconfigureAfterFeatureListInit(process_type); } @@ -108,7 +108,7 @@ // If dynamic Mojo Core is being used, ensure that it's loaded very early in // the child/zygote process, before any sandbox is initialized. The library // is not fully initialized with IPC support until a ChildProcess is later -@@ -1133,6 +1158,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1111,6 +1136,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 99f8da8b1250..3cdbc60a5329 100644 --- a/www/chromium/files/patch-content_browser_BUILD.gn +++ b/www/chromium/files/patch-content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- content/browser/BUILD.gn.orig 2023-07-16 15:47:57 UTC +--- content/browser/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ content/browser/BUILD.gn -@@ -2414,6 +2414,13 @@ source_set("browser") { +@@ -2423,6 +2423,13 @@ source_set("browser") { deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] } diff --git a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc index 258441864f3a..dd74604dd8af 100644 --- a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc +++ b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc @@ -1,6 +1,6 @@ ---- content/browser/compositor/viz_process_transport_factory.cc.orig 2023-03-09 06:31:50 UTC +--- content/browser/compositor/viz_process_transport_factory.cc.orig 2023-08-17 07:33:31 UTC +++ content/browser/compositor/viz_process_transport_factory.cc -@@ -116,7 +116,7 @@ class HostDisplayClient : public viz::HostDisplayClien +@@ -110,7 +110,7 @@ class HostDisplayClient : public viz::HostDisplayClien // viz::HostDisplayClient: // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc index 7822589ed17d..58f288695746 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2023-07-16 15:47:57 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2023-08-17 07:33:31 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -252,6 +252,7 @@ static const char* const kSwitchNames[] = { +@@ -253,6 +253,7 @@ static const char* const kSwitchNames[] = { switches::kEnableBackgroundThreadPool, switches::kEnableGpuRasterization, switches::kEnableLogging, @@ -8,7 +8,7 @@ switches::kDoubleBufferCompositing, switches::kHeadless, switches::kLoggingLevel, -@@ -284,7 +285,7 @@ static const char* const kSwitchNames[] = { +@@ -286,7 +287,7 @@ static const char* const kSwitchNames[] = { switches::kOzoneDumpFile, switches::kDisableBufferBWCompression, #endif diff --git a/www/chromium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc b/www/chromium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc index 3646f04d18b3..6462d17fa9a8 100644 --- a/www/chromium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc +++ b/www/chromium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/media/media_keys_listener_manager_impl.cc.orig 2022-04-21 18:48:31 UTC +--- content/browser/media/media_keys_listener_manager_impl.cc.orig 2023-08-17 07:33:31 UTC +++ content/browser/media/media_keys_listener_manager_impl.cc -@@ -233,7 +233,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe +@@ -234,7 +234,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ diff --git a/www/chromium/files/patch-content_browser_network__service__instance__impl.cc b/www/chromium/files/patch-content_browser_network__service__instance__impl.cc index 2f2234d56101..378e5af763dd 100644 --- a/www/chromium/files/patch-content_browser_network__service__instance__impl.cc +++ b/www/chromium/files/patch-content_browser_network__service__instance__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/network_service_instance_impl.cc.orig 2023-07-16 15:47:57 UTC +--- content/browser/network_service_instance_impl.cc.orig 2023-08-17 07:33:31 UTC +++ content/browser/network_service_instance_impl.cc -@@ -78,7 +78,7 @@ +@@ -80,7 +80,7 @@ #include "content/browser/network/network_service_process_tracker_win.h" #endif @@ -9,12 +9,21 @@ #include "content/browser/system_dns_resolution/system_dns_resolver.h" #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h" #endif -@@ -458,7 +458,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS +@@ -419,7 +419,7 @@ void CreateInProcessNetworkService( + #endif + } + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Runs a self-owned SystemDnsResolverMojoImpl. This is meant to run on a + // high-priority thread pool. + void RunSystemDnsResolverOnThreadPool( +@@ -486,7 +486,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS } #endif // BUILDFLAG(IS_POSIX) --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (GetContentClient() ->browser() ->ShouldRunOutOfProcessSystemDnsResolution() && diff --git a/www/chromium/files/patch-content_browser_renderer__host_back__forward__cache__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_back__forward__cache__impl.cc index c2237e819833..4b914585c2ae 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_back__forward__cache__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_back__forward__cache__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/back_forward_cache_impl.cc.orig 2023-05-31 08:12:17 UTC +--- content/browser/renderer_host/back_forward_cache_impl.cc.orig 2023-08-17 07:33:31 UTC +++ content/browser/renderer_host/back_forward_cache_impl.cc -@@ -58,7 +58,7 @@ BASE_FEATURE(kBackForwardCacheSize, +@@ -65,7 +65,7 @@ BASE_FEATURE(kBackForwardCacheSize, // Sets the BackForwardCache size for desktop. // See crbug.com/1291435. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ 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 387395deef82..f8cc363e1ae6 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-07-16 15:47:57 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-08-17 07:33:31 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -219,7 +219,7 @@ +@@ -220,7 +220,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -1217,7 +1217,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1218,7 +1218,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; -@@ -1309,7 +1309,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1351,7 +1351,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; -@@ -1398,7 +1398,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1440,7 +1440,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public std::unique_ptr<service_manager::BinderRegistry> binders_; mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; @@ -36,7 +36,7 @@ mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory> video_encode_accelerator_factory_remote_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -3461,6 +3461,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3555,6 +3555,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h index ed5a6502c4e0..c0fff7f0144b 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2023-07-16 15:47:57 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2023-08-17 07:33:31 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -502,7 +502,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -537,7 +537,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index f632e9ad260d..2b01d29cf478 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 2023-07-16 15:47:57 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-08-17 07:33:31 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -121,7 +121,7 @@ +@@ -120,7 +120,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" -@@ -454,7 +454,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -453,7 +453,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); @@ -18,7 +18,7 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1634,7 +1634,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1633,7 +1633,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) { -@@ -2466,7 +2466,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2468,7 +2468,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2642,7 +2642,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2644,7 +2644,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc index 4a4703850302..2c45b03fb15d 100644 --- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc +++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2023-01-11 09:17:16 UTC +--- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2023-08-17 07:33:31 UTC +++ content/browser/scheduler/responsiveness/jank_monitor_impl.cc -@@ -334,7 +334,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask +@@ -340,7 +340,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask // in context menus, among others). Simply ignore the mismatches for now. // See https://crbug.com/929813 for the details of why the mismatch // happens. diff --git a/www/chromium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc b/www/chromium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc index 6a9baa628bfd..065b2a93aa6b 100644 --- a/www/chromium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc +++ b/www/chromium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc @@ -1,14 +1,15 @@ ---- content/browser/service_worker/service_worker_context_wrapper.cc.orig 2023-07-16 15:47:57 UTC +--- content/browser/service_worker/service_worker_context_wrapper.cc.orig 2023-08-17 07:33:31 UTC +++ content/browser/service_worker/service_worker_context_wrapper.cc -@@ -1396,9 +1396,11 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingW - auto [document_url, key, callback] = std::move(*request); +@@ -1393,7 +1393,12 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingW + return; + } - DCHECK(document_url.is_valid()); +#if defined(__clang__) && (__clang_major__ >= 16) - TRACE_EVENT1("ServiceWorker", - "ServiceWorkerContextWrapper::MaybeProcessPendingWarmUpRequest", - "document_url", document_url.spec()); + auto [document_url, key, callback] = std::move(*request); ++#else ++ auto [d_u, key, callback] = std::move(*request); ++ auto document_url = d_u; +#endif - context_core_->registry()->FindRegistrationForClientUrl( - ServiceWorkerRegistry::Purpose::kNotForNavigation, + DCHECK(document_url.is_valid()); + TRACE_EVENT1("ServiceWorker", 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 bdf2d2457689..d5f2bb71effa 100644 --- a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc +++ b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc @@ -1,4 +1,4 @@ ---- content/browser/web_contents/web_contents_view_aura.cc.orig 2023-03-09 06:31:50 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2023-08-17 07:33:31 UTC +++ content/browser/web_contents/web_contents_view_aura.cc @@ -178,7 +178,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr<aura::Window> window_; @@ -18,7 +18,7 @@ // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over // a shortcut so we add it first. -@@ -1371,7 +1371,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1372,7 +1372,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_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index 845dbbb84b14..510264f25b01 100644 --- a/www/chromium/files/patch-content_common_BUILD.gn +++ b/www/chromium/files/patch-content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/common/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- content/common/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ content/common/BUILD.gn -@@ -432,6 +432,9 @@ if (is_linux || is_chromeos) { +@@ -434,6 +434,9 @@ if (is_linux || is_chromeos) { public = [ "set_process_title_linux.h" ] sources = [ "set_process_title_linux.cc" ] deps = [ "//base" ] @@ -10,7 +10,7 @@ } } -@@ -477,7 +480,7 @@ mojom("mojo_bindings") { +@@ -479,7 +482,7 @@ mojom("mojo_bindings") { if (enable_ipc_logging) { enabled_features += [ "ipc_logging" ] } diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index 1ec4af172700..3638f797be74 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 2023-05-31 08:12:17 UTC +--- content/gpu/gpu_main.cc.orig 2023-08-17 07:33:31 UTC +++ content/gpu/gpu_main.cc @@ -90,7 +90,7 @@ #include "sandbox/win/src/sandbox.h" @@ -18,7 +18,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -175,7 +175,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -177,7 +177,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { @@ -27,7 +27,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif BUILDFLAG(IS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -285,7 +285,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -287,7 +287,7 @@ int GpuMain(MainFunctionParams parameters) { std::make_unique<base::SingleThreadTaskExecutor>( gpu_preferences.message_pump_type); } @@ -36,7 +36,7 @@ #error "Unsupported Linux platform." #elif BUILDFLAG(IS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -420,7 +420,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -422,7 +422,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { @@ -45,3 +45,12 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { +@@ -462,7 +462,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo + sandbox_options.accelerated_video_encode_enabled = + !gpu_prefs.disable_accelerated_video_encode; + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Video decoding of many video streams can use thousands of FDs as well as + // Exo clients like Lacros. + // See https://crbug.com/1417237 diff --git a/www/chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc b/www/chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc index fed77fb67a73..3ec8cccf14fd 100644 --- a/www/chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc +++ b/www/chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc @@ -1,4 +1,4 @@ ---- content/ppapi_plugin/ppapi_plugin_main.cc.orig 2023-04-28 17:01:32 UTC +--- content/ppapi_plugin/ppapi_plugin_main.cc.orig 2023-08-17 07:33:31 UTC +++ content/ppapi_plugin/ppapi_plugin_main.cc @@ -54,6 +54,11 @@ #include "gin/v8_initializer.h" @@ -12,7 +12,7 @@ #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) #include <stdlib.h> #endif -@@ -148,7 +153,7 @@ int PpapiPluginMain(MainFunctionParams parameters) { +@@ -150,7 +155,7 @@ int PpapiPluginMain(MainFunctionParams parameters) { gin::V8Initializer::LoadV8Snapshot(); #endif diff --git a/www/chromium/files/patch-content_public_browser_web__ui__browser__interface__broker__registry.h b/www/chromium/files/patch-content_public_browser_web__ui__browser__interface__broker__registry.h new file mode 100644 index 000000000000..b3a3ed2eba35 --- /dev/null +++ b/www/chromium/files/patch-content_public_browser_web__ui__browser__interface__broker__registry.h @@ -0,0 +1,16 @@ +--- content/public/browser/web_ui_browser_interface_broker_registry.h.orig 2023-08-17 07:33:31 UTC ++++ content/public/browser/web_ui_browser_interface_broker_registry.h +@@ -127,10 +127,10 @@ class CONTENT_EXPORT WebUIBrowserInterfaceBrokerRegist + // + // TODO(crbug.com/1407936): Point to WebUIJsBridge documentation. + template <typename ControllerType> +- JsBridgeTraits<ControllerType>::BinderInitializer& ForWebUIWithJsBridge() { ++ typename JsBridgeTraits<ControllerType>::BinderInitializer& ForWebUIWithJsBridge() { + using Traits = JsBridgeTraits<ControllerType>; +- using Interface = Traits::Interface; +- using JsBridgeBinderInitializer = Traits::BinderInitializer; ++ using Interface = typename Traits::Interface; ++ using JsBridgeBinderInitializer = typename Traits::BinderInitializer; + + // WebUIController::GetType() requires an instantiated WebUIController + // (because it's a virtual method and can't be static). Here we only have 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 f160d2391ba2..b7ad6cde62a2 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 2023-07-16 15:47:57 UTC +--- content/public/common/content_features.cc.orig 2023-08-17 07:33:31 UTC +++ content/public/common/content_features.cc @@ -52,7 +52,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, "AudioServiceOutOfProcess", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -539,7 +539,7 @@ BASE_FEATURE(kNetworkQualityEstimatorWebHoldback, +@@ -534,7 +534,7 @@ BASE_FEATURE(kNetworkQualityEstimatorWebHoldback, // (activated by kUserAgentClientHint) BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT); @@ -27,7 +27,7 @@ // Supports proxying thread type changes of renderer processes to browser // process and having browser process handle adjusting thread properties (nice // value, c-group, latency sensitivity...) for renderers which have sandbox -@@ -1420,7 +1420,7 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1406,7 +1406,7 @@ BASE_FEATURE(kWebAssemblyTiering, BASE_FEATURE(kWebAssemblyTrapHandler, "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -36,7 +36,7 @@ defined(ARCH_CPU_X86_64)) || \ (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -1483,7 +1483,11 @@ BASE_FEATURE(kWebUICodeCache, +@@ -1469,7 +1469,11 @@ BASE_FEATURE(kWebUICodeCache, // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb diff --git a/www/chromium/files/patch-content_public_common_content__features.h b/www/chromium/files/patch-content_public_common_content__features.h index 5205d3485b38..aecd2d7a5206 100644 --- a/www/chromium/files/patch-content_public_common_content__features.h +++ b/www/chromium/files/patch-content_public_common_content__features.h @@ -1,6 +1,6 @@ ---- content/public/common/content_features.h.orig 2023-07-16 15:47:57 UTC +--- content/public/common/content_features.h.orig 2023-08-17 07:33:31 UTC +++ content/public/common/content_features.h -@@ -115,7 +115,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> +@@ -114,7 +114,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> kFledgeLimitNumAuctionsParam; CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollOffsets); CONTENT_EXPORT BASE_DECLARE_FEATURE(kGreaseUACH); diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc index 90bbbca0b8a4..fe3e1edf1a4d 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.cc +++ b/www/chromium/files/patch-content_public_common_content__switches.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.cc.orig 2023-07-16 15:47:57 UTC +--- content/public/common/content_switches.cc.orig 2023-08-17 07:33:31 UTC +++ content/public/common/content_switches.cc -@@ -367,6 +367,8 @@ const char kEnableIsolatedWebAppsInRenderer[] = +@@ -372,6 +372,8 @@ const char kEnableIsolatedWebAppsInRenderer[] = // builds. const char kEnableLogging[] = "enable-logging"; @@ -9,7 +9,7 @@ // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables // triggering of change attribute of the NetInfo API when there is a change in // the connection type. -@@ -993,7 +995,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -1001,7 +1003,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 eb23ff5d2db1..febdc3266407 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.h.orig 2023-07-16 15:47:57 UTC +--- content/public/common/content_switches.h.orig 2023-08-17 07:33:31 UTC +++ content/public/common/content_switches.h -@@ -116,6 +116,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe +@@ -118,6 +118,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[]; CONTENT_EXPORT extern const char kEnableLCDText[]; CONTENT_EXPORT extern const char kEnableLogging[]; @@ -8,7 +8,7 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -265,7 +266,7 @@ CONTENT_EXPORT extern const char kUserLevelMemoryPress +@@ -268,7 +269,7 @@ CONTENT_EXPORT extern const char kUserLevelMemoryPress // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-content_renderer_render__process__impl.cc b/www/chromium/files/patch-content_renderer_render__process__impl.cc index a2f047431f03..33bb7c1c0686 100644 --- a/www/chromium/files/patch-content_renderer_render__process__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__process__impl.cc @@ -1,4 +1,4 @@ ---- content/renderer/render_process_impl.cc.orig 2023-05-31 08:12:17 UTC +--- content/renderer/render_process_impl.cc.orig 2023-08-17 07:33:31 UTC +++ content/renderer/render_process_impl.cc @@ -45,7 +45,7 @@ #if BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ #include "v8/include/v8-wasm-trap-handler-posix.h" #endif -@@ -221,7 +221,7 @@ RenderProcessImpl::RenderProcessImpl() +@@ -211,7 +211,7 @@ RenderProcessImpl::RenderProcessImpl() v8::V8::SetFlagsFromString(kSABPerContextFlag, sizeof(kSABPerContextFlag)); } 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 ed3dd364e830..5da39de5fdd5 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_thread_impl.cc.orig 2023-07-16 15:47:57 UTC +--- content/renderer/render_thread_impl.cc.orig 2023-08-17 07:33:31 UTC +++ content/renderer/render_thread_impl.cc -@@ -204,6 +204,8 @@ +@@ -203,6 +203,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -1070,7 +1072,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1058,7 +1060,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: kGpuStreamPriorityMedia); const bool enable_video_decode_accelerator = @@ -18,7 +18,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && #endif // BUILDFLAG(IS_LINUX) !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1079,7 +1081,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1067,7 +1069,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: gpu::kGpuFeatureStatusEnabled); const bool enable_video_encode_accelerator = @@ -27,7 +27,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) && -@@ -1868,7 +1870,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create +@@ -1844,7 +1846,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create bool enable_video_encode_accelerator) { mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider> vea_provider; diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index 2652b25ed401..3a5439d0e161 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2023-07-16 15:47:57 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2023-08-17 07:33:31 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -238,7 +238,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -234,7 +234,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) const; diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index cd3fca68f201..5e252d5c40d8 100644 --- a/www/chromium/files/patch-content_shell_BUILD.gn +++ b/www/chromium/files/patch-content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- content/shell/BUILD.gn.orig 2023-07-16 15:47:57 UTC +--- content/shell/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ content/shell/BUILD.gn -@@ -1017,7 +1017,7 @@ group("content_shell_crash_test") { +@@ -1019,7 +1019,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 a5fbdd15b939..340d857521e9 100644 --- a/www/chromium/files/patch-content_test_BUILD.gn +++ b/www/chromium/files/patch-content_test_BUILD.gn @@ -1,6 +1,6 @@ ---- content/test/BUILD.gn.orig 2023-08-04 12:03:57 UTC +--- content/test/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ content/test/BUILD.gn -@@ -2181,7 +2181,7 @@ static_library("run_all_unittests") { +@@ -2207,7 +2207,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -9,7 +9,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -3235,7 +3235,7 @@ test("content_unittests") { +@@ -3273,7 +3273,7 @@ test("content_unittests") { deps += [ "//third_party/boringssl" ] } diff --git a/www/chromium/files/patch-content_utility_services.cc b/www/chromium/files/patch-content_utility_services.cc index 5e71781eb54e..abb3d4b929e5 100644 --- a/www/chromium/files/patch-content_utility_services.cc +++ b/www/chromium/files/patch-content_utility_services.cc @@ -1,4 +1,4 @@ ---- content/utility/services.cc.orig 2023-07-16 15:47:57 UTC +--- content/utility/services.cc.orig 2023-08-17 07:33:31 UTC +++ content/utility/services.cc @@ -65,7 +65,7 @@ extern sandbox::TargetServices* g_utility_target_services; @@ -63,7 +63,7 @@ auto RunVideoEncodeAcceleratorProviderFactory( mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory> receiver) { -@@ -419,13 +419,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -418,13 +418,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) diff --git a/www/chromium/files/patch-content_utility_utility__main.cc b/www/chromium/files/patch-content_utility_utility__main.cc index 26c01c3bd766..f85fc41fef95 100644 --- a/www/chromium/files/patch-content_utility_utility__main.cc +++ b/www/chromium/files/patch-content_utility_utility__main.cc @@ -1,4 +1,4 @@ ---- content/utility/utility_main.cc.orig 2023-07-16 15:47:57 UTC +--- content/utility/utility_main.cc.orig 2023-08-17 07:33:31 UTC +++ content/utility/utility_main.cc @@ -31,7 +31,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" @@ -44,7 +44,7 @@ #include "components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h" // nogncheck #endif -@@ -91,7 +97,7 @@ namespace content { +@@ -92,7 +98,7 @@ namespace content { namespace { @@ -53,7 +53,7 @@ std::vector<std::string> GetNetworkContextsParentDirectories() { base::MemoryMappedFile::Region region; base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD( -@@ -119,7 +125,7 @@ std::vector<std::string> GetNetworkContextsParentDirec +@@ -120,7 +126,7 @@ std::vector<std::string> GetNetworkContextsParentDirec bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox sandbox_type) { const bool obtain_gpu_info = @@ -62,7 +62,7 @@ sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding; -@@ -235,7 +241,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -236,7 +242,7 @@ int UtilityMain(MainFunctionParams parameters) { } } @@ -71,7 +71,7 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -264,7 +270,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -265,7 +271,7 @@ int UtilityMain(MainFunctionParams parameters) { pre_sandbox_hook = base::BindOnce(&screen_ai::ScreenAIPreSandboxHook); break; #endif @@ -80,7 +80,7 @@ case sandbox::mojom::Sandbox::kHardwareVideoDecoding: pre_sandbox_hook = base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); -@@ -291,6 +297,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -292,6 +298,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -88,7 +88,7 @@ if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { sandbox::policy::SandboxLinux::Options sandbox_options; -@@ -299,6 +306,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -300,6 +307,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } diff --git a/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc b/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc new file mode 100644 index 000000000000..9d61d0de05f0 --- /dev/null +++ b/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc @@ -0,0 +1,11 @@ +--- gpu/command_buffer/service/dawn_context_provider.cc.orig 2023-08-17 07:33:31 UTC ++++ gpu/command_buffer/service/dawn_context_provider.cc +@@ -45,7 +45,7 @@ wgpu::BackendType GetDefaultBackendType() { + return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12) + ? wgpu::BackendType::D3D12 + : wgpu::BackendType::D3D11; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return wgpu::BackendType::Vulkan; + #elif BUILDFLAG(IS_MAC) + return wgpu::BackendType::Metal; diff --git a/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc b/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc index 9f3ed7d8cc10..28ab75060ec0 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2023-05-31 08:12:17 UTC +--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2023-08-17 07:33:31 UTC +++ gpu/command_buffer/service/gles2_cmd_decoder.cc -@@ -3492,7 +3492,7 @@ GLES2Decoder* GLES2Decoder::Create( +@@ -2988,7 +2988,7 @@ GLES2Decoder* GLES2Decoder::Create( } // Allow linux to run fuzzers. diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc index 8a83f8646338..395305d93814 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-07-16 15:47:57 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-08-17 07:33:31 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc -@@ -43,7 +43,7 @@ +@@ -46,7 +46,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/scoped_binders.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" #endif -@@ -591,7 +591,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma +@@ -595,7 +595,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma WGPUDevice wgpuDevice, WGPUBackendType backend_type, std::vector<WGPUTextureFormat> view_formats) { diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc index a75b1492b194..9620781c9a05 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-07-16 15:47:57 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-08-17 07:33:31 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc -@@ -209,7 +209,7 @@ bool ExternalVkImageBackingFactory::IsSupported( +@@ -226,7 +226,7 @@ bool ExternalVkImageBackingFactory::IsSupported( return false; } diff --git a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc index d747ac3ce46f..f02c2e251f61 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 2023-07-16 15:47:57 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-08-17 07:33:31 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1245,7 +1245,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1235,7 +1235,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( if (gr_context_type_ != GrContextType::kVulkan && use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) { diff --git a/www/chromium/files/patch-gpu_config_gpu__control__list.cc b/www/chromium/files/patch-gpu_config_gpu__control__list.cc index 3e785a5cfe09..b691d7f60e6a 100644 --- a/www/chromium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/chromium/files/patch-gpu_config_gpu__control__list.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_control_list.cc.orig 2022-06-17 14:20:10 UTC +--- gpu/config/gpu_control_list.cc.orig 2023-08-17 07:33:31 UTC +++ gpu/config/gpu_control_list.cc -@@ -302,7 +302,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( +@@ -276,7 +276,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { #if BUILDFLAG(IS_CHROMEOS) return kGLTypeGL; @@ -9,7 +9,7 @@ return kGLTypeGL; #elif BUILDFLAG(IS_MAC) return kGLTypeGL; -@@ -844,7 +844,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -817,7 +817,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif BUILDFLAG(IS_FUCHSIA) return kOsFuchsia; diff --git a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc index c0a24fa5f1ff..297d7701bf26 100644 --- a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc +++ b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc @@ -1,6 +1,6 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2023-07-16 15:47:57 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2023-08-17 07:33:31 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.cc -@@ -21,7 +21,7 @@ +@@ -26,7 +26,7 @@ #include "ui/ozone/public/ozone_platform.h" #endif @@ -9,7 +9,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" #endif -@@ -51,7 +51,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() +@@ -56,7 +56,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() return gfx::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::ANDROID_HARDWARE_BUFFER; diff --git a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h index 11ec3df268c6..a9561526a8da 100644 --- a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h +++ b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h @@ -1,6 +1,6 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2023-07-16 15:47:57 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2023-08-17 07:33:31 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.h -@@ -20,7 +20,7 @@ +@@ -21,7 +21,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" 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 5b211729b9f7..4dc8162f4232 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 2023-05-31 08:12:17 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2023-08-17 07:33:31 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -334,7 +334,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -336,7 +336,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 -@@ -371,7 +371,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -373,7 +373,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. -@@ -442,7 +442,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -444,7 +444,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } @@ -27,7 +27,7 @@ // The ContentSandboxHelper is currently the only one implementation of // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -528,7 +528,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -530,7 +530,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -36,7 +36,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -672,7 +672,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -674,7 +674,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -45,7 +45,7 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -726,7 +726,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -728,7 +728,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } } @@ -54,7 +54,7 @@ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -867,7 +867,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -882,7 +882,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled; @@ -63,7 +63,7 @@ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -937,7 +937,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -952,7 +952,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h index 588b6227690a..2c79761e509f 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2023-07-16 15:47:57 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2023-08-17 07:33:31 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -307,7 +307,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers +@@ -309,7 +309,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR; VulkanFunction<PFN_vkQueuePresentKHR> vkQueuePresentKHR; @@ -9,7 +9,7 @@ VulkanFunction<PFN_vkGetImageDrmFormatModifierPropertiesEXT> vkGetImageDrmFormatModifierPropertiesEXT; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -1214,7 +1214,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue +@@ -1225,7 +1225,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue pPresentInfo); } @@ -18,7 +18,7 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT( VkDevice device, VkImage image, -@@ -1224,4 +1224,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp +@@ -1235,4 +1235,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc index dad05cf23aa4..f7640c1af4a7 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_util.cc.orig 2022-07-22 17:30:31 UTC +--- gpu/vulkan/vulkan_util.cc.orig 2023-08-17 07:33:31 UTC +++ gpu/vulkan/vulkan_util.cc -@@ -199,7 +199,7 @@ bool CheckVulkanCompabilities(const VulkanInfo& vulkan +@@ -343,7 +343,7 @@ bool CheckVulkanCompabilities(const VulkanInfo& vulkan } } diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn index ed2b28747c6d..e31c88674e86 100644 --- a/www/chromium/files/patch-media_audio_BUILD.gn +++ b/www/chromium/files/patch-media_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- media/audio/BUILD.gn.orig 2023-07-16 15:47:57 UTC +--- media/audio/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ media/audio/BUILD.gn -@@ -279,9 +279,20 @@ source_set("audio") { +@@ -283,9 +283,20 @@ source_set("audio") { ] } diff --git a/www/chromium/files/patch-media_base_cdm__promise__adapter.cc b/www/chromium/files/patch-media_base_cdm__promise__adapter.cc index 78c1400719b4..cd90d83d759c 100644 --- a/www/chromium/files/patch-media_base_cdm__promise__adapter.cc +++ b/www/chromium/files/patch-media_base_cdm__promise__adapter.cc @@ -1,14 +1,16 @@ ---- media/base/cdm_promise_adapter.cc.orig 2023-05-31 11:26:38 UTC +--- media/base/cdm_promise_adapter.cc.orig 2023-08-17 07:33:31 UTC +++ media/base/cdm_promise_adapter.cc -@@ -95,9 +95,11 @@ void CdmPromiseAdapter::Clear(ClearReason reason) { +@@ -94,7 +94,13 @@ void CdmPromiseAdapter::RejectPromise(uint32_t promise + void CdmPromiseAdapter::Clear(ClearReason reason) { // Reject all outstanding promises. DCHECK(thread_checker_.CalledOnValidThread()); - for (auto& [promise_id, promise] : promises_) { +#if defined(__clang__) && (__clang_major__ >= 16) + for (auto& [promise_id, promise] : promises_) { ++#else ++ for (auto& [p_i, p_e] : promises_) { ++ auto& promise_id = p_i; ++ auto& promise = p_e; ++#endif TRACE_EVENT_NESTABLE_ASYNC_END1( "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id), "status", "cleared"); -+#endif - promise->reject(CdmPromise::Exception::INVALID_STATE_ERROR, - ToSystemCode(reason), "Operation aborted."); - } diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc index 6de1fd418b8e..2d5fa7ce3312 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 2023-07-16 15:47:57 UTC +--- media/base/media_switches.cc.orig 2023-08-17 07:33:31 UTC +++ media/base/media_switches.cc @@ -15,7 +15,7 @@ #include "gpu/config/gpu_finch_features.h" @@ -9,7 +9,7 @@ #include "base/cpu.h" #endif -@@ -636,7 +636,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, +@@ -648,7 +648,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -659,7 +659,7 @@ BASE_FEATURE(kGlobalMediaControlsCrOSUpdatedUI, +@@ -671,7 +671,7 @@ BASE_FEATURE(kGlobalMediaControlsCrOSUpdatedUI, // If enabled, users can request Media Remoting without fullscreen-in-tab. BASE_FEATURE(kMediaRemotingWithoutFullscreen, "MediaRemotingWithoutFullscreen", @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -671,7 +671,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, +@@ -683,7 +683,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -715,7 +715,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -727,7 +727,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -45,8 +45,8 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. BASE_FEATURE(kVaapiVideoDecodeLinux, -@@ -1269,7 +1269,7 @@ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideo - "UseOutOfProcessVideoDecoding", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -1294,7 +1294,7 @@ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideo + }; #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-media_base_media__switches.h b/www/chromium/files/patch-media_base_media__switches.h index c8d5f13a6d61..93982088fdd9 100644 --- a/www/chromium/files/patch-media_base_media__switches.h +++ b/www/chromium/files/patch-media_base_media__switches.h @@ -1,6 +1,6 @@ ---- media/base/media_switches.h.orig 2023-07-16 15:47:57 UTC +--- media/base/media_switches.h.orig 2023-08-17 07:33:31 UTC +++ media/base/media_switches.h -@@ -290,7 +290,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor +@@ -300,7 +300,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseMediaHistoryStore); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseR16Texture); @@ -9,7 +9,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux); -@@ -423,7 +423,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV +@@ -436,7 +436,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) diff --git a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc index 3cb48308bc94..e930a6ed8e2c 100644 --- a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc @@ -1,6 +1,6 @@ ---- media/capture/video/fake_video_capture_device_factory.cc.orig 2023-04-05 11:05:06 UTC +--- media/capture/video/fake_video_capture_device_factory.cc.orig 2023-08-17 07:33:31 UTC +++ media/capture/video/fake_video_capture_device_factory.cc -@@ -213,7 +213,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo( +@@ -229,7 +229,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo( int entry_index = 0; for (const auto& entry : devices_config_) { VideoCaptureApi api = diff --git a/www/chromium/files/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc b/www/chromium/files/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc new file mode 100644 index 000000000000..bd5acb63f0c7 --- /dev/null +++ b/www/chromium/files/patch-media_capture_video_video__capture__buffer__tracker__factory__impl.cc @@ -0,0 +1,20 @@ +--- media/capture/video/video_capture_buffer_tracker_factory_impl.cc.orig 2023-08-17 07:33:31 UTC ++++ media/capture/video/video_capture_buffer_tracker_factory_impl.cc +@@ -18,7 +18,7 @@ + #include "media/capture/video/mac/gpu_memory_buffer_tracker_mac.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "media/capture/video/linux/v4l2_gpu_memory_buffer_tracker.h" + #endif + +@@ -33,7 +33,7 @@ VideoCaptureBufferTrackerFactoryImpl::CreateTracker( + return std::make_unique<GpuMemoryBufferTracker>(); + #elif BUILDFLAG(IS_MAC) + return std::make_unique<GpuMemoryBufferTrackerMac>(); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return std::make_unique<V4L2GpuMemoryBufferTracker>(); + #else + return nullptr; 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 833cc904d4a0..c582f04cd111 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 2023-05-31 08:12:17 UTC +--- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2023-08-17 07:33:31 UTC +++ media/gpu/vaapi/vaapi_video_decoder.cc -@@ -776,7 +776,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree +@@ -779,7 +779,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree const gfx::Size decoder_natural_size = aspect_ratio_.GetNaturalSize(decoder_visible_rect); diff --git a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc index 43737b845a85..8362cda114d8 100644 --- a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc +++ b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc @@ -1,6 +1,6 @@ ---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2023-05-31 08:12:17 UTC +--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2023-08-17 07:33:31 UTC +++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc -@@ -724,7 +724,7 @@ const gfx::GpuMemoryBufferId& StructTraits< +@@ -730,7 +730,7 @@ const gfx::GpuMemoryBufferId& StructTraits< return input.id; } @@ -9,7 +9,7 @@ // static gfx::NativePixmapHandle StructTraits< media::stable::mojom::NativeGpuMemoryBufferHandleDataView, -@@ -745,7 +745,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor +@@ -751,7 +751,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor output->type = gfx::NATIVE_PIXMAP; diff --git a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index 49398ba981b8..5e5f57120a47 100644 --- a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,4 +1,4 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2023-07-16 15:47:57 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2023-08-17 07:33:31 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc @@ -728,7 +728,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } @@ -9,7 +9,7 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1181,7 +1181,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1196,7 +1196,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo is_webgpu_compatible = (gpu_memory_buffer != nullptr); #endif @@ -18,7 +18,7 @@ is_webgpu_compatible = (gpu_memory_buffer != nullptr); if (is_webgpu_compatible) { is_webgpu_compatible &= -@@ -1200,7 +1200,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1215,7 +1215,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | gpu::SHARED_IMAGE_USAGE_SCANOUT; diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc index bf079aef9e46..de70bfd36b2b 100644 --- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc +++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter_test.cc.orig 2023-04-28 17:01:32 UTC +--- media/video/video_encode_accelerator_adapter_test.cc.orig 2023-08-17 07:33:31 UTC +++ media/video/video_encode_accelerator_adapter_test.cc -@@ -458,7 +458,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes +@@ -459,7 +459,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes CreateGreenFrame(large_size, pixel_format, base::Milliseconds(2)); VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420; diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index 25dc240dabb8..608bc60b9be4 100644 --- a/www/chromium/files/patch-net_BUILD.gn +++ b/www/chromium/files/patch-net_BUILD.gn @@ -1,4 +1,4 @@ ---- net/BUILD.gn.orig 2023-07-16 15:47:57 UTC +--- net/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ net/BUILD.gn @@ -107,7 +107,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1231,6 +1231,19 @@ component("net") { +@@ -1233,6 +1233,19 @@ component("net") { deps += [ "//third_party/xdg_shared_mime_info" ] } @@ -29,7 +29,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1387,7 +1400,7 @@ component("net") { +@@ -1393,7 +1406,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -38,7 +38,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -2856,7 +2869,7 @@ test("net_unittests") { +@@ -2873,7 +2886,7 @@ test("net_unittests") { ] } @@ -47,7 +47,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -2924,6 +2937,10 @@ test("net_unittests") { +@@ -2941,6 +2954,10 @@ test("net_unittests") { "//url:buildflags", ] @@ -58,7 +58,7 @@ if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -3006,7 +3023,7 @@ test("net_unittests") { +@@ -3027,7 +3044,7 @@ test("net_unittests") { ] } @@ -67,7 +67,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3142,7 +3159,7 @@ test("net_unittests") { +@@ -3163,7 +3180,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/chromium/files/patch-net_base_mock__network__change__notifier.cc b/www/chromium/files/patch-net_base_mock__network__change__notifier.cc new file mode 100644 index 000000000000..f1a396f34293 --- /dev/null +++ b/www/chromium/files/patch-net_base_mock__network__change__notifier.cc @@ -0,0 +1,11 @@ +--- net/base/mock_network_change_notifier.cc.orig 2023-08-17 07:33:31 UTC ++++ net/base/mock_network_change_notifier.cc +@@ -103,7 +103,7 @@ MockNetworkChangeNotifier::GetCurrentConnectionCost() + return connection_cost_; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + AddressMapOwnerLinux* MockNetworkChangeNotifier::GetAddressMapOwnerInternal() { + return address_map_owner_; + } diff --git a/www/chromium/files/patch-net_base_mock__network__change__notifier.h b/www/chromium/files/patch-net_base_mock__network__change__notifier.h new file mode 100644 index 000000000000..eb1fb1dd1646 --- /dev/null +++ b/www/chromium/files/patch-net_base_mock__network__change__notifier.h @@ -0,0 +1,20 @@ +--- net/base/mock_network_change_notifier.h.orig 2023-08-17 07:33:31 UTC ++++ net/base/mock_network_change_notifier.h +@@ -84,7 +84,7 @@ class MockNetworkChangeNotifier : public NetworkChange + // use_default_connection_cost_implementation is set to true. + ConnectionCost GetCurrentConnectionCost() override; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void SetAddressMapOwnerLinux(AddressMapOwnerLinux* address_map_owner) { + address_map_owner_ = address_map_owner; + } +@@ -104,7 +104,7 @@ class MockNetworkChangeNotifier : public NetworkChange + bool use_default_connection_cost_implementation_ = false; + NetworkChangeNotifier::NetworkList connected_networks_; + std::unique_ptr<SystemDnsConfigChangeNotifier> dns_config_notifier_; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + raw_ptr<AddressMapOwnerLinux> address_map_owner_ = nullptr; + #endif + }; diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc.h b/www/chromium/files/patch-net_cert_cert__verify__proc.h index e841de132e26..7454a0cfa444 100644 --- a/www/chromium/files/patch-net_cert_cert__verify__proc.h +++ b/www/chromium/files/patch-net_cert_cert__verify__proc.h @@ -1,6 +1,6 @@ ---- net/cert/cert_verify_proc.h.orig 2023-05-31 08:12:17 UTC +--- net/cert/cert_verify_proc.h.orig 2023-08-17 07:33:31 UTC +++ net/cert/cert_verify_proc.h -@@ -75,7 +75,7 @@ class NET_EXPORT CertVerifyProc +@@ -79,7 +79,7 @@ class NET_EXPORT CertVerifyProc kMaxValue = kChainLengthOne }; 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 81c04a14133a..ddb6f002f752 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,6 +1,6 @@ ---- net/cert/cert_verify_proc_unittest.cc.orig 2023-05-31 08:12:17 UTC +--- net/cert/cert_verify_proc_unittest.cc.orig 2023-08-17 07:33:31 UTC +++ net/cert/cert_verify_proc_unittest.cc -@@ -214,7 +214,7 @@ scoped_refptr<CertVerifyProc> CreateCertVerifyProc( +@@ -215,7 +215,7 @@ scoped_refptr<CertVerifyProc> CreateCertVerifyProc( case CERT_VERIFY_PROC_IOS: return base::MakeRefCounted<CertVerifyProcIOS>(std::move(crl_set)); #endif @@ -9,7 +9,7 @@ case CERT_VERIFY_PROC_BUILTIN: return CreateCertVerifyProcBuiltin(std::move(cert_net_fetcher), std::move(crl_set), -@@ -243,7 +243,7 @@ constexpr CertVerifyProcType kAllCertVerifiers[] = { +@@ -244,7 +244,7 @@ constexpr CertVerifyProcType kAllCertVerifiers[] = { CERT_VERIFY_PROC_ANDROID, #elif BUILDFLAG(IS_IOS) CERT_VERIFY_PROC_IOS, diff --git a/www/chromium/files/patch-net_dns_BUILD.gn b/www/chromium/files/patch-net_dns_BUILD.gn index 589418b5fb5f..dc5c45c80f8a 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 2023-02-08 09:03:45 UTC +--- net/dns/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ net/dns/BUILD.gn -@@ -124,7 +124,7 @@ source_set("dns") { +@@ -128,7 +128,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", -@@ -165,6 +165,7 @@ source_set("dns") { +@@ -169,6 +169,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +17,7 @@ ] allow_circular_includes_from = [ -@@ -428,9 +429,9 @@ source_set("tests") { +@@ -434,9 +435,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__cache.cc b/www/chromium/files/patch-net_dns_host__resolver__cache.cc new file mode 100644 index 000000000000..ef629b2b527c --- /dev/null +++ b/www/chromium/files/patch-net_dns_host__resolver__cache.cc @@ -0,0 +1,14 @@ +--- net/dns/host_resolver_cache.cc.orig 2023-08-17 07:33:31 UTC ++++ net/dns/host_resolver_cache.cc +@@ -159,7 +159,11 @@ void HostResolverCache::Set( + + std::string domain_name = result->domain_name(); + entries_.emplace( ++#if defined(__clang__) && (__clang_major__ >= 16) + Key(std::move(domain_name), network_anonymization_key), ++#else ++ Key({std::move(domain_name), network_anonymization_key}), ++#endif + Entry(std::move(result), source, secure, staleness_generation_)); + + if (entries_.size() > max_entries_) { diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc index 447e0fea38c1..0b808335d494 100644 --- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,6 +1,6 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2023-07-16 15:47:57 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2023-08-17 07:33:31 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -84,7 +84,7 @@ +@@ -83,7 +83,7 @@ #include "gin/public/cppgc.h" #endif @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -526,7 +526,7 @@ void InitializeSDK(bool enable_v8, +@@ -525,7 +525,7 @@ void InitializeSDK(bool enable_v8, FPDF_InitLibraryWithConfig(&config); diff --git a/www/chromium/files/patch-printing_backend_cups__helper.cc b/www/chromium/files/patch-printing_backend_cups__helper.cc deleted file mode 100644 index de848f0a5d77..000000000000 --- a/www/chromium/files/patch-printing_backend_cups__helper.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- printing/backend/cups_helper.cc.orig 2023-04-05 11:05:06 UTC -+++ printing/backend/cups_helper.cc -@@ -127,7 +127,7 @@ void GetResolutionSettings(ppd_file_t* ppd, - // found. - #if BUILDFLAG(IS_MAC) - constexpr gfx::Size kDefaultMissingDpi(kDefaultMacDpi, kDefaultMacDpi); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - constexpr gfx::Size kDefaultMissingDpi(kPixelsPerInch, kPixelsPerInch); - #else - constexpr gfx::Size kDefaultMissingDpi(kDefaultPdfDpi, kDefaultPdfDpi); diff --git a/www/chromium/files/patch-remoting_host_basic__desktop__environment.cc b/www/chromium/files/patch-remoting_host_basic__desktop__environment.cc index 46811b52c8d9..3953460a5ba8 100644 --- a/www/chromium/files/patch-remoting_host_basic__desktop__environment.cc +++ b/www/chromium/files/patch-remoting_host_basic__desktop__environment.cc @@ -1,6 +1,6 @@ ---- remoting/host/basic_desktop_environment.cc.orig 2023-04-28 17:01:32 UTC +--- remoting/host/basic_desktop_environment.cc.orig 2023-08-17 07:33:31 UTC +++ remoting/host/basic_desktop_environment.cc -@@ -188,7 +188,7 @@ BasicDesktopEnvironment::CreateVideoCapturer() { +@@ -195,7 +195,7 @@ BasicDesktopEnvironment::CreateVideoCapturer() { scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner; #if BUILDFLAG(IS_CHROMEOS_ASH) capture_task_runner = ui_task_runner_; diff --git a/www/chromium/files/patch-remoting_host_chromoting__host__context.cc b/www/chromium/files/patch-remoting_host_chromoting__host__context.cc index 9bc9ec28d85b..52d08746e061 100644 --- a/www/chromium/files/patch-remoting_host_chromoting__host__context.cc +++ b/www/chromium/files/patch-remoting_host_chromoting__host__context.cc @@ -1,6 +1,6 @@ ---- remoting/host/chromoting_host_context.cc.orig 2023-03-09 06:31:50 UTC +--- remoting/host/chromoting_host_context.cc.orig 2023-08-17 07:33:31 UTC +++ remoting/host/chromoting_host_context.cc -@@ -144,7 +144,7 @@ std::unique_ptr<ChromotingHostContext> ChromotingHostC +@@ -294,7 +294,7 @@ std::unique_ptr<ChromotingHostContext> ChromotingHostC // on a UI thread. scoped_refptr<AutoThreadTaskRunner> input_task_runner = AutoThread::CreateWithType("ChromotingInputThread", ui_task_runner, diff --git a/www/chromium/files/patch-remoting_host_desktop__capturer__proxy.cc b/www/chromium/files/patch-remoting_host_desktop__capturer__proxy.cc index 21224afe7a7f..4b31452946f3 100644 --- a/www/chromium/files/patch-remoting_host_desktop__capturer__proxy.cc +++ b/www/chromium/files/patch-remoting_host_desktop__capturer__proxy.cc @@ -1,6 +1,6 @@ ---- remoting/host/desktop_capturer_proxy.cc.orig 2023-04-05 11:05:06 UTC +--- remoting/host/desktop_capturer_proxy.cc.orig 2023-08-17 07:33:31 UTC +++ remoting/host/desktop_capturer_proxy.cc -@@ -30,7 +30,7 @@ +@@ -26,7 +26,7 @@ #include "remoting/host/chromeos/frame_sink_desktop_capturer.h" #endif @@ -9,16 +9,16 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #include "remoting/host/linux/wayland_desktop_capturer.h" -@@ -99,7 +99,7 @@ void DesktopCapturerProxy::Core::CreateCapturer( - capturer_ = std::make_unique<webrtc::DesktopCapturerDifferWrapper>( - std::make_unique<AuraDesktopCapturer>()); - } +@@ -89,7 +89,7 @@ void DesktopCapturerProxy::Core::CreateCapturer( + + #if BUILDFLAG(IS_CHROMEOS_ASH) + capturer_ = std::make_unique<FrameSinkDesktopCapturer>(); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) static base::nix::SessionType session_type = base::nix::SessionType::kUnset; if (session_type == base::nix::SessionType::kUnset) { std::unique_ptr<base::Environment> env = base::Environment::Create(); -@@ -303,7 +303,7 @@ void DesktopCapturerProxy::OnMetadata(webrtc::DesktopC +@@ -293,7 +293,7 @@ void DesktopCapturerProxy::OnMetadata(webrtc::DesktopC bool DesktopCapturerProxy::SupportsFrameCallbacks() { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); diff --git a/www/chromium/files/patch-sandbox_linux_BUILD.gn b/www/chromium/files/patch-sandbox_linux_BUILD.gn index 6807b5b84dea..5aa2a9351c39 100644 --- a/www/chromium/files/patch-sandbox_linux_BUILD.gn +++ b/www/chromium/files/patch-sandbox_linux_BUILD.gn @@ -1,4 +1,4 @@ ---- sandbox/linux/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- sandbox/linux/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ sandbox/linux/BUILD.gn @@ -12,11 +12,11 @@ if (is_android) { } @@ -15,7 +15,7 @@ # On Android, use plain GTest. use_base_test_suite = is_linux || is_chromeos -@@ -380,6 +380,17 @@ component("sandbox_services") { +@@ -379,6 +379,17 @@ component("sandbox_services") { "services/libc_interceptor.h", ] } diff --git a/www/chromium/files/patch-sandbox_policy_BUILD.gn b/www/chromium/files/patch-sandbox_policy_BUILD.gn index 902624156164..b0e42b4b9e0a 100644 --- a/www/chromium/files/patch-sandbox_policy_BUILD.gn +++ b/www/chromium/files/patch-sandbox_policy_BUILD.gn @@ -1,4 +1,4 @@ ---- sandbox/policy/BUILD.gn.orig 2023-04-05 11:05:06 UTC +--- sandbox/policy/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ sandbox/policy/BUILD.gn @@ -35,7 +35,7 @@ component("policy") { "//sandbox/policy/mojom", @@ -9,7 +9,7 @@ sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", -@@ -103,6 +103,27 @@ component("policy") { +@@ -106,6 +106,27 @@ component("policy") { "//sandbox/linux:sandbox_services", "//sandbox/linux:seccomp_bpf", "//sandbox/linux:suid_sandbox_client", diff --git a/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc b/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc index 4e4dbfdd0f30..2869acab5203 100644 --- a/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc +++ b/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc @@ -1,7 +1,7 @@ ---- services/cert_verifier/cert_verifier_creation.cc.orig 2023-07-16 15:47:57 UTC +--- services/cert_verifier/cert_verifier_creation.cc.orig 2023-08-17 07:33:31 UTC +++ services/cert_verifier/cert_verifier_creation.cc -@@ -14,7 +14,7 @@ - #include "net/cert_net/cert_net_fetcher_url_request.h" +@@ -13,7 +13,7 @@ + #include "net/cert/multi_threaded_cert_verifier.h" #include "net/net_buildflags.h" -#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -9,7 +9,7 @@ #include "net/cert/cert_verify_proc_builtin.h" #include "net/cert/internal/system_trust_store.h" #endif -@@ -113,7 +113,7 @@ class CertVerifyProcFactoryImpl : public net::CertVeri +@@ -112,7 +112,7 @@ class CertVerifyProcFactoryImpl : public net::CertVeri user_slot_restriction_ ? crypto::ScopedPK11Slot(PK11_ReferenceSlot( user_slot_restriction_.get())) : nullptr)); @@ -18,7 +18,7 @@ return net::CreateCertVerifyProcBuiltin(std::move(cert_net_fetcher), std::move(crl_set), net::CreateSslSystemTrustStore()); -@@ -213,6 +213,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr +@@ -212,6 +212,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr bool IsUsingCertNetFetcher() { #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc index 8fb2ebf8bcd0..f86ce88654c8 100644 --- a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc +++ b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc @@ -1,6 +1,6 @@ ---- services/device/geolocation/location_arbitrator.cc.orig 2023-05-31 08:12:17 UTC +--- services/device/geolocation/location_arbitrator.cc.orig 2023-08-17 07:33:31 UTC +++ services/device/geolocation/location_arbitrator.cc -@@ -162,7 +162,7 @@ LocationArbitrator::NewNetworkLocationProvider( +@@ -174,7 +174,7 @@ LocationArbitrator::NewNetworkLocationProvider( std::unique_ptr<LocationProvider> LocationArbitrator::NewSystemLocationProvider() { diff --git a/www/chromium/files/patch-services_device_public_mojom_BUILD.gn b/www/chromium/files/patch-services_device_public_mojom_BUILD.gn index a06afd957ea4..9227ebb76184 100644 --- a/www/chromium/files/patch-services_device_public_mojom_BUILD.gn +++ b/www/chromium/files/patch-services_device_public_mojom_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/public/mojom/BUILD.gn.orig 2023-05-31 08:12:17 UTC +--- services/device/public/mojom/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ services/device/public/mojom/BUILD.gn -@@ -94,7 +94,7 @@ mojom("device_service") { +@@ -95,7 +95,7 @@ mojom("device_service") { enable_js_fuzzing = false enabled_features = [] diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index d9856f654c4c..6de4ddeb6536 100644 --- a/www/chromium/files/patch-services_network_BUILD.gn +++ b/www/chromium/files/patch-services_network_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/BUILD.gn.orig 2023-07-16 15:47:57 UTC +--- services/network/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ services/network/BUILD.gn -@@ -374,7 +374,6 @@ if (is_linux || is_chromeos) { +@@ -375,7 +375,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 e85a4ce7c8c1..b6e82e9fb48c 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 2023-05-31 08:12:17 UTC +--- services/network/network_service.cc.orig 2023-08-17 07:33:31 UTC +++ services/network/network_service.cc -@@ -88,7 +88,7 @@ +@@ -92,7 +92,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif diff --git a/www/chromium/files/patch-services_network_public_mojom_BUILD.gn b/www/chromium/files/patch-services_network_public_mojom_BUILD.gn index 706fab3e4b55..797f2bf221ae 100644 --- a/www/chromium/files/patch-services_network_public_mojom_BUILD.gn +++ b/www/chromium/files/patch-services_network_public_mojom_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/public/mojom/BUILD.gn.orig 2023-07-16 15:47:57 UTC +--- services/network/public/mojom/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ services/network/public/mojom/BUILD.gn -@@ -464,11 +464,11 @@ mojom("url_loader_base") { +@@ -465,11 +465,11 @@ mojom("url_loader_base") { } enabled_features = [] diff --git a/www/chromium/files/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h b/www/chromium/files/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h index ced9210eb2e0..95eaff0bbd97 100644 --- a/www/chromium/files/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h +++ b/www/chromium/files/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h @@ -1,8 +1,8 @@ ---- services/network/shared_dictionary/shared_dictionary_writer_in_memory.h.orig 2023-05-31 08:12:17 UTC +--- services/network/shared_dictionary/shared_dictionary_writer_in_memory.h.orig 2023-08-17 07:33:31 UTC +++ services/network/shared_dictionary/shared_dictionary_writer_in_memory.h -@@ -5,6 +5,8 @@ - #ifndef SERVICES_NETWORK_SHARED_DICTIONARY_SHARED_DICTIONARY_WRITER_IN_MEMORY_H_ - #define SERVICES_NETWORK_SHARED_DICTIONARY_SHARED_DICTIONARY_WRITER_IN_MEMORY_H_ +@@ -9,6 +9,8 @@ + #include <string> + #include <vector> +#include <vector> + diff --git a/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc b/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc index 19926568c950..1070177b8536 100644 --- a/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc +++ b/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc @@ -1,15 +1,15 @@ ---- services/video_capture/video_capture_service_impl.cc.orig 2023-07-16 15:47:57 UTC +--- services/video_capture/video_capture_service_impl.cc.orig 2023-08-17 07:33:31 UTC +++ services/video_capture/video_capture_service_impl.cc -@@ -43,7 +43,7 @@ +@@ -40,7 +40,7 @@ #include "services/video_capture/lacros/device_factory_adapter_lacros.h" #endif // BUILDFLAG(IS_CHROMEOS_LACROS) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "media/capture/capture_switches.h" + #include "media/capture/video/linux/video_capture_gpu_memory_buffer_manager.h" #include "services/viz/public/cpp/gpu/context_provider_command_buffer.h" - #endif // BUILDFLAG(IS_LINUX) -@@ -109,7 +109,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext +@@ -107,7 +107,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext this}; }; @@ -18,7 +18,7 @@ // Intended usage of this class is to create viz::Gpu in utility process and // connect to viz::GpuClient of browser process, which will call to Gpu service. // Also, this class holds the viz::ContextProvider to listen and monitor Gpu -@@ -256,7 +256,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende +@@ -285,7 +285,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende if (!gpu_dependencies_context_) gpu_dependencies_context_ = std::make_unique<GpuDependenciesContext>(); @@ -27,7 +27,7 @@ if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { if (!viz_gpu_context_provider_) { viz_gpu_context_provider_ = -@@ -345,7 +345,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH +@@ -381,7 +381,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH } #endif diff --git a/www/chromium/files/patch-skia_ext_skcolorspace__trfn.cc b/www/chromium/files/patch-skia_ext_skcolorspace__trfn.cc index 745e69c82f92..aa190c198a0b 100644 --- a/www/chromium/files/patch-skia_ext_skcolorspace__trfn.cc +++ b/www/chromium/files/patch-skia_ext_skcolorspace__trfn.cc @@ -1,4 +1,4 @@ ---- skia/ext/skcolorspace_trfn.cc.orig 2023-07-16 15:47:57 UTC +--- skia/ext/skcolorspace_trfn.cc.orig 2023-08-17 07:33:31 UTC +++ skia/ext/skcolorspace_trfn.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be @@ -8,4 +8,4 @@ + #include "skia/ext/skcolorspace_trfn.h" - namespace skia { + #include <cmath> 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 2cd38df631be..3ce20f8e6c7c 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,21 +1,21 @@ ---- third_party/abseil-cpp/absl/base/config.h.orig 2023-04-28 17:01:32 UTC +--- third_party/abseil-cpp/absl/base/config.h.orig 2023-08-17 07:33:31 UTC +++ third_party/abseil-cpp/absl/base/config.h -@@ -443,7 +443,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != - // POSIX.1-2001. +@@ -444,7 +444,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != #ifdef ABSL_HAVE_SCHED_YIELD #error ABSL_HAVE_SCHED_YIELD cannot be directly set --#elif defined(__linux__) || defined(__ros__) || defined(__native_client__) -+#elif defined(__linux__) || defined(__ros__) || defined(__native_client__) || \ -+ defined(__OpenBSD__) || defined(__FreeBSD__) + #elif defined(__linux__) || defined(__ros__) || defined(__native_client__) || \ +- defined(__VXWORKS__) ++ defined(__VXWORKS__) || defined(__OpenBSD__) || defined(__FreeBSD__) #define ABSL_HAVE_SCHED_YIELD 1 #endif -@@ -458,7 +459,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -459,7 +459,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != // platforms. #ifdef ABSL_HAVE_SEMAPHORE_H #error ABSL_HAVE_SEMAPHORE_H cannot be directly set --#elif defined(__linux__) || defined(__ros__) -+#elif defined(__linux__) || defined(__ros__) || defined(__OpenBSD__) || defined(__FreeBSD__) +-#elif defined(__linux__) || defined(__ros__) || defined(__VXWORKS__) ++#elif defined(__linux__) || defined(__ros__) || defined(__VXWORKS__) || \ ++ defined(__OpenBSD__) || defined(__FreeBSD__) #define ABSL_HAVE_SEMAPHORE_H 1 #endif diff --git a/www/chromium/files/patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc b/www/chromium/files/patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc index 037702593296..a0aa0bef8a19 100644 --- a/www/chromium/files/patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc +++ b/www/chromium/files/patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc @@ -1,6 +1,6 @@ ---- third_party/abseil-cpp/absl/base/internal/raw_logging.cc.orig 2023-03-09 06:31:50 UTC +--- third_party/abseil-cpp/absl/base/internal/raw_logging.cc.orig 2023-08-17 07:33:31 UTC +++ third_party/abseil-cpp/absl/base/internal/raw_logging.cc -@@ -52,10 +52,12 @@ +@@ -56,10 +56,12 @@ // ABSL_HAVE_SYSCALL_WRITE is defined when the platform provides the syscall // syscall(SYS_write, /*int*/ fd, /*char* */ buf, /*size_t*/ len); // for low level operations that want to avoid libc. diff --git a/www/chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc b/www/chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc index 9115ff0636b9..45b62182cf6f 100644 --- a/www/chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc +++ b/www/chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc @@ -1,6 +1,6 @@ ---- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2022-11-30 08:12:58 UTC +--- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2023-08-17 12:40:56 UTC +++ third_party/abseil-cpp/absl/base/internal/sysinfo.cc -@@ -30,7 +30,7 @@ +@@ -30,10 +30,14 @@ #include <sys/syscall.h> #endif @@ -9,7 +9,30 @@ #include <sys/sysctl.h> #endif -@@ -310,9 +310,11 @@ static double GetNominalCPUFrequency() { ++#if defined(__FreeBSD__) ++#include <pthread_np.h> ++#endif ++ + #if defined(__myriad2__) + #include <rtems.h> + #endif +@@ -186,6 +190,7 @@ static double GetNominalCPUFrequency() { + + #else + ++#if !defined(__OpenBSD__) && !defined(__FreeBSD__) + // Helper function for reading a long from a file. Returns true if successful + // and the memory location pointed to by value is set to the value read. + static bool ReadLongFromFile(const char *file, long *value) { +@@ -212,6 +217,7 @@ static bool ReadLongFromFile(const char *file, long *v + } + return ret; + } ++#endif + + #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY) + +@@ -311,9 +317,11 @@ static double GetNominalCPUFrequency() { // a new mode (turbo mode). Essentially, those frequencies cannot // always be relied upon. The same reasons apply to /proc/cpuinfo as // well. @@ -21,3 +44,22 @@ #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY) // On these platforms, the TSC frequency is the nominal CPU +@@ -433,6 +441,18 @@ pid_t GetTID() { + static_assert(sizeof(pid_t) == sizeof(thread), + "In NaCL int expected to be the same size as a pointer"); + return reinterpret_cast<pid_t>(thread); ++} ++ ++#elif defined(__OpenBSD__) ++ ++pid_t GetTID() { ++ return getthrid(); ++} ++ ++#elif defined(__FreeBSD__) ++ ++pid_t GetTID() { ++ return pthread_getthreadid_np(); + } + + #else diff --git a/www/chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h b/www/chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h index 1ba92f604910..105baa961eb6 100644 --- a/www/chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h +++ b/www/chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h @@ -1,11 +1,11 @@ ---- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2022-08-31 12:19:35 UTC +--- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2023-08-17 07:33:31 UTC +++ third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h -@@ -33,7 +33,7 @@ - +@@ -34,7 +34,7 @@ #if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__QNX__) && \ !defined(__native_client__) && !defined(__asmjs__) && \ -- !defined(__wasm__) && !defined(__HAIKU__) -+ !defined(__wasm__) && !defined(__HAIKU__) && !defined(__FreeBSD__) + !defined(__wasm__) && !defined(__HAIKU__) && !defined(__sun) && \ +- !defined(__VXWORKS__) ++ !defined(__VXWORKS__) && !defined(__FreeBSD__) #define ABSL_HAVE_ELF_MEM_IMAGE 1 #endif 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 64c9cb18173e..3f35487489b2 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,6 +1,6 @@ ---- 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.orig 2023-08-17 07:33:31 UTC +++ third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc -@@ -19,7 +19,7 @@ +@@ -21,7 +21,7 @@ #endif #if defined(HAS_STRPTIME) && HAS_STRPTIME diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index 73ed89d6c1b4..fbb0d8872c24 100644 --- a/www/chromium/files/patch-third__party_angle_BUILD.gn +++ b/www/chromium/files/patch-third__party_angle_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/BUILD.gn.orig 2023-07-16 15:47:57 UTC +--- third_party/angle/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ third_party/angle/BUILD.gn -@@ -298,7 +298,6 @@ config("extra_warnings") { +@@ -307,7 +307,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,7 +8,7 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -469,7 +468,7 @@ template("angle_common_lib") { +@@ -478,7 +477,7 @@ template("angle_common_lib") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -624,6 +623,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -633,6 +632,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp index d56933571369..62bc2c0a0034 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,4 +1,4 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2023-07-16 15:47:57 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2023-08-17 07:33:31 UTC +++ third_party/angle/src/libANGLE/Display.cpp @@ -62,7 +62,7 @@ # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" @@ -9,7 +9,7 @@ # include "libANGLE/renderer/gl/egl/DisplayEGL.h" # if defined(ANGLE_USE_X11) # include "libANGLE/renderer/gl/glx/DisplayGLX.h" -@@ -392,7 +392,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -394,7 +394,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = new rx::DisplayEAGL(state); break; @@ -18,7 +18,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -433,7 +433,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -435,7 +435,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) -@@ -482,7 +482,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -484,7 +484,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()) { -@@ -2093,7 +2093,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2158,7 +2158,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h index 1ddadeff87be..493bbe22c427 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2023-07-16 15:47:57 UTC +--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2023-08-17 07:33:31 UTC +++ third_party/angle/src/libANGLE/renderer/driver_utils.h -@@ -212,7 +212,7 @@ inline bool IsWindows() +@@ -218,7 +218,7 @@ inline bool IsWindows() inline bool IsLinux() { diff --git a/www/chromium/files/patch-third__party_angle_util_BUILD.gn b/www/chromium/files/patch-third__party_angle_util_BUILD.gn index 0e6532d89817..fbf8a53a5840 100644 --- a/www/chromium/files/patch-third__party_angle_util_BUILD.gn +++ b/www/chromium/files/patch-third__party_angle_util_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/util/BUILD.gn.orig 2023-07-16 15:47:57 UTC +--- third_party/angle/util/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ third_party/angle/util/BUILD.gn -@@ -309,7 +309,7 @@ foreach(is_shared_library, +@@ -311,7 +311,7 @@ foreach(is_shared_library, ] libs = [] diff --git a/www/chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc b/www/chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc index 7ac18c48300c..5aa979931ccb 100644 --- a/www/chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc +++ b/www/chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc @@ -1,8 +1,8 @@ ---- third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig 2022-03-25 21:59:56 UTC +--- third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig 2023-08-17 07:33:31 UTC +++ third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc -@@ -64,7 +64,7 @@ bool StructTraits<blink::mojom::RendererPreferencesDat - if (!data.ReadAcceptLanguages(&out->accept_languages)) - return false; +@@ -66,7 +66,7 @@ bool StructTraits<blink::mojom::RendererPreferencesDat + + out->send_subresource_notification = data.send_subresource_notification(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h index 2c3918f765fc..9e9ca4214512 100644 --- a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h +++ b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h @@ -1,9 +1,9 @@ ---- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2023-07-16 15:47:57 UTC +--- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2023-08-17 07:33:31 UTC +++ third_party/blink/public/common/renderer_preferences/renderer_preferences.h -@@ -63,7 +63,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences { - bool webrtc_allow_legacy_tls_protocols{false}; +@@ -64,7 +64,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences { UserAgentOverride user_agent_override; std::string accept_languages; + bool send_subresource_notification{false}; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) std::string system_font_family_name; diff --git a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h index 8a8cfffc0c32..48a0120e2bd5 100644 --- a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h +++ b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h @@ -1,7 +1,7 @@ ---- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2022-03-25 21:59:56 UTC +--- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2023-08-17 07:33:31 UTC +++ third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h -@@ -157,7 +157,7 @@ struct BLINK_COMMON_EXPORT - return data.accept_languages; +@@ -162,7 +162,7 @@ struct BLINK_COMMON_EXPORT + return data.send_subresource_notification; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) 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 3a8dbcc69007..838a6a1b862e 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 2023-05-31 08:12:17 UTC +--- third_party/blink/public/platform/platform.h.orig 2023-08-17 07:33:31 UTC +++ third_party/blink/public/platform/platform.h -@@ -344,7 +344,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -339,7 +339,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; } diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index e2c38452d35c..b86755fbcaaa 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 2023-07-16 15:47:57 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-08-17 07:33:31 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -408,7 +408,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( +@@ -409,7 +409,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' -@@ -3286,7 +3286,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3298,7 +3298,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs renderer_preferences_.use_subpixel_positioning); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_ng_layout__ng__view.cc index 4ce657b80f4b..2f9b2a9c28c1 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_ng_layout__ng__view.cc @@ -1,15 +1,15 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2023-07-16 15:47:57 UTC -+++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -68,7 +68,7 @@ +--- third_party/blink/renderer/core/layout/ng/layout_ng_view.cc.orig 2023-08-17 07:33:31 UTC ++++ third_party/blink/renderer/core/layout/ng/layout_ng_view.cc +@@ -15,7 +15,7 @@ + #include "third_party/blink/renderer/core/svg/svg_document_extensions.h" #include "ui/display/screen_info.h" - #include "ui/gfx/geometry/quad_f.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -323,7 +323,7 @@ void LayoutView::UpdateLayout() { +@@ -57,7 +57,7 @@ void LayoutNGView::UpdateLayout() { fragmentation_context_.Clear(); } diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_paint_object__paint__properties__sparse.h b/www/chromium/files/patch-third__party_blink_renderer_core_paint_object__paint__properties__sparse.h new file mode 100644 index 000000000000..85c036aa6a02 --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_core_paint_object__paint__properties__sparse.h @@ -0,0 +1,13 @@ +--- third_party/blink/renderer/core/paint/object_paint_properties_sparse.h.orig 2023-08-17 07:33:31 UTC ++++ third_party/blink/renderer/core/paint/object_paint_properties_sparse.h +@@ -269,8 +269,8 @@ class CORE_EXPORT ObjectPaintPropertiesSparse : public + NodeList& nodes, + NodeId node_id, + const ParentType& parent, +- NodeType::State&& state, +- const NodeType::AnimationState& animation_state = ++ typename NodeType::State&& state, ++ const typename NodeType::AnimationState& animation_state = + NodeType::AnimationState()) { + // First, check if we need to add a new node. + if (!nodes.HasField(node_id)) { diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_canvas_canvas2d_canvas__style.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_canvas_canvas2d_canvas__style.cc index 476cb3d2292d..04b9c8a2c63a 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_canvas_canvas2d_canvas__style.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_canvas_canvas2d_canvas__style.cc @@ -1,13 +1,23 @@ ---- third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc.orig 2023-07-16 15:47:57 UTC +--- third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc.orig 2023-08-17 07:33:31 UTC +++ third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc -@@ -91,12 +91,20 @@ void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags, +@@ -76,6 +76,9 @@ bool ParseCanvasColorString(const String& color_string + + void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags, + float global_alpha) const { ++#if defined(__clang__) && (__clang_major__ < 16) ++ SkColor4f custom_color = SkColor4f{0.0f, 0.0f, 0.0f, global_alpha}; ++#endif + switch (type_) { + case kColor: + ApplyColorToFlags(flags, global_alpha); +@@ -83,12 +86,20 @@ void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags, case kGradient: GetCanvasGradient()->GetGradient()->ApplyToFlags(flags, SkMatrix::I(), ImageDrawOptions()); +#if defined(__clang__) && (__clang_major__ >= 16) flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha)); +#else -+ flags.setColor(SkColor4f({0.0f, 0.0f, 0.0f, global_alpha})); ++ flags.setColor(custom_color); +#endif break; case kImagePattern: @@ -16,7 +26,7 @@ +#if defined(__clang__) && (__clang_major__ >= 16) flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha)); +#else -+ flags.setColor(SkColor4f({0.0f, 0.0f, 0.0f, global_alpha})); ++ flags.setColor(custom_color); +#endif break; default: diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc index 9fe37877e228..b7042e50af85 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2023-07-16 15:47:57 UTC +--- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2023-08-17 07:33:31 UTC +++ third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc -@@ -185,7 +185,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount +@@ -186,7 +186,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount ~SharedXnnpackContext() { base::AutoLock auto_lock(SharedXnnpackContextLock()); 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 cef3776a6e2b..ce7fb2745d53 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2023-07-16 15:47:57 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2023-08-17 07:33:31 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6219,7 +6219,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6253,7 +6253,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc index 809cea0606de..e26c72dcd297 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2023-05-31 08:12:17 UTC +--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2023-08-17 07:33:31 UTC +++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc -@@ -679,7 +679,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( - // platform requires interop supported. According to the bug, this change will - // be a long time task. So disable using webgpu mailbox texture uploading path +@@ -694,7 +694,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( // on linux platform. + // TODO(crbug.com/1424119): using a webgpu mailbox texture on the OpenGLES + // backend is failing for unknown reasons. -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - use_webgpu_mailbox_texture = false; - unaccelerated_image = image->MakeUnaccelerated(); - image = unaccelerated_image.get(); + bool forceReadback = true; + #elif BUILDFLAG(IS_WIN) + bool forceReadback = 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 f804432260cb..039d05a0d27a 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/BUILD.gn.orig 2023-07-16 15:47:57 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -1928,7 +1928,7 @@ static_library("test_support") { +@@ -1933,7 +1933,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.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc index c5c75b081a5c..bcae63c156ca 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2023-04-05 11:05:06 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2023-08-17 07:33:31 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc @@ -72,7 +72,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo @@ -9,7 +9,7 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -119,7 +119,7 @@ FontPlatformData* FontCache::SystemFontPlatformData( +@@ -118,7 +118,7 @@ FontPlatformData* FontCache::SystemFontPlatformData( const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ 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 744f94637e21..b9f5b3122a48 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 2023-04-28 17:01:32 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2023-08-17 07:33:31 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h -@@ -58,7 +58,7 @@ +@@ -57,7 +57,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" #include "third_party/skia/include/core/SkRefCnt.h" @@ -9,7 +9,7 @@ #include "ui/gfx/font_fallback_linux.h" #endif -@@ -193,7 +193,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -187,7 +187,7 @@ class PLATFORM_EXPORT FontCache final { static void PrewarmFamily(const AtomicString& family_name) {} #endif @@ -18,7 +18,7 @@ // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } -@@ -276,7 +276,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -263,7 +263,7 @@ class PLATFORM_EXPORT FontCache final { const char* locale_family_name); #endif // BUILDFLAG(IS_ANDROID) @@ -27,7 +27,7 @@ static bool GetFontForCharacter(UChar32, const char* preferred_locale, gfx::FallbackFontData*); -@@ -357,7 +357,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -344,7 +344,7 @@ class PLATFORM_EXPORT FontCache final { const FontFaceCreationParams&, std::string& name); @@ -36,8 +36,8 @@ static AtomicString GetFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, -@@ -398,7 +398,7 @@ class PLATFORM_EXPORT FontCache final { - std::unique_ptr<FallbackFamilyStyleCache> fallback_params_cache_; +@@ -382,7 +382,7 @@ class PLATFORM_EXPORT FontCache final { + bool is_test_font_mgr_ = false; #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_palette__interpolation.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_palette__interpolation.cc new file mode 100644 index 000000000000..d2202f3dd6ab --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_palette__interpolation.cc @@ -0,0 +1,15 @@ +--- third_party/blink/renderer/platform/fonts/palette_interpolation.cc.orig 2023-08-17 07:33:31 UTC ++++ third_party/blink/renderer/platform/fonts/palette_interpolation.cc +@@ -31,7 +31,12 @@ Vector<FontPalette::FontPaletteOverride> PaletteInterp + color_interpolation_space, hue_interpolation_method, start_color, + end_color, percentage, alpha_multiplier); + ++#if defined(__clang__) && (__clang_major__ >= 16) + FontPalette::FontPaletteOverride result_color_record(i, result_color); ++#else ++ FontPalette::FontPaletteOverride fpo = { static_cast<int>(i), result_color }; ++ FontPalette::FontPaletteOverride result_color_record(fpo); ++#endif + result_color_records.push_back(result_color_record); + } + return result_color_records; diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc index 2b261b5c91fc..ccd9de6e442a 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig 2023-04-05 11:05:06 UTC +--- third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig 2023-08-17 07:33:31 UTC +++ third_party/blink/renderer/platform/graphics/begin_frame_provider.cc -@@ -77,8 +77,12 @@ void BeginFrameProvider::CreateCompositorFrameSinkIfNe +@@ -71,8 +71,12 @@ void BeginFrameProvider::CreateCompositorFrameSinkIfNe // Once we are using RAF, this thread is driving user interactive display // updates. Update priority accordingly. diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc index 4a74c0181d86..f651005539c3 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2023-05-31 08:12:17 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2023-08-17 07:33:31 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -363,7 +363,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -356,7 +356,7 @@ void VideoFrameSubmitter::OnBeginFrame( continue; auto& feedback = timing_details.find(frame_token)->value.presentation_feedback; diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 index aed7ab05c3d4..e8afca6d3b32 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,15 +1,6 @@ ---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-08-04 12:03:57 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-08-17 07:33:31 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1418,7 +1418,7 @@ - { - name: "DocumentPictureInPictureAPI", - origin_trial_feature_name: "DocumentPictureInPictureAPI", -- origin_trial_os: ["win", "mac", "linux", "chromeos"], -+ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], - status: { - "Android": "", - "ChromeOS_Lacros": "", -@@ -2652,7 +2652,7 @@ +@@ -2673,7 +2673,7 @@ name: "PaymentHandlerMinimalHeaderUX", origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX", origin_trial_allows_third_party: true, @@ -18,7 +9,7 @@ }, { name: "PaymentInstruments", -@@ -3612,7 +3612,7 @@ +@@ -3634,7 +3634,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -26,17 +17,8 @@ + origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"], }, { - // A kill switch for crbug.com/1410332. -@@ -3643,7 +3643,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. -- origin_trial_os: ["android", "chromeos", "fuchsia", "linux", "mac", "win"], -+ origin_trial_os: ["android", "chromeos", "fuchsia", "linux", "mac", "win", "openbsd", "freebsd"], - base_feature: "ReduceUserAgent", - }, - { -@@ -3799,12 +3799,12 @@ + name: "URLPatternCompareComponent", +@@ -3812,12 +3812,12 @@ status: "experimental", base_feature: "none", origin_trial_feature_name: "WebAppUrlHandling", diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c b/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c deleted file mode 100644 index 3123c5fc19ac..000000000000 --- a/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c +++ /dev/null @@ -1,63 +0,0 @@ ---- third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c.orig 2023-07-16 15:47:57 UTC -+++ third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c -@@ -1,3 +1,60 @@ -+/* Copyright (c) 2022, Robert Nagy <robert@openbsd.org> -+ * -+ * Permission to use, copy, modify, and/or distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION -+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -+ -+#include <openssl/cpu.h> -+ -+#if defined(OPENSSL_AARCH64) && defined(OPENSSL_OPENBSD) && \ -+ !defined(OPENSSL_STATIC_ARMCAP) -+ -+#include <sys/sysctl.h> -+#include <machine/cpu.h> -+#include <machine/armreg.h> -+#include <stdio.h> -+ -+#include <openssl/arm_arch.h> -+ -+#include "internal.h" -+ -+extern uint32_t OPENSSL_armcap_P; -+ -+void OPENSSL_cpuid_setup(void) { -+ int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 }; -+ size_t len = sizeof(uint64_t); -+ uint64_t cpu_id = 0; -+ -+ if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) < 0) -+ return; -+ -+ OPENSSL_armcap_P |= ARMV7_NEON; -+ -+ if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_AES_BASE) -+ OPENSSL_armcap_P |= ARMV8_AES; -+ -+ if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_AES_PMULL) -+ OPENSSL_armcap_P |= ARMV8_PMULL; -+ -+ if (ID_AA64ISAR0_SHA1(cpu_id) >= ID_AA64ISAR0_SHA1_BASE) -+ OPENSSL_armcap_P |= ARMV8_SHA1; -+ -+ if (ID_AA64ISAR0_SHA2(cpu_id) >= ID_AA64ISAR0_SHA2_BASE) -+ OPENSSL_armcap_P |= ARMV8_SHA256; -+ -+ if (ID_AA64ISAR0_SHA2(cpu_id) >= ID_AA64ISAR0_SHA2_512) -+ OPENSSL_armcap_P |= ARMV8_SHA512; -+} -+ -+#endif // OPENSSL_AARCH64 && OPENSSL_OPENBSD && !OPENSSL_STATIC_ARMCAP - /* Copyright (c) 2022, Robert Nagy <robert.nagy@gmail.com> - * - * Permission to use, copy, modify, and/or distribute this software for any diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl index f278e7c9d4a0..9a5af46994e1 100644 --- a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl @@ -1,4 +1,4 @@ ---- third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl.orig 2023-07-16 15:47:57 UTC +--- third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl.orig 2023-08-17 07:33:31 UTC +++ third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl @@ -275,6 +275,7 @@ $code.=<<___; .align 16 @@ -32,7 +32,7 @@ #ifdef BORINGSSL_DISPATCH_TEST movb \$1,BORINGSSL_function_hit(%rip) #endif -@@ -1779,6 +1783,7 @@ $code.=<<___; +@@ -1781,6 +1785,7 @@ $code.=<<___; .align 16 ${PREFIX}_xts_encrypt: .cfi_startproc @@ -40,7 +40,7 @@ lea (%rsp),%r11 # frame pointer .cfi_def_cfa_register %r11 push %rbp -@@ -2262,6 +2267,7 @@ $code.=<<___; +@@ -2264,6 +2269,7 @@ $code.=<<___; .align 16 ${PREFIX}_xts_decrypt: .cfi_startproc @@ -48,7 +48,7 @@ lea (%rsp),%r11 # frame pointer .cfi_def_cfa_register %r11 push %rbp -@@ -2780,6 +2786,7 @@ $code.=<<___; +@@ -2782,6 +2788,7 @@ $code.=<<___; .align 16 ${PREFIX}_cbc_encrypt: .cfi_startproc @@ -56,7 +56,7 @@ test $len,$len # check length jz .Lcbc_ret -@@ -3329,6 +3336,7 @@ $code.=<<___; +@@ -3331,6 +3338,7 @@ $code.=<<___; .align 16 ${PREFIX}_set_decrypt_key: .cfi_startproc @@ -64,7 +64,7 @@ .byte 0x48,0x83,0xEC,0x08 # sub rsp,8 .cfi_adjust_cfa_offset 8 call __aesni_set_encrypt_key -@@ -3401,6 +3409,7 @@ $code.=<<___; +@@ -3403,6 +3411,7 @@ $code.=<<___; ${PREFIX}_set_encrypt_key: __aesni_set_encrypt_key: .cfi_startproc diff --git a/www/chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py b/www/chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py index f28e04781cec..7aa4398fcfb6 100644 --- a/www/chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py +++ b/www/chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py @@ -1,6 +1,6 @@ ---- third_party/boringssl/src/util/generate_build_files.py.orig 2023-04-28 17:01:32 UTC +--- third_party/boringssl/src/util/generate_build_files.py.orig 2023-08-17 07:33:31 UTC +++ third_party/boringssl/src/util/generate_build_files.py -@@ -787,10 +787,10 @@ def main(platforms): +@@ -776,10 +776,10 @@ def main(platforms): ] # Generate err_data.c @@ -15,7 +15,7 @@ crypto_c_files.append('err_data.c') crypto_c_files.sort() -@@ -803,11 +803,11 @@ def main(platforms): +@@ -792,11 +792,11 @@ def main(platforms): crypto_test_files = [] if EMBED_TEST_DATA: # Generate crypto_test_data.cc diff --git a/www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h b/www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h index 1556cb096659..a453cd32183b 100644 --- a/www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h +++ b/www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h @@ -1,6 +1,6 @@ ---- third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2023-05-31 08:12:17 UTC +--- third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2023-08-17 07:33:31 UTC +++ third_party/dawn/include/dawn/native/VulkanBackend.h -@@ -76,7 +76,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport +@@ -80,7 +80,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport }; // Can't use DAWN_PLATFORM_IS(LINUX) since header included in both Dawn and Chrome 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 eb53150a0c9c..a2801cb09309 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,6 +1,6 @@ ---- third_party/perfetto/src/base/unix_socket.cc.orig 2022-10-24 13:33:33 UTC +--- third_party/perfetto/src/base/unix_socket.cc.orig 2023-08-17 07:33:31 UTC +++ third_party/perfetto/src/base/unix_socket.cc -@@ -42,7 +42,7 @@ +@@ -43,7 +43,7 @@ #include <unistd.h> #endif @@ -9,7 +9,7 @@ #include <sys/ucred.h> #endif -@@ -803,9 +803,13 @@ void UnixSocket::ReadPeerCredentialsPosix() { +@@ -871,9 +871,13 @@ void UnixSocket::ReadPeerCredentialsPosix() { return; PERFETTO_CHECK(peer_cred_mode_ != SockPeerCredMode::kIgnore); diff --git a/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp b/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp deleted file mode 100644 index c9d06b01fdc6..000000000000 --- a/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp +++ /dev/null @@ -1,45 +0,0 @@ ---- third_party/skia/src/core/SkCpu.cpp.orig 2022-04-21 18:48:31 UTC -+++ third_party/skia/src/core/SkCpu.cpp -@@ -73,6 +73,42 @@ - return features; - } - -+#elif defined(SK_CPU_ARM64) && defined(__OpenBSD__) -+ #include <sys/sysctl.h> -+ #include <machine/cpu.h> -+ #include <machine/armreg.h> -+ -+ static uint32_t read_cpu_features() { -+ int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 }; -+ size_t len = sizeof(uint64_t); -+ uint64_t cpu_id = 0; -+ uint32_t features = 0; -+ -+ if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) == 0) { -+ if (ID_AA64ISAR0_CRC32(cpu_id) >= ID_AA64ISAR0_CRC32_BASE) -+ features |= SkCpu::CRC32; -+ } -+ -+ return features; -+ } -+ -+#elif defined(SK_CPU_ARM64) && defined(__FreeBSD__) -+ #include <machine/armreg.h> -+ #ifndef ID_AA64ISAR0_CRC32_VAL -+ #define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32 -+ #endif -+ -+ static uint32_t read_cpu_features() { -+ uint32_t features = 0; -+ uint64_t id_aa64isar0; -+ -+ id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1); -+ if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) { -+ features |= SkCpu::CRC32; -+ } -+ return features; -+ } -+ - #elif defined(SK_CPU_ARM64) && __has_include(<sys/auxv.h>) - #include <sys/auxv.h> - diff --git a/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c index 28d16e168d91..f13d5cca669f 100644 --- a/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c +++ b/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c @@ -1,6 +1,6 @@ ---- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2023-04-20 13:16:39 UTC +--- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2023-08-17 07:33:31 UTC +++ third_party/sqlite/src/amalgamation/sqlite3.c -@@ -43595,7 +43595,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -43843,7 +43843,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB memset(zBuf, 0, nBuf); randomnessPid = osGetpid(0); #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS) @@ -13,7 +13,7 @@ int fd, got; fd = robust_open("/dev/urandom", O_RDONLY, 0); if( fd<0 ){ -@@ -43610,6 +43615,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -43858,6 +43863,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB robust_close(0, fd, __LINE__); } } diff --git a/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_memory.cpp b/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_memory.cpp index c0d94bdde924..e94f09b05132 100644 --- a/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_memory.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_memory.cpp @@ -1,11 +1,11 @@ ---- third_party/swiftshader/third_party/marl/src/memory.cpp.orig 2022-02-07 13:39:41 UTC +--- third_party/swiftshader/third_party/marl/src/memory.cpp.orig 2023-08-17 07:33:31 UTC +++ third_party/swiftshader/third_party/marl/src/memory.cpp @@ -19,7 +19,7 @@ #include <cstring> --#if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) -+#if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__OpenBSD__) +-#if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__EMSCRIPTEN__) ++#if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__EMSCRIPTEN__) || defined(__OpenBSD__) #include <sys/mman.h> #include <unistd.h> namespace { diff --git a/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp b/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp index e66e5c7a8e2b..2037ea2c16e3 100644 --- a/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp @@ -1,11 +1,11 @@ ---- third_party/swiftshader/third_party/marl/src/thread.cpp.orig 2022-03-25 21:59:56 UTC +--- third_party/swiftshader/third_party/marl/src/thread.cpp.orig 2023-08-17 07:33:31 UTC +++ third_party/swiftshader/third_party/marl/src/thread.cpp -@@ -426,7 +426,7 @@ void Thread::setName(const char* fmt, ...) { +@@ -444,7 +444,7 @@ void Thread::setName(const char* fmt, ...) { pthread_setname_np(name); #elif defined(__FreeBSD__) pthread_set_name_np(pthread_self(), name); --#elif !defined(__Fuchsia__) -+#elif !defined(__Fuchsia__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) +-#elif !defined(__Fuchsia__) && !defined(__EMSCRIPTEN__) ++#elif !defined(__Fuchsia__) && !defined(__EMSCRIPTEN__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) pthread_setname_np(pthread_self(), name); #endif diff --git a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h index a6d4542f555c..bbc7c6ffa68f 100644 --- a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h +++ b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h @@ -1,6 +1,6 @@ ---- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2023-07-16 15:47:57 UTC +--- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2023-08-17 07:33:31 UTC +++ third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h -@@ -300,7 +300,15 @@ static inline char *loader_platform_executable_path(ch +@@ -298,7 +298,15 @@ static inline char *loader_platform_executable_path(ch return buffer; } diff --git a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk__extension__helper.h b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk__extension__helper.h index 5bda17d3467a..dfff064f2d79 100644 --- a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk__extension__helper.h +++ b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk__extension__helper.h @@ -1,6 +1,6 @@ ---- third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h.orig 2023-07-16 15:47:57 UTC +--- third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h.orig 2023-08-17 07:33:31 UTC +++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h -@@ -68,9 +68,9 @@ class APIVersion { +@@ -88,9 +88,9 @@ class APIVersion { bool valid() const { return api_version_ != VVL_UNRECOGNIZED_API_VERSION; } uint32_t value() const { return api_version_; } diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn index 1c5a34127e4f..a08aeda5ac70 100644 --- a/www/chromium/files/patch-third__party_webrtc_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/BUILD.gn.orig 2023-07-16 15:47:57 UTC +--- third_party/webrtc/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ third_party/webrtc/BUILD.gn -@@ -212,6 +212,9 @@ config("common_inherited_config") { +@@ -208,6 +208,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc b/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc index bed9a22723d5..352b84e8a520 100644 --- a/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc +++ b/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc @@ -1,8 +1,8 @@ ---- ui/base/cursor/cursor_factory.cc.orig 2023-03-09 06:31:50 UTC +--- ui/base/cursor/cursor_factory.cc.orig 2023-08-17 07:33:31 UTC +++ ui/base/cursor/cursor_factory.cc @@ -89,7 +89,7 @@ void CursorFactory::ObserveThemeChanges() { - - void CursorFactory::SetDeviceScaleFactor(float scale) {} + NOTIMPLEMENTED(); + } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-ui_base_cursor_cursor__factory.h b/www/chromium/files/patch-ui_base_cursor_cursor__factory.h index 8776e0acf5e4..3d5e7429f3f0 100644 --- a/www/chromium/files/patch-ui_base_cursor_cursor__factory.h +++ b/www/chromium/files/patch-ui_base_cursor_cursor__factory.h @@ -1,6 +1,6 @@ ---- ui/base/cursor/cursor_factory.h.orig 2023-03-09 06:31:50 UTC +--- ui/base/cursor/cursor_factory.h.orig 2023-08-17 07:33:31 UTC +++ ui/base/cursor/cursor_factory.h -@@ -88,7 +88,7 @@ class COMPONENT_EXPORT(UI_BASE_CURSOR) CursorFactory { +@@ -86,7 +86,7 @@ class COMPONENT_EXPORT(UI_BASE_CURSOR) CursorFactory { base::ObserverList<CursorFactoryObserver>::Unchecked observers_; }; 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 0da6425bdb60..071a62fa681d 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/chromium/files/patch-ui_base_ui__base__features.cc @@ -1,4 +1,4 @@ ---- ui/base/ui_base_features.cc.orig 2023-07-16 15:47:57 UTC +--- ui/base/ui_base_features.cc.orig 2023-08-17 07:33:31 UTC +++ ui/base/ui_base_features.cc @@ -206,7 +206,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -500,7 +500,7 @@ ChromeRefresh2023Level GetChromeRefresh2023Level() { +@@ -478,7 +478,7 @@ ChromeRefresh2023Level GetChromeRefresh2023Level() { return level; } diff --git a/www/chromium/files/patch-ui_base_ui__base__features.h b/www/chromium/files/patch-ui_base_ui__base__features.h index f7cbaff92621..1ca94a6515e4 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.h +++ b/www/chromium/files/patch-ui_base_ui__base__features.h @@ -1,6 +1,6 @@ ---- ui/base/ui_base_features.h.orig 2023-07-16 15:47:57 UTC +--- ui/base/ui_base_features.h.orig 2023-08-17 07:33:31 UTC +++ ui/base/ui_base_features.h -@@ -242,7 +242,7 @@ enum class ChromeRefresh2023Level { +@@ -234,7 +234,7 @@ enum class ChromeRefresh2023Level { COMPONENT_EXPORT(UI_BASE_FEATURES) ChromeRefresh2023Level GetChromeRefresh2023Level(); diff --git a/www/chromium/files/patch-ui_base_x_x11__cursor__factory.cc b/www/chromium/files/patch-ui_base_x_x11__cursor__factory.cc index 6c4306770a75..2f843b3f5e9b 100644 --- a/www/chromium/files/patch-ui_base_x_x11__cursor__factory.cc +++ b/www/chromium/files/patch-ui_base_x_x11__cursor__factory.cc @@ -1,4 +1,4 @@ ---- ui/base/x/x11_cursor_factory.cc.orig 2023-01-11 09:17:16 UTC +--- ui/base/x/x11_cursor_factory.cc.orig 2023-08-17 07:33:31 UTC +++ ui/base/x/x11_cursor_factory.cc @@ -13,7 +13,7 @@ #include "ui/gfx/geometry/point.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -60,7 +60,7 @@ scoped_refptr<PlatformCursor> X11CursorFactory::Create +@@ -62,7 +62,7 @@ scoped_refptr<PlatformCursor> X11CursorFactory::Create } void X11CursorFactory::ObserveThemeChanges() { diff --git a/www/chromium/files/patch-ui_base_x_x11__cursor__factory.h b/www/chromium/files/patch-ui_base_x_x11__cursor__factory.h index 4c9a51a505bf..6ce20e2be301 100644 --- a/www/chromium/files/patch-ui_base_x_x11__cursor__factory.h +++ b/www/chromium/files/patch-ui_base_x_x11__cursor__factory.h @@ -1,4 +1,4 @@ ---- ui/base/x/x11_cursor_factory.h.orig 2023-01-11 09:17:16 UTC +--- ui/base/x/x11_cursor_factory.h.orig 2023-08-17 07:33:31 UTC +++ ui/base/x/x11_cursor_factory.h @@ -20,7 +20,7 @@ namespace ui { class X11Cursor; @@ -9,7 +9,7 @@ class LinuxUi; #endif -@@ -59,7 +59,7 @@ class COMPONENT_EXPORT(UI_BASE_X) X11CursorFactory +@@ -60,7 +60,7 @@ class COMPONENT_EXPORT(UI_BASE_X) X11CursorFactory std::map<mojom::CursorType, scoped_refptr<X11Cursor>> default_cursors_; diff --git a/www/chromium/files/patch-ui_color_color__id.h b/www/chromium/files/patch-ui_color_color__id.h index a99d0c1f8d7c..9c667f05363d 100644 --- a/www/chromium/files/patch-ui_color_color__id.h +++ b/www/chromium/files/patch-ui_color_color__id.h @@ -1,6 +1,6 @@ ---- ui/color/color_id.h.orig 2023-07-16 15:47:57 UTC +--- ui/color/color_id.h.orig 2023-08-17 07:33:31 UTC +++ ui/color/color_id.h -@@ -496,7 +496,7 @@ +@@ -509,7 +509,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 bdc865337b13..bcffe144283c 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 2023-05-31 08:12:17 UTC +--- ui/events/event.cc.orig 2023-08-17 07:33:31 UTC +++ ui/events/event.cc -@@ -420,7 +420,7 @@ std::string LocatedEvent::ToString() const { +@@ -427,7 +427,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)) { -@@ -675,7 +675,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const +@@ -676,7 +676,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const return std::make_unique<MouseWheelEvent>(*this); } @@ -18,7 +18,7 @@ // This value matches Windows, Fuchsia WHEEL_DELTA, and (roughly) Firefox on // Linux. // static -@@ -930,7 +930,7 @@ void KeyEvent::InitializeNative() { +@@ -931,7 +931,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 7eae3c130fce..41cacc7d735e 100644 --- a/www/chromium/files/patch-ui_gfx_BUILD.gn +++ b/www/chromium/files/patch-ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gfx/BUILD.gn.orig 2023-07-16 15:47:57 UTC +--- ui/gfx/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ ui/gfx/BUILD.gn -@@ -627,7 +627,7 @@ source_set("memory_buffer_sources") { +@@ -648,7 +648,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/chromium/files/patch-ui_gfx_native__widget__types.h b/www/chromium/files/patch-ui_gfx_native__widget__types.h index 857f948d6779..60d8320e50d7 100644 --- a/www/chromium/files/patch-ui_gfx_native__widget__types.h +++ b/www/chromium/files/patch-ui_gfx_native__widget__types.h @@ -1,6 +1,6 @@ ---- ui/gfx/native_widget_types.h.orig 2023-05-31 08:12:17 UTC +--- ui/gfx/native_widget_types.h.orig 2023-08-17 07:33:31 UTC +++ ui/gfx/native_widget_types.h -@@ -101,7 +101,7 @@ class SkBitmap; +@@ -105,7 +105,7 @@ class SkBitmap; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ extern "C" { struct _AtkObject; using AtkObject = struct _AtkObject; -@@ -221,7 +221,7 @@ using NativeViewAccessible = struct objc_object*; +@@ -223,7 +223,7 @@ using NativeViewAccessible = struct objc_object*; #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-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn index 29656e812cb5..32a773a26f72 100644 --- a/www/chromium/files/patch-ui_gl_BUILD.gn +++ b/www/chromium/files/patch-ui_gl_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gl/BUILD.gn.orig 2023-04-28 17:01:32 UTC +--- ui/gl/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ ui/gl/BUILD.gn -@@ -161,8 +161,6 @@ component("gl") { +@@ -153,8 +153,6 @@ component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] } @@ -9,7 +9,7 @@ all_dependent_configs = [ ":gl_config" ] public_configs = [ "//third_party/khronos:khronos_headers" ] -@@ -179,7 +177,6 @@ component("gl") { +@@ -171,7 +169,6 @@ component("gl") { ] public_deps = [ "//base", @@ -17,7 +17,7 @@ "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -377,7 +374,6 @@ component("gl") { +@@ -369,7 +366,6 @@ component("gl") { data_deps += [ "//third_party/angle:libEGL", "//third_party/angle:libGLESv2", @@ -25,7 +25,7 @@ ] if (enable_swiftshader) { data_deps += [ -@@ -621,7 +617,6 @@ test("gl_unittests") { +@@ -589,7 +585,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc index f3b99aa9c303..ae187b26a166 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2023-07-16 15:47:57 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2023-08-17 07:33:31 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.cc -@@ -516,7 +516,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur +@@ -543,7 +543,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur const bool did_active_change = is_active_ != window_states.is_activated; is_active_ = window_states.is_activated; diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h index 09f420339f3e..dcb3068f27fb 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2023-07-16 15:47:57 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2023-08-17 07:33:31 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.h -@@ -244,7 +244,7 @@ class WaylandToplevelWindow : public WaylandWindow, +@@ -250,7 +250,7 @@ class WaylandToplevelWindow : public WaylandWindow, // Contains the previous state of the window. PlatformWindowState previous_state_ = PlatformWindowState::kUnknown; diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h index c6e41914cdde..5d41b5b2df13 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_window.h.orig 2023-07-16 15:47:57 UTC +--- ui/ozone/platform/wayland/host/wayland_window.h.orig 2023-08-17 07:33:31 UTC +++ ui/ozone/platform/wayland/host/wayland_window.h -@@ -235,7 +235,7 @@ class WaylandWindow : public PlatformWindow, +@@ -236,7 +236,7 @@ class WaylandWindow : public PlatformWindow, bool is_snapped_primary = false; bool is_snapped_secondary = false; bool is_floated = false; diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc index e3398492c094..9f6d0060f505 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc @@ -1,4 +1,4 @@ ---- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2023-05-31 08:12:17 UTC +--- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2023-08-17 07:33:31 UTC +++ ui/ozone/platform/wayland/ozone_platform_wayland.cc @@ -71,7 +71,7 @@ #include "ui/ozone/platform/wayland/host/wayland_cursor_factory.h" @@ -9,7 +9,7 @@ #include "ui/ozone/platform/wayland/host/linux_ui_delegate_wayland.h" #endif -@@ -246,7 +246,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -255,7 +255,7 @@ class OzonePlatformWayland : public OzonePlatform, supported_buffer_formats_ = connection_->buffer_manager_host()->GetSupportedBufferFormats(); @@ -18,7 +18,7 @@ linux_ui_delegate_ = std::make_unique<LinuxUiDelegateWayland>(connection_.get()); #endif -@@ -472,7 +472,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -480,7 +480,7 @@ class OzonePlatformWayland : public OzonePlatform, DrmRenderNodePathFinder path_finder_; #endif diff --git a/www/chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc b/www/chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc index 148a3a69823f..b528762d5700 100644 --- a/www/chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc +++ b/www/chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2023-03-09 06:31:50 UTC +--- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2023-08-17 07:33:31 UTC +++ ui/ozone/platform/x11/ozone_platform_x11.cc -@@ -196,7 +196,7 @@ class OzonePlatformX11 : public OzonePlatform, +@@ -197,7 +197,7 @@ class OzonePlatformX11 : public OzonePlatform, properties->supports_global_application_menus = true; properties->app_modal_dialogs_use_event_blocker = true; properties->fetch_buffer_formats_for_gmb_on_gpu = true; diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc index 73c8c6123d34..293117c096b8 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2023-07-16 15:47:57 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2023-08-17 07:33:31 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -75,7 +75,7 @@ +@@ -78,7 +78,7 @@ #include "base/win/win_util.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/linux/linux_ui.h" #endif -@@ -169,7 +169,7 @@ bool IsControlKeyModifier(int flags) { +@@ -172,7 +172,7 @@ bool IsControlKeyModifier(int flags) { // Control-modified key combination, but we cannot extend it to other platforms // as Control has different meanings and behaviors. // https://crrev.com/2580483002/#msg46 @@ -18,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -715,7 +715,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -737,7 +737,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -27,7 +27,7 @@ auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; if (!handled && linux_ui && -@@ -938,7 +938,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -917,7 +917,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -36,7 +36,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -1935,7 +1935,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1914,7 +1914,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( -@@ -2448,14 +2448,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2427,14 +2427,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 2aedccccd9b0..6dd00c85834a 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 2023-07-16 15:47:57 UTC +--- ui/views/controls/textfield/textfield.h.orig 2023-08-17 07:33:31 UTC +++ ui/views/controls/textfield/textfield.h @@ -43,7 +43,7 @@ #include "ui/views/view.h" @@ -9,7 +9,7 @@ #include <vector> #endif -@@ -448,7 +448,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -451,7 +451,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 18632fcc2cce..0356a4590d74 100644 --- a/www/chromium/files/patch-ui_views_focus_focus__manager.cc +++ b/www/chromium/files/patch-ui_views_focus_focus__manager.cc @@ -1,6 +1,6 @@ ---- ui/views/focus/focus_manager.cc.orig 2023-01-11 09:17:16 UTC +--- ui/views/focus/focus_manager.cc.orig 2023-08-17 07:33:31 UTC +++ ui/views/focus/focus_manager.cc -@@ -625,7 +625,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -577,7 +577,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 -@@ -642,7 +642,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -594,7 +594,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__drag__drop__client__ozone.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc index d2f885150d31..6269e0a09829 100644 --- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2023-04-28 17:01:32 UTC +--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2023-08-17 07:33:31 UTC +++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc -@@ -195,7 +195,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd +@@ -194,7 +194,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd return drag_operation_; } 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 0eaf89f2fc84..6c9ab72163dd 100644 --- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2023-07-16 15:47:57 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2023-08-17 07:33:31 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -44,7 +44,7 @@ +@@ -43,7 +43,7 @@ #include "ui/wm/core/window_util.h" #include "ui/wm/public/window_move_client.h" @@ -9,7 +9,7 @@ #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h" #endif -@@ -259,7 +259,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget: +@@ -264,7 +264,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; -@@ -336,7 +336,7 @@ std::unique_ptr<aura::client::DragDropClient> +@@ -345,7 +345,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); -@@ -1039,7 +1039,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis +@@ -1072,7 +1072,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/chromium/files/patch-ui_views_widget_widget.cc b/www/chromium/files/patch-ui_views_widget_widget.cc index 1ed725c94983..c7bdb65a2dd2 100644 --- a/www/chromium/files/patch-ui_views_widget_widget.cc +++ b/www/chromium/files/patch-ui_views_widget_widget.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/widget.cc.orig 2023-07-16 15:47:57 UTC +--- ui/views/widget/widget.cc.orig 2023-08-17 07:33:31 UTC +++ ui/views/widget/widget.cc -@@ -53,7 +53,7 @@ +@@ -54,7 +54,7 @@ #include "ui/views/window/custom_frame_view.h" #include "ui/views/window/dialog_delegate.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -2048,7 +2048,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2036,7 +2036,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const if (parent_) return parent_->GetNativeTheme(); diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index f7b90a7e9d0a..a103fcc78beb 100644 --- a/www/chromium/files/patch-v8_BUILD.gn +++ b/www/chromium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2023-07-16 15:47:57 UTC +--- v8/BUILD.gn.orig 2023-08-17 07:33:31 UTC +++ v8/BUILD.gn -@@ -1356,6 +1356,14 @@ config("toolchain") { +@@ -1369,6 +1369,14 @@ config("toolchain") { } else if (target_os == "chromeos") { defines += [ "V8_HAVE_TARGET_OS" ] defines += [ "V8_TARGET_OS_CHROMEOS" ] @@ -15,7 +15,19 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -5876,7 +5884,7 @@ v8_component("v8_libbase") { +@@ -2295,6 +2303,11 @@ template("run_mksnapshot") { + # list of builtins with incompatible profiles. + "--abort-on-bad-builtin-profile-data", + ] ++ if (v8_current_cpu == "x86") { ++ args -= [ ++ "--abort-on-bad-builtin-profile-data", ++ ] ++ } + } + + # This is needed to distinguish between generating code for the simulator +@@ -5920,7 +5933,7 @@ v8_component("v8_libbase") { } } @@ -24,7 +36,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -5887,6 +5895,18 @@ v8_component("v8_libbase") { +@@ -5931,6 +5944,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/chromium/files/patch-v8_include_v8-internal.h b/www/chromium/files/patch-v8_include_v8-internal.h index 4ca50ba932c6..f874f8eddaaa 100644 --- a/www/chromium/files/patch-v8_include_v8-internal.h +++ b/www/chromium/files/patch-v8_include_v8-internal.h @@ -1,6 +1,6 @@ ---- v8/include/v8-internal.h.orig 2023-04-28 17:01:32 UTC +--- v8/include/v8-internal.h.orig 2023-08-17 07:33:31 UTC +++ v8/include/v8-internal.h -@@ -173,7 +173,7 @@ using SandboxedPointer_t = Address; +@@ -172,7 +172,7 @@ using SandboxedPointer_t = Address; #ifdef V8_ENABLE_SANDBOX // Size of the sandbox, excluding the guard regions surrounding it. diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc index 900f65a2dcab..3a0fa9896db0 100644 --- a/www/chromium/files/patch-v8_src_api_api.cc +++ b/www/chromium/files/patch-v8_src_api_api.cc @@ -1,4 +1,4 @@ ---- v8/src/api/api.cc.orig 2023-07-16 15:47:57 UTC +--- v8/src/api/api.cc.orig 2023-08-17 07:33:31 UTC +++ v8/src/api/api.cc @@ -143,7 +143,7 @@ #include "src/wasm/wasm-serialization.h" @@ -9,7 +9,7 @@ #include <signal.h> #include <unistd.h> -@@ -6465,7 +6465,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6471,7 +6471,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 89234eb176f4..022539927f3f 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,6 +1,6 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2023-07-16 15:47:57 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2023-08-17 07:33:31 UTC +++ v8/src/base/platform/platform-posix.cc -@@ -53,7 +53,7 @@ +@@ -55,7 +55,7 @@ #if V8_OS_DARWIN #include <mach/mach.h> #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #include <malloc.h> #endif -@@ -71,7 +71,7 @@ +@@ -73,7 +73,7 @@ #include <sys/syscall.h> #endif @@ -18,7 +18,7 @@ #define MAP_ANONYMOUS MAP_ANON #endif -@@ -297,8 +297,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { +@@ -299,8 +299,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { } } @@ -34,7 +34,7 @@ uintptr_t raw_addr; { MutexGuard guard(rng_mutex.Pointer()); -@@ -393,6 +400,7 @@ void* OS::GetRandomMmapAddr() { +@@ -395,6 +402,7 @@ void* OS::GetRandomMmapAddr() { #endif return reinterpret_cast<void*>(raw_addr); } @@ -42,7 +42,7 @@ // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files. #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA -@@ -666,7 +674,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor +@@ -668,7 +676,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor // static bool OS::HasLazyCommits() { @@ -51,12 +51,12 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1243,7 +1251,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1247,7 +1255,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) && \ - !defined(V8_OS_SOLARIS) + !defined(V8_OS_SOLARIS) && !defined(V8_OS_OPENBSD) - // static - Stack::StackSlot Stack::ObtainCurrentThreadStackStart() { + namespace { + #if DEBUG diff --git a/www/chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc b/www/chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc index e7de2368b775..c71655586719 100644 --- a/www/chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc +++ b/www/chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc @@ -1,6 +1,6 @@ ---- v8/src/builtins/x64/builtins-x64.cc.orig 2023-07-16 15:47:57 UTC +--- v8/src/builtins/x64/builtins-x64.cc.orig 2023-08-17 07:33:31 UTC +++ v8/src/builtins/x64/builtins-x64.cc -@@ -43,6 +43,8 @@ namespace internal { +@@ -44,6 +44,8 @@ namespace internal { #define __ ACCESS_MASM(masm) void Builtins::Generate_Adaptor(MacroAssembler* masm, Address address) { @@ -9,7 +9,7 @@ __ LoadAddress(kJavaScriptCallExtraArg1Register, ExternalReference::Create(address)); __ Jump(BUILTIN_CODE(masm->isolate(), AdaptorWithBuiltinExitFrame), -@@ -457,7 +459,7 @@ void Generate_JSEntryVariant(MacroAssembler* masm, Sta +@@ -458,7 +460,7 @@ void Generate_JSEntryVariant(MacroAssembler* masm, Sta // Jump to a faked try block that does the invoke, with a faked catch // block that sets the pending exception. __ jmp(&invoke); @@ -18,7 +18,7 @@ // Store the current pc as the handler offset. It's used later to create the // handler table. -@@ -3801,6 +3803,8 @@ void GenericJSToWasmWrapperHelper(MacroAssembler* masm +@@ -3828,6 +3830,8 @@ void GenericJSToWasmWrapperHelper(MacroAssembler* masm RestoreParentSuspender(masm, rbx, rcx); } __ bind(&suspend); @@ -27,7 +27,17 @@ // No need to process the return value if the stack is suspended, there is a // single 'externref' value (the promise) which doesn't require conversion. -@@ -4165,6 +4169,7 @@ void Builtins::Generate_WasmSuspend(MacroAssembler* ma +@@ -4094,6 +4098,9 @@ void GenericJSToWasmWrapperHelper(MacroAssembler* masm + // thrown exception. + if (stack_switch) { + int catch_handler = __ pc_offset(); ++ ++ __ endbr64(); ++ + // Restore rsp to free the reserved stack slots for the sections. + __ leaq(rsp, MemOperand(rbp, kLastSpillOffset)); + +@@ -4361,6 +4368,7 @@ void Builtins::Generate_WasmSuspend(MacroAssembler* ma LoadJumpBuffer(masm, jmpbuf, true); __ Trap(); __ bind(&resume); @@ -35,7 +45,7 @@ __ LeaveFrame(StackFrame::STACK_SWITCH); __ ret(0); } -@@ -4310,6 +4315,7 @@ void Generate_WasmResumeHelper(MacroAssembler* masm, w +@@ -4508,6 +4516,7 @@ void Generate_WasmResumeHelper(MacroAssembler* masm, w } __ Trap(); __ bind(&suspend); diff --git a/www/chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc b/www/chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc index d4800c461199..72cbbc8727e4 100644 --- a/www/chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc +++ b/www/chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc @@ -1,4 +1,4 @@ ---- v8/src/codegen/x64/macro-assembler-x64.cc.orig 2023-07-16 15:47:57 UTC +--- v8/src/codegen/x64/macro-assembler-x64.cc.orig 2023-08-17 07:33:31 UTC +++ v8/src/codegen/x64/macro-assembler-x64.cc @@ -50,6 +50,8 @@ Operand StackArgumentsAccessor::GetArgumentOperand(int return Operand(rsp, kPCOnStackSize + index * kSystemPointerSize); @@ -9,7 +9,7 @@ void MacroAssembler::Load(Register destination, ExternalReference source) { if (root_array_available_ && options().enable_root_relative_access) { intptr_t delta = RootRegisterOffsetForExternalReference(isolate(), source); -@@ -1874,7 +1876,7 @@ void MacroAssembler::Switch(Register scratch, Register +@@ -1947,7 +1949,7 @@ void MacroAssembler::Switch(Register scratch, Register cmpq(reg, Immediate(num_labels)); j(above_equal, &fallthrough); leaq(table, MemOperand(&jump_table)); diff --git a/www/chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h b/www/chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h index 87499a1ce214..c06f98f9441c 100644 --- a/www/chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h +++ b/www/chromium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h @@ -1,6 +1,6 @@ ---- v8/src/codegen/x64/macro-assembler-x64.h.orig 2023-07-16 15:47:57 UTC +--- v8/src/codegen/x64/macro-assembler-x64.h.orig 2023-08-17 07:33:31 UTC +++ v8/src/codegen/x64/macro-assembler-x64.h -@@ -613,11 +613,14 @@ class V8_EXPORT_PRIVATE MacroAssembler +@@ -625,11 +625,14 @@ class V8_EXPORT_PRIVATE MacroAssembler // Define a function entrypoint. This doesn't emit any code for this // architecture, as control-flow integrity is not supported for it. diff --git a/www/chromium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc b/www/chromium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc deleted file mode 100644 index 2e10a8b29918..000000000000 --- a/www/chromium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- v8/src/compiler/backend/ia32/instruction-selector-ia32.cc.orig 2023-07-16 15:47:57 UTC -+++ v8/src/compiler/backend/ia32/instruction-selector-ia32.cc -@@ -3043,6 +3043,7 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node - Emit(opcode, 1, &dst, input_count, inputs, temp_count, temps); - } - -+#if V8_ENABLE_WEBASSEMBLY - void InstructionSelector::VisitI8x16Swizzle(Node* node) { - InstructionCode op = kIA32I8x16Swizzle; - -@@ -3096,6 +3097,9 @@ void VisitMinOrMax(InstructionSelector* selector, Node - void InstructionSelector::VisitF32x4Pmin(Node* node) { - VisitMinOrMax(this, node, kIA32Minps, true); - } -+#else -+void InstructionSelector::VisitI8x16Swizzle(Node* node) { UNREACHABLE(); } -+#endif // V8_ENABLE_WEBASSEMBLY - - void InstructionSelector::VisitF32x4Pmax(Node* node) { - VisitMinOrMax(this, node, kIA32Maxps, true); diff --git a/www/chromium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc b/www/chromium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc index 521907fe890c..bda8d92036fe 100644 --- a/www/chromium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc +++ b/www/chromium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc @@ -1,6 +1,6 @@ ---- v8/src/compiler/backend/x64/code-generator-x64.cc.orig 2023-07-16 15:47:57 UTC +--- v8/src/compiler/backend/x64/code-generator-x64.cc.orig 2023-08-17 07:33:31 UTC +++ v8/src/compiler/backend/x64/code-generator-x64.cc -@@ -6576,7 +6576,7 @@ void CodeGenerator::AssembleArchTableSwitch(Instructio +@@ -6594,7 +6594,7 @@ void CodeGenerator::AssembleArchTableSwitch(Instructio __ cmpl(input, Immediate(case_count)); __ j(above_equal, GetLabel(i.InputRpo(1))); __ leaq(kScratchRegister, Operand(table)); diff --git a/www/chromium/files/patch-v8_src_execution_isolate.cc b/www/chromium/files/patch-v8_src_execution_isolate.cc index 6bd4abc0472e..c5962154f54f 100644 --- a/www/chromium/files/patch-v8_src_execution_isolate.cc +++ b/www/chromium/files/patch-v8_src_execution_isolate.cc @@ -1,6 +1,6 @@ ---- v8/src/execution/isolate.cc.orig 2023-08-04 12:03:57 UTC +--- v8/src/execution/isolate.cc.orig 2023-08-17 07:33:31 UTC +++ v8/src/execution/isolate.cc -@@ -146,6 +146,10 @@ +@@ -147,6 +147,10 @@ #include "src/execution/simulator-base.h" #endif @@ -11,7 +11,7 @@ extern "C" const uint8_t v8_Default_embedded_blob_code_[]; extern "C" uint32_t v8_Default_embedded_blob_code_size_; extern "C" const uint8_t v8_Default_embedded_blob_data_[]; -@@ -3958,6 +3962,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -3932,6 +3936,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { uint32_t code_size = DefaultEmbeddedBlobCodeSize(); const uint8_t* data = DefaultEmbeddedBlobData(); uint32_t data_size = DefaultEmbeddedBlobDataSize(); diff --git a/www/chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h b/www/chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h index 84bee1cd371e..48e0f39169ab 100644 --- a/www/chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h +++ b/www/chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h @@ -1,6 +1,6 @@ ---- v8/src/maglev/x64/maglev-assembler-x64-inl.h.orig 2023-07-16 15:47:57 UTC +--- v8/src/maglev/x64/maglev-assembler-x64-inl.h.orig 2023-08-17 07:33:31 UTC +++ v8/src/maglev/x64/maglev-assembler-x64-inl.h -@@ -207,7 +207,10 @@ void MaglevAssembler::PushReverse(T... vals) { +@@ -226,7 +226,10 @@ void MaglevAssembler::PushReverse(T... vals) { detail::PushAllHelper<T...>::PushReverse(this, vals...); } diff --git a/www/chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64.cc b/www/chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64.cc index 1e3e0be02c47..122e91b094f2 100644 --- a/www/chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64.cc +++ b/www/chromium/files/patch-v8_src_maglev_x64_maglev-assembler-x64.cc @@ -1,11 +1,16 @@ ---- v8/src/maglev/x64/maglev-assembler-x64.cc.orig 2023-07-16 15:47:57 UTC +--- v8/src/maglev/x64/maglev-assembler-x64.cc.orig 2023-08-17 07:33:31 UTC +++ v8/src/maglev/x64/maglev-assembler-x64.cc -@@ -636,8 +636,10 @@ void MaglevAssembler::TryTruncateDoubleToInt32(Registe - void MaglevAssembler::Prologue(Graph* graph) { - BailoutIfDeoptimized(rbx); +@@ -553,13 +553,15 @@ void MaglevAssembler::TryChangeFloat64ToIndex(Register + } + void MaglevAssembler::Prologue(Graph* graph) { + CodeEntry(); + + if (!graph->is_osr()) { + BailoutIfDeoptimized(rbx); + } + + CHECK_IMPLIES(graph->is_osr(), !graph->has_recursive_calls()); if (graph->has_recursive_calls()) { - bind(code_gen_state()->entry_label()); + BindJumpTarget(code_gen_state()->entry_label()); diff --git a/www/chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc b/www/chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc index 2230a800c3fa..32969fc9f317 100644 --- a/www/chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc +++ b/www/chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc @@ -1,4 +1,4 @@ ---- v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc.orig 2023-05-31 08:12:17 UTC +--- v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc.orig 2023-08-17 07:33:31 UTC +++ v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc @@ -9,6 +9,10 @@ @@ -11,29 +11,31 @@ namespace v8 { namespace internal { -@@ -35,6 +39,8 @@ const char* DirectiveAsString(DataDirective directive) +@@ -35,6 +39,10 @@ const char* DirectiveAsString(DataDirective directive) void PlatformEmbeddedFileWriterGeneric::SectionText() { if (target_os_ == EmbeddedTargetOs::kChromeOS) { fprintf(fp_, ".section .text.hot.embedded\n"); ++#if !defined(V8_TARGET_ARCH_IA32) + } else if (target_os_ == EmbeddedTargetOs::kOpenBSD) { + fprintf(fp_, ".section .openbsd.mutable,\"a\"\n"); ++#endif } else { fprintf(fp_, ".section .text\n"); } -@@ -66,6 +72,8 @@ void PlatformEmbeddedFileWriterGeneric::AlignToCodeAli +@@ -66,6 +74,8 @@ void PlatformEmbeddedFileWriterGeneric::AlignToCodeAli // On these architectures and platforms, we remap the builtins, so need these // to be aligned on a page boundary. fprintf(fp_, ".balign 4096\n"); -+#elif V8_OS_OPENBSD ++#elif defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32) + fprintf(fp_, ".balign %d\n", PAGE_SIZE); #elif V8_TARGET_ARCH_X64 // On x64 use 64-bytes code alignment to allow 64-bytes loop header alignment. static_assert(64 >= kCodeAlignment); -@@ -86,6 +94,8 @@ void PlatformEmbeddedFileWriterGeneric::AlignToPageSiz +@@ -86,6 +96,8 @@ void PlatformEmbeddedFileWriterGeneric::AlignToPageSiz (V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_ARM64) // Since the builtins are remapped, need to pad until the next page boundary. fprintf(fp_, ".balign 4096\n"); -+#elif V8_OS_OPENBSD ++#elif defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32) + fprintf(fp_, ".balign %d\n", PAGE_SIZE); #endif } 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 8e27866c0a44..d73292fc158d 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 2023-04-28 17:01:32 UTC +--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2023-08-17 07:33:31 UTC +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h @@ -419,7 +419,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst } @@ -18,7 +18,7 @@ StoreType type, LiftoffRegList pinned, uint32_t* protected_store_pc, bool /* is_store_mem */, bool /* i64_offset */) { -@@ -568,7 +568,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist +@@ -579,7 +579,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist } void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr, @@ -27,7 +27,7 @@ LoadType type, LiftoffRegList /* pinned */, bool /* i64_offset */) { if (type.value() != LoadType::kI64Load) { -@@ -588,7 +588,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, +@@ -599,7 +599,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, } void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg, @@ -36,7 +36,7 @@ StoreType type, LiftoffRegList pinned, bool /* i64_offset */) { DCHECK_NE(offset_reg, no_reg); -@@ -658,7 +658,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; +@@ -669,7 +669,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; inline void AtomicAddOrSubOrExchange32(LiftoffAssembler* lasm, Binop binop, Register dst_addr, Register offset_reg, @@ -45,7 +45,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type) { DCHECK_EQ(value, result); -@@ -725,7 +725,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble +@@ -736,7 +736,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble } inline void AtomicBinop32(LiftoffAssembler* lasm, Binop op, Register dst_addr, @@ -54,7 +54,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type) { DCHECK_EQ(value, result); -@@ -837,7 +837,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino +@@ -848,7 +848,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino } inline void AtomicBinop64(LiftoffAssembler* lasm, Binop op, Register dst_addr, @@ -63,7 +63,7 @@ LiftoffRegister value, LiftoffRegister result) { // We need {ebx} here, which is the root register. As the root register it // needs special treatment. As we use {ebx} directly in the code below, we -@@ -929,7 +929,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino +@@ -940,7 +940,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino } // namespace liftoff void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg, @@ -72,7 +72,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -943,7 +943,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re +@@ -954,7 +954,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re } void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg, @@ -81,7 +81,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -956,7 +956,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re +@@ -967,7 +967,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re } void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg, @@ -90,7 +90,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -970,7 +970,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re +@@ -981,7 +981,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re } void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg, @@ -99,7 +99,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -984,7 +984,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg +@@ -995,7 +995,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg } void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg, @@ -108,7 +108,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -998,7 +998,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re +@@ -1009,7 +1009,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re } void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg, @@ -117,7 +117,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type, bool /* i64_offset */) { -@@ -1013,7 +1013,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add +@@ -1024,7 +1024,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 f80507d8ded0..443b0ca37eb4 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,6 +1,6 @@ ---- weblayer/browser/content_browser_client_impl.cc.orig 2023-02-08 09:03:45 UTC +--- weblayer/browser/content_browser_client_impl.cc.orig 2023-08-17 07:33:31 UTC +++ weblayer/browser/content_browser_client_impl.cc -@@ -155,7 +155,7 @@ +@@ -154,7 +154,7 @@ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ @@ -9,7 +9,7 @@ #include "content/public/common/content_descriptors.h" #endif -@@ -1006,7 +1006,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe +@@ -1022,7 +1022,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) || \ diff --git a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h index c829f763d162..0dcbd80299c6 100644 --- a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h +++ b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h @@ -1,6 +1,6 @@ ---- weblayer/browser/content_browser_client_impl.h.orig 2023-01-11 09:17:16 UTC +--- weblayer/browser/content_browser_client_impl.h.orig 2023-08-17 07:33:31 UTC +++ weblayer/browser/content_browser_client_impl.h -@@ -177,7 +177,7 @@ class ContentBrowserClientImpl : public content::Conte +@@ -183,7 +183,7 @@ class ContentBrowserClientImpl : public content::Conte // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ |