diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2023-02-10 08:37:57 +0100 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2023-02-10 21:53:54 +0100 |
| commit | 230cf3bad636e34e916bcba192aa5934d8fc5211 (patch) | |
| tree | c18f56e8aff6ad911a04cb0b864f04b575198fec | |
| parent | security/vuxml: add www/*chromium < 110.0.5481.77 (diff) | |
www/chromium: update to 110.0.5481.77
Approved by: rene (mentor)
Security: https://vuxml.freebsd.org/freebsd/310ca30e-a951-11ed-8314-a8a1599412c6.html
367 files changed, 2193 insertions, 1699 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index b706f6936c71..c1ab5e8da19a 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,5 +1,5 @@ PORTNAME= chromium -PORTVERSION= 109.0.5414.119 +PORTVERSION= 110.0.5481.77 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:external @@ -39,7 +39,9 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libspeex.so:audio/speex \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ + libepoll-shim.so:devel/libepoll-shim \ libevent.so:devel/libevent \ + libffi.so:devel/libffi \ libicuuc.so:devel/icu \ libjsoncpp.so:devel/jsoncpp \ libpci.so:devel/libpci \ @@ -115,9 +117,8 @@ GN_ARGS+= clang_use_chrome_plugins=false \ use_sysroot=false \ use_system_freetype=false \ use_system_harfbuzz=true \ + use_system_libffi=true \ use_system_libjpeg=true \ - use_system_libwayland=true \ - use_system_wayland_scanner=true \ use_udev=false \ extra_cxxflags="${CXXFLAGS}" \ extra_ldflags="${LDFLAGS}" diff --git a/www/chromium/distinfo b/www/chromium/distinfo index bb7348a30c7c..6bde1433758b 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1674714013 -SHA256 (chromium-109.0.5414.119.tar.xz) = cbcdef5ee71acb53790ded3adef86871812b46e9f208dce8ec3f8ab04958be2d -SIZE (chromium-109.0.5414.119.tar.xz) = 1747968612 -SHA256 (chrome-linux-109.0.5414.119-llvm13.profdata.tar.xz) = 0cf5a50597b0292127cdbee637ece41017b009a501e92bf73ce82bfe30124175 -SIZE (chrome-linux-109.0.5414.119-llvm13.profdata.tar.xz) = 26305372 -SHA256 (chromium-109.0.5414.119-testdata.tar.xz) = 8781e0dde6b4ec48a2863cf14911d6d6e645b949134c9743e38e9522b889704f -SIZE (chromium-109.0.5414.119-testdata.tar.xz) = 264800856 +TIMESTAMP = 1675848792 +SHA256 (chromium-110.0.5481.77.tar.xz) = e348ab2dc4311083e729d714a81e95dd9db108ff71437dde451c97ac939881ce +SIZE (chromium-110.0.5481.77.tar.xz) = 1703346520 +SHA256 (chrome-linux-110.0.5481.77-llvm13.profdata.tar.xz) = 8b88097483df4ff55aae1a7c59eabb202961e943d1b4ac028fc474c98cc11ddd +SIZE (chrome-linux-110.0.5481.77-llvm13.profdata.tar.xz) = 26199548 +SHA256 (chromium-110.0.5481.77-testdata.tar.xz) = a66d415305285c71cefb26a276903abba1de94327424982745719c7b13cb9a64 +SIZE (chromium-110.0.5481.77-testdata.tar.xz) = 263374384 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 ec8d032b9a74..cb1d395e4284 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2023-01-11 09:17:16 UTC +--- BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ BUILD.gn @@ -60,7 +60,7 @@ declare_args() { root_extra_deps = [] @@ -17,7 +17,7 @@ "//net:net_unittests", "//sandbox:sandbox_unittests", "//services:services_unittests", -@@ -434,7 +433,7 @@ group("gn_all") { +@@ -425,7 +424,7 @@ group("gn_all") { ] } @@ -26,8 +26,8 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -637,6 +636,15 @@ group("gn_all") { - deps += [ "//gpu/tools/compositor_model_bench" ] +@@ -624,6 +623,15 @@ group("gn_all") { + } } + if (is_bsd) { @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:crash_inspector", -@@ -685,7 +693,7 @@ group("gn_all") { +@@ -672,7 +680,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)" ] } -@@ -1115,7 +1123,7 @@ if (!is_ios) { +@@ -1094,7 +1102,7 @@ if (!is_ios) { ] } @@ -60,7 +60,7 @@ # WPT Webdriver tests runner # chrome/test/chromedriver/test/run_webdriver_tests.py script_test("webdriver_wpt_tests") { -@@ -1211,7 +1219,7 @@ if (!is_ios) { +@@ -1190,7 +1198,7 @@ if (!is_ios) { 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)" ] } -@@ -1220,7 +1228,7 @@ if (!is_ios) { +@@ -1199,7 +1207,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -78,7 +78,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1660,7 +1668,7 @@ group("chromium_builder_perf") { +@@ -1664,7 +1672,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 91055cebe9c7..4878977ee27c 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2023-01-11 09:17:16 UTC +--- base/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ base/BUILD.gn -@@ -167,7 +167,7 @@ buildflag_header("ios_cronet_buildflags") { +@@ -162,7 +162,7 @@ buildflag_header("ios_cronet_buildflags") { flags = [ "CRONET_BUILD=$is_cronet_build" ] } @@ -9,7 +9,7 @@ buildflag_header("message_pump_buildflags") { header = "message_pump_buildflags.h" header_dir = "base/message_loop" -@@ -1059,7 +1059,7 @@ mixed_component("base") { +@@ -1052,7 +1052,7 @@ component("base") { "timer/hi_res_timer_manager_posix.cc", ] @@ -18,7 +18,7 @@ sources += [ "profiler/stack_base_address_posix.cc", "profiler/stack_base_address_posix.h", -@@ -1070,6 +1070,14 @@ mixed_component("base") { +@@ -1063,6 +1063,14 @@ component("base") { "profiler/thread_delegate_posix.h", ] } @@ -33,7 +33,7 @@ } if (is_win) { -@@ -1569,11 +1577,23 @@ mixed_component("base") { +@@ -1550,11 +1558,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. @@ -58,7 +58,7 @@ if (use_allocator_shim) { sources += [ "allocator/partition_allocator/shim/allocator_shim.cc", -@@ -1601,7 +1621,7 @@ mixed_component("base") { +@@ -1582,7 +1602,7 @@ component("base") { ] configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ] } @@ -67,7 +67,7 @@ sources += [ "allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h", "allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h", -@@ -1655,7 +1675,7 @@ mixed_component("base") { +@@ -1623,7 +1643,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -76,7 +76,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2238,6 +2258,41 @@ mixed_component("base") { +@@ -2211,6 +2231,39 @@ component("base") { } } @@ -84,7 +84,6 @@ + sources -= [ + "files/file_path_watcher_inotify.cc", + "files/scoped_file_linux.cc", -+ "process/memory_linux.cc", + "process/process_linux.cc", + "system/sys_info_linux.cc", + "process/process_iterator_linux.cc", @@ -92,7 +91,6 @@ + "process/process_handle_linux.cc" + ] + sources += [ -+ "process/memory_stubs.cc", + "files/file_path_watcher_kqueue.cc", + "files/file_path_watcher_kqueue.h", + "files/file_path_watcher_bsd.cc", @@ -118,7 +116,7 @@ # iOS if (is_ios) { sources -= [ -@@ -2335,7 +2390,7 @@ mixed_component("base") { +@@ -2306,7 +2359,7 @@ component("base") { } if (dep_libevent) { @@ -127,7 +125,7 @@ } if (use_libevent) { -@@ -3605,7 +3660,7 @@ test("base_unittests") { +@@ -3560,7 +3613,7 @@ test("base_unittests") { } } @@ -136,7 +134,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3651,7 +3706,7 @@ test("base_unittests") { +@@ -3606,7 +3659,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -145,7 +143,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3662,7 +3717,7 @@ test("base_unittests") { +@@ -3617,7 +3670,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -154,7 +152,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3869,7 +3924,7 @@ test("base_unittests") { +@@ -3827,7 +3880,7 @@ test("base_unittests") { } } diff --git a/www/chromium/files/patch-base_allocator_dispatcher_tls.h b/www/chromium/files/patch-base_allocator_dispatcher_tls.h new file mode 100644 index 000000000000..6613880dca00 --- /dev/null +++ b/www/chromium/files/patch-base_allocator_dispatcher_tls.h @@ -0,0 +1,11 @@ +--- base/allocator/dispatcher/tls.h.orig 2023-02-08 09:03:45 UTC ++++ base/allocator/dispatcher/tls.h +@@ -51,7 +51,7 @@ struct BASE_EXPORT MMapAllocator { + partition_alloc::PartitionPageSize(); + #elif BUILDFLAG(IS_APPLE) + constexpr static size_t AllocationChunkSize = 16384; +-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) ++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) + constexpr static size_t AllocationChunkSize = 16384; + #else + constexpr static size_t AllocationChunkSize = 4096; 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 fca7dd70ba9a..9578fcb4098e 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,8 +1,8 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-01-11 09:17:16 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-02-08 09:03:45 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -370,8 +370,12 @@ bool TryRecommitSystemPagesInternal( - +@@ -371,8 +371,12 @@ bool TryRecommitSystemPagesInternal( void DiscardSystemPagesInternal(uintptr_t address, size_t length) { + #if !BUILDFLAG(IS_NACL) void* ptr = reinterpret_cast<void*>(address); -#if BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc index 3ab5011448a8..7bf33397cb03 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-01-11 09:17:16 UTC +--- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-02-08 09:03:45 UTC +++ base/allocator/partition_allocator/partition_address_space.cc -@@ -432,7 +432,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting() +@@ -440,7 +440,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting() } #endif 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 bfe6c0e62688..336fa065c293 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni @@ -1,7 +1,7 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-01-11 09:17:16 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-02-08 09:03:45 UTC +++ base/allocator/partition_allocator/partition_alloc.gni -@@ -121,7 +121,7 @@ assert( - "Missing dangling pointer checks feature for its performance experiment") +@@ -200,7 +200,7 @@ assert(!use_asan_unowned_ptr || is_asan, + "AsanUnownedPtr requires AddressSanitizer") declare_args() { - enable_pkeys = is_linux && target_cpu == "x64" diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h index 366fa7eabff6..662c25d52366 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-01-11 09:17:16 UTC +--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-02-08 09:03:45 UTC +++ base/allocator/partition_allocator/partition_alloc_config.h @@ -84,7 +84,7 @@ static_assert(sizeof(void*) != 8, ""); @@ -9,7 +9,7 @@ #define PA_HAS_LINUX_KERNEL #endif -@@ -216,7 +216,7 @@ constexpr bool kUseLazyCommit = false; +@@ -220,7 +220,7 @@ constexpr bool kUseLazyCommit = false; // On these platforms, lock all the partitions before fork(), and unlock after. // This may be required on more platforms in the future. @@ -18,12 +18,12 @@ #define PA_HAS_ATFORK_HANDLER #endif -@@ -257,7 +257,7 @@ constexpr bool kUseLazyCommit = false; +@@ -264,7 +264,7 @@ constexpr bool kUseLazyCommit = false; // // Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to // larger slot spans. -#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) +#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD) #define PA_PREFER_SMALLER_SLOT_SPANS - #endif // BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) + #endif diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h index b779843de3d3..62a3285219aa 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-01-11 09:17:16 UTC +--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-02-08 09:03:45 UTC +++ base/allocator/partition_allocator/partition_alloc_constants.h @@ -91,7 +91,7 @@ PartitionPageShift() { return 18; // 256 KiB @@ -9,12 +9,12 @@ PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t PartitionPageShift() { return PageAllocationGranularityShift() + 2; -@@ -274,7 +274,7 @@ constexpr size_t kNumPools = 3; - // Special-case Android and iOS, which incur test failures with larger - // pools. Regardless, allocating >8GiB with malloc() on these platforms is - // unrealistic as of 2022. --#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) -+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) +@@ -278,7 +278,7 @@ constexpr size_t kNumPools = 3; + // When pointer compression is enabled, we cannot use large pools (at most + // 8GB for each of the glued pools). + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \ +- defined(PA_POINTER_COMPRESSION) ++ defined(PA_POINTER_COMPRESSION) || BUILDFLAG(IS_BSD) constexpr size_t kPoolMaxSize = 8 * kGiB; #else constexpr size_t kPoolMaxSize = 16 * kGiB; diff --git a/www/chromium/files/patch-base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_debug_stack__trace__posix.cc index f6c9f92d1871..89b1d40c7ff3 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_posix.cc.orig 2022-10-24 13:33:33 UTC +--- base/debug/stack_trace_posix.cc.orig 2023-02-08 09:03:45 UTC +++ base/debug/stack_trace_posix.cc @@ -39,7 +39,7 @@ #include <AvailabilityMacros.h> @@ -9,7 +9,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -699,6 +699,9 @@ class SandboxSymbolizeHelper { +@@ -714,6 +714,9 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -19,7 +19,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -716,6 +719,7 @@ class SandboxSymbolizeHelper { +@@ -731,6 +734,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; @@ -27,7 +27,7 @@ } // Opens all object files and caches their file descriptors. -@@ -872,7 +876,7 @@ size_t CollectStackTrace(void** trace, size_t count) { +@@ -887,7 +891,7 @@ size_t CollectStackTrace(void** trace, size_t count) { // If we do not have unwind tables, then try tracing using frame pointers. return base::debug::TraceStackFramePointers(const_cast<const void**>(trace), count, 0); diff --git a/www/chromium/files/patch-base_files_file__path__watcher.h b/www/chromium/files/patch-base_files_file__path__watcher.h new file mode 100644 index 000000000000..b40511d0e03e --- /dev/null +++ b/www/chromium/files/patch-base_files_file__path__watcher.h @@ -0,0 +1,11 @@ +--- base/files/file_path_watcher.h.orig 2023-02-08 09:03:45 UTC ++++ base/files/file_path_watcher.h +@@ -59,7 +59,7 @@ class BASE_EXPORT FilePathWatcher { + Type type = Type::kNonRecursive; + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + // The callback will return the full path to a changed file instead of + // the watched path supplied as |path| when Watch is called. + // So the full path can be different from the watched path when a folder is diff --git a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc index 04f15603fea3..00e9c1bd57b2 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc +++ b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc @@ -1,15 +1,15 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2022-09-24 10:57:32 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2023-02-08 09:03:45 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -498,7 +498,7 @@ TEST_F(FilePathWatcherTest, MAYBE_WatchDirectory) { +@@ -521,7 +521,7 @@ TEST_F(FilePathWatcherTest, MAYBE_WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; - ASSERT_TRUE(WaitForEvents()); + ASSERT_TRUE(WaitForEvent()); -#if !BUILDFLAG(IS_APPLE) +#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) // Mac implementation does not detect files modified in a directory. ASSERT_TRUE(WriteFile(file1, "content v2")); VLOG(1) << "Waiting for file1 modification"; -@@ -1118,7 +1118,7 @@ enum Permission { +@@ -1345,7 +1345,7 @@ enum Permission { Execute }; @@ -18,7 +18,7 @@ bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -1149,7 +1149,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -1376,7 +1376,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi } #endif // BUILDFLAG(IS_APPLE) diff --git a/www/chromium/files/patch-base_functional_unretained__traits.h b/www/chromium/files/patch-base_functional_unretained__traits.h new file mode 100644 index 000000000000..c5c43c9beda5 --- /dev/null +++ b/www/chromium/files/patch-base_functional_unretained__traits.h @@ -0,0 +1,11 @@ +--- base/functional/unretained_traits.h.orig 2023-02-08 09:03:45 UTC ++++ base/functional/unretained_traits.h +@@ -130,7 +130,7 @@ struct TypeSupportsUnretained { + // official builds, and then in non-test code as well. + #if !defined(UNIT_TEST) && !defined(OFFICIAL_BUILD) + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ +- defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS) ++ || BUILDFLAGS(IS_BSD) || defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS) + static_assert(IsCompleteTypeV<T> || + IsIncompleteTypeSafeForUnretained<std::remove_cv_t<T>>, + "T must be fully defined."); diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc index a6c32d7b2586..c5c67447e46b 100644 --- a/www/chromium/files/patch-base_i18n_icu__util.cc +++ b/www/chromium/files/patch-base_i18n_icu__util.cc @@ -1,6 +1,6 @@ ---- base/i18n/icu_util.cc.orig 2022-11-30 08:12:58 UTC +--- base/i18n/icu_util.cc.orig 2023-02-08 09:03:45 UTC +++ base/i18n/icu_util.cc -@@ -52,7 +52,7 @@ +@@ -51,7 +51,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" #endif @@ -9,7 +9,7 @@ BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -343,7 +343,7 @@ void InitializeIcuTimeZone() { +@@ -340,7 +340,7 @@ void InitializeIcuTimeZone() { FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); diff --git a/www/chromium/files/patch-base_logging__unittest.cc b/www/chromium/files/patch-base_logging__unittest.cc index b792452342c0..bb506f496022 100644 --- a/www/chromium/files/patch-base_logging__unittest.cc +++ b/www/chromium/files/patch-base_logging__unittest.cc @@ -1,4 +1,4 @@ ---- base/logging_unittest.cc.orig 2022-06-17 14:20:10 UTC +--- base/logging_unittest.cc.orig 2023-02-08 09:03:45 UTC +++ base/logging_unittest.cc @@ -32,7 +32,7 @@ #include "base/posix/eintr_wrapper.h" @@ -9,7 +9,7 @@ #include <ucontext.h> #endif -@@ -574,14 +574,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -575,14 +575,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo // need the arch-specific boilerplate below, which is inspired by breakpad. // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. uintptr_t crash_addr = 0; diff --git a/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc b/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc index 558d0e7c7b15..8cba2dd98b4d 100644 --- a/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc +++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc @@ -1,4 +1,4 @@ ---- base/memory/platform_shared_memory_region_posix.cc.orig 2022-05-19 14:06:27 UTC +--- base/memory/platform_shared_memory_region_posix.cc.orig 2023-02-08 09:03:45 UTC +++ base/memory/platform_shared_memory_region_posix.cc @@ -55,7 +55,7 @@ bool CheckFDAccessMode(int fd, int expected_mode) { @@ -9,7 +9,7 @@ // static ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { PlatformSharedMemoryRegion region = -@@ -171,7 +171,7 @@ bool PlatformSharedMemoryRegion::ConvertToUnsafe() { +@@ -168,7 +168,7 @@ bool PlatformSharedMemoryRegion::ConvertToUnsafe() { // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, size_t size @@ -18,7 +18,7 @@ , bool executable #endif -@@ -200,7 +200,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: +@@ -197,7 +197,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: // flag. FilePath directory; if (!GetShmemTempDir( diff --git a/www/chromium/files/patch-base_process_memory.cc b/www/chromium/files/patch-base_process_memory.cc deleted file mode 100644 index fd74ec1fb517..000000000000 --- a/www/chromium/files/patch-base_process_memory.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/process/memory.cc.orig 2023-01-11 09:17:16 UTC -+++ base/process/memory.cc -@@ -28,7 +28,7 @@ namespace base { - // Defined in memory_mac.mm for macOS + use_partition_alloc_as_malloc=false. - // In case of use_partition_alloc_as_malloc=true, no need to route the call to - // the system default calloc of macOS. --#if !BUILDFLAG(IS_APPLE) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) -+#if (!BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) - - bool UncheckedCalloc(size_t num_items, size_t size, void** result) { - const size_t alloc_size = num_items * size; diff --git a/www/chromium/files/patch-base_process_memory__linux.cc b/www/chromium/files/patch-base_process_memory__linux.cc new file mode 100644 index 000000000000..6b062b4e6f30 --- /dev/null +++ b/www/chromium/files/patch-base_process_memory__linux.cc @@ -0,0 +1,44 @@ +--- base/process/memory_linux.cc.orig 2023-02-08 09:03:45 UTC ++++ base/process/memory_linux.cc +@@ -20,6 +20,7 @@ + + namespace base { + ++#if !BUILDFLAG(IS_BSD) + namespace { + + void ReleaseReservationOrTerminate() { +@@ -29,12 +30,14 @@ void ReleaseReservationOrTerminate() { + } + + } // namespace ++#endif + + void EnableTerminationOnHeapCorruption() { + // On Linux, there nothing to do AFAIK. + } + + void EnableTerminationOnOutOfMemory() { ++#if !BUILDFLAG(IS_BSD) + // Set the new-out of memory handler. + std::set_new_handler(&ReleaseReservationOrTerminate); + // If we're using glibc's allocator, the above functions will override +@@ -43,8 +46,10 @@ void EnableTerminationOnOutOfMemory() { + #if BUILDFLAG(USE_ALLOCATOR_SHIM) + allocator_shim::SetCallNewHandlerOnMallocFailure(true); + #endif ++#endif + } + ++#if !BUILDFLAG(IS_BSD) + // ScopedAllowBlocking() has private constructor and it can only be used in + // friend classes/functions. Declaring a class is easier in this situation to + // avoid adding more dependency to thread_restrictions.h because of the +@@ -104,6 +109,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr + bool AdjustOOMScore(ProcessId process, int score) { + return AdjustOOMScoreHelper::AdjustOOMScore(process, score); + } ++#endif + + bool UncheckedMalloc(size_t size, void** result) { + #if BUILDFLAG(USE_ALLOCATOR_SHIM) diff --git a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc index 7b890f85feb8..0a27923bb7ab 100644 --- a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc +++ b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc @@ -1,4 +1,4 @@ ---- base/profiler/sampling_profiler_thread_token.cc.orig 2022-10-24 13:33:33 UTC +--- base/profiler/sampling_profiler_thread_token.cc.orig 2023-02-08 09:03:45 UTC +++ base/profiler/sampling_profiler_thread_token.cc @@ -6,7 +6,7 @@ @@ -9,7 +9,7 @@ #include <pthread.h> #include "base/profiler/stack_base_address_posix.h" -@@ -19,7 +19,7 @@ SamplingProfilerThreadToken GetSamplingProfilerCurrent +@@ -18,7 +18,7 @@ SamplingProfilerThreadToken GetSamplingProfilerCurrent PlatformThreadId id = PlatformThread::CurrentId(); #if BUILDFLAG(IS_ANDROID) return {id, pthread_self()}; @@ -17,4 +17,4 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) absl::optional<uintptr_t> maybe_stack_base = GetThreadStackBaseAddress(id, pthread_self()); - // GetThreadStackBaseAddress should only return nullopt on Android, so + return {id, maybe_stack_base}; diff --git a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h index f4cb4f520ac9..d86e2ea6d955 100644 --- a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h +++ b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h @@ -1,6 +1,6 @@ ---- base/profiler/sampling_profiler_thread_token.h.orig 2022-10-24 13:33:33 UTC +--- base/profiler/sampling_profiler_thread_token.h.orig 2023-02-08 09:03:45 UTC +++ base/profiler/sampling_profiler_thread_token.h -@@ -11,7 +11,7 @@ +@@ -12,7 +12,7 @@ #if BUILDFLAG(IS_ANDROID) #include <pthread.h> @@ -9,7 +9,7 @@ #include <stdint.h> #endif -@@ -25,7 +25,7 @@ struct SamplingProfilerThreadToken { +@@ -26,7 +26,7 @@ struct SamplingProfilerThreadToken { PlatformThreadId id; #if BUILDFLAG(IS_ANDROID) pthread_t pthread_id; diff --git a/www/chromium/files/patch-base_profiler_stack__base__address__posix.cc b/www/chromium/files/patch-base_profiler_stack__base__address__posix.cc index 4f4bab6868b5..68f89d572ae9 100644 --- a/www/chromium/files/patch-base_profiler_stack__base__address__posix.cc +++ b/www/chromium/files/patch-base_profiler_stack__base__address__posix.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_base_address_posix.cc.orig 2022-10-24 17:59:26 UTC +--- base/profiler/stack_base_address_posix.cc.orig 2023-02-08 16:09:26 UTC +++ base/profiler/stack_base_address_posix.cc -@@ -15,6 +15,10 @@ +@@ -17,6 +17,10 @@ #include "base/files/scoped_file.h" #endif @@ -11,9 +11,9 @@ #if BUILDFLAG(IS_CHROMEOS) extern "C" void* __libc_stack_end; #endif -@@ -42,15 +46,30 @@ absl::optional<uintptr_t> GetAndroidMainThreadStackBas - #endif +@@ -45,7 +49,21 @@ absl::optional<uintptr_t> GetAndroidMainThreadStackBas + #if !BUILDFLAG(IS_LINUX) uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthread_id) { +#if BUILDFLAG(IS_OPENBSD) + stack_t ss; @@ -26,17 +26,23 @@ +#else pthread_attr_t attr; +#if BUILDFLAG(IS_FREEBSD) ++ int result; + pthread_attr_init(&attr); + pthread_attr_get_np(pthread_id, &attr); +#else - // This will crash on ChromeOS & Linux if we are in the sandbox and pthread_id - // refers to a different thread, due to the use of sched_getaffinity(). - pthread_getattr_np(pthread_id, &attr); - // See crbug.com/617730 for limitations of this approach on Linux. + // pthread_getattr_np will crash on ChromeOS & Linux if we are in the sandbox + // and pthread_id refers to a different thread, due to the use of + // sched_getaffinity(). +@@ -58,12 +76,14 @@ uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthr + << logging::SystemErrorCodeToString(result); + // See crbug.com/617730 for limitations of this approach on Linux-like + // systems. +#endif void* address; size_t size; - pthread_attr_getstack(&attr, &address, &size); + result = pthread_attr_getstack(&attr, &address, &size); + CHECK_EQ(result, 0) << "pthread_attr_getstack returned " + << logging::SystemErrorCodeToString(result); pthread_attr_destroy(&attr); +#endif const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size; diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc index 9b71690b5fad..8400477c0c42 100644 --- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc +++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_test_util.cc.orig 2022-05-19 14:06:27 UTC +--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2023-02-08 09:03:45 UTC +++ base/profiler/stack_sampling_profiler_test_util.cc -@@ -39,7 +39,7 @@ +@@ -33,7 +33,7 @@ // Fortunately, it provides _alloca, which functions identically. #include <malloc.h> #define alloca _alloca diff --git a/www/chromium/files/patch-base_system_sys__info.cc b/www/chromium/files/patch-base_system_sys__info.cc index 84cc358951eb..9433f80d7f28 100644 --- a/www/chromium/files/patch-base_system_sys__info.cc +++ b/www/chromium/files/patch-base_system_sys__info.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info.cc.orig 2022-08-31 12:19:35 UTC +--- base/system/sys_info.cc.orig 2023-02-08 09:03:45 UTC +++ base/system/sys_info.cc -@@ -101,7 +101,7 @@ std::string SysInfo::HardwareModelName() { +@@ -107,7 +107,7 @@ std::string SysInfo::HardwareModelName() { #endif void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) { diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h index f53d8dbc58bf..2151241365a3 100644 --- a/www/chromium/files/patch-base_system_sys__info.h +++ b/www/chromium/files/patch-base_system_sys__info.h @@ -1,6 +1,6 @@ ---- base/system/sys_info.h.orig 2022-11-30 08:12:58 UTC +--- base/system/sys_info.h.orig 2023-02-08 09:03:45 UTC +++ base/system/sys_info.h -@@ -233,6 +233,8 @@ class BASE_EXPORT SysInfo { +@@ -246,6 +246,8 @@ class BASE_EXPORT SysInfo { static void SetIsCpuSecurityMitigationsEnabled(bool is_enabled); #endif @@ -9,7 +9,7 @@ private: FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); -@@ -243,7 +245,7 @@ class BASE_EXPORT SysInfo { +@@ -257,7 +259,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 74138f62e359..26b0654e02ea 100644 --- a/www/chromium/files/patch-base_system_sys__info__posix.cc +++ b/www/chromium/files/patch-base_system_sys__info__posix.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_posix.cc.orig 2023-01-11 09:17:16 UTC +--- base/system/sys_info_posix.cc.orig 2023-02-08 09:03:45 UTC +++ base/system/sys_info_posix.cc -@@ -154,12 +154,12 @@ int NumberOfProcessors() { +@@ -159,12 +159,12 @@ int NumberOfProcessors() { } // namespace internal @@ -15,7 +15,7 @@ // static uint64_t SysInfo::AmountOfVirtualMemory() { -@@ -249,6 +249,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -254,6 +254,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 7aea7a207fa8..c95c6b922bad 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 2022-11-30 08:12:58 UTC +--- base/system/sys_info_unittest.cc.orig 2023-02-08 09:03:45 UTC +++ base/system/sys_info_unittest.cc -@@ -255,12 +255,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) { +@@ -259,12 +259,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_test_launcher_test__launcher.cc b/www/chromium/files/patch-base_test_launcher_test__launcher.cc index f8941e15bb42..c38d203671cb 100644 --- a/www/chromium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc @@ -1,6 +1,6 @@ ---- base/test/launcher/test_launcher.cc.orig 2023-01-11 09:17:16 UTC +--- base/test/launcher/test_launcher.cc.orig 2023-02-08 09:03:45 UTC +++ base/test/launcher/test_launcher.cc -@@ -67,6 +67,7 @@ +@@ -66,6 +66,7 @@ #include "third_party/libxml/chromium/libxml_utils.h" #if BUILDFLAG(IS_POSIX) diff --git a/www/chromium/files/patch-base_threading_platform__thread.h b/www/chromium/files/patch-base_threading_platform__thread.h deleted file mode 100644 index 6f887f6c8c6f..000000000000 --- a/www/chromium/files/patch-base_threading_platform__thread.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/threading/platform_thread.h.orig 2022-09-24 10:57:32 UTC -+++ base/threading/platform_thread.h -@@ -253,7 +253,7 @@ class BASE_EXPORT PlatformThread { - // Returns a realtime period provided by `delegate`. - static TimeDelta GetRealtimePeriod(Delegate* delegate); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Toggles a specific thread's type at runtime. This can be used to - // change the priority of a thread in a different process and will fail - // if the calling process does not have proper permissions. The diff --git a/www/chromium/files/patch-base_threading_platform__thread__linux.cc b/www/chromium/files/patch-base_threading_platform__thread__linux.cc index 4e765fd7f728..83e20f0c7167 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__linux.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__linux.cc @@ -1,6 +1,6 @@ ---- base/threading/platform_thread_linux.cc.orig 2022-11-30 08:12:58 UTC +--- base/threading/platform_thread_linux.cc.orig 2023-02-08 09:03:45 UTC +++ base/threading/platform_thread_linux.cc -@@ -29,7 +29,9 @@ +@@ -30,7 +30,9 @@ #if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) #include <pthread.h> @@ -10,7 +10,7 @@ #include <sys/resource.h> #include <sys/time.h> #include <sys/types.h> -@@ -134,7 +136,7 @@ long sched_setattr(pid_t pid, +@@ -139,7 +141,7 @@ long sched_setattr(pid_t pid, #endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) #endif // BUILDFLAG(IS_CHROMEOS) @@ -19,7 +19,7 @@ const FilePath::CharType kCgroupDirectory[] = FILE_PATH_LITERAL("/sys/fs/cgroup"); -@@ -306,7 +308,7 @@ void SetThreadCgroupsForThreadType(PlatformThreadId th +@@ -313,7 +315,7 @@ void SetThreadCgroupsForThreadType(PlatformThreadId th namespace internal { namespace { @@ -28,7 +28,7 @@ const struct sched_param kRealTimePrio = {8}; #endif } // namespace -@@ -332,7 +334,7 @@ const ThreadTypeToNiceValuePair kThreadTypeToNiceValue +@@ -340,7 +342,7 @@ const ThreadTypeToNiceValuePair kThreadTypeToNiceValue }; bool CanSetThreadTypeToRealtimeAudio() { @@ -37,16 +37,16 @@ // A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke // pthread_setschedparam in SetCurrentThreadTypeForPlatform(). struct rlimit rlim; -@@ -344,7 +346,7 @@ bool CanSetThreadTypeToRealtimeAudio() { +@@ -352,7 +354,7 @@ bool CanSetThreadTypeToRealtimeAudio() { bool SetCurrentThreadTypeForPlatform(ThreadType thread_type, MessagePumpType pump_type_hint) { -#if !BUILDFLAG(IS_NACL) +#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) - // For legacy schedtune interface - SetThreadCgroupsForThreadType(PlatformThread::CurrentId(), thread_type); + const PlatformThreadId tid = PlatformThread::CurrentId(); -@@ -363,7 +365,7 @@ bool SetCurrentThreadTypeForPlatform(ThreadType thread + if (g_thread_type_delegate && +@@ -378,7 +380,7 @@ bool SetCurrentThreadTypeForPlatform(ThreadType thread absl::optional<ThreadPriorityForTest> GetCurrentThreadPriorityForPlatformForTest() { @@ -55,7 +55,7 @@ int maybe_sched_rr = 0; struct sched_param maybe_realtime_prio = {0}; if (pthread_getschedparam(pthread_self(), &maybe_sched_rr, -@@ -382,7 +384,7 @@ GetCurrentThreadPriorityForPlatformForTest() { +@@ -397,7 +399,7 @@ GetCurrentThreadPriorityForPlatformForTest() { void PlatformThread::SetName(const std::string& name) { ThreadIdNameManager::GetInstance()->SetName(name); @@ -64,14 +64,21 @@ // On linux we can get the thread names to show up in the debugger by setting // the process name for the LWP. We don't want to do this for the main // thread because that would rename the process, causing tools like killall -@@ -412,8 +414,10 @@ void PlatformThread::SetThreadType(ProcessId process_i - // priority. - CHECK_NE(thread_id, process_id); +@@ -417,7 +419,7 @@ void PlatformThread::SetName(const std::string& name) + #endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) + } -+#if !BUILDFLAG(IS_BSD) - // For legacy schedtune interface - SetThreadCgroupsForThreadType(thread_id, thread_type); -+#endif +-#if !BUILDFLAG(IS_NACL) ++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) + // static + void PlatformThread::SetThreadTypeDelegate(ThreadTypeDelegate* delegate) { + // A component cannot override a delegate set by another component, thus +@@ -428,7 +430,7 @@ void PlatformThread::SetThreadTypeDelegate(ThreadTypeD + } + #endif - #if BUILDFLAG(IS_CHROMEOS) - // For upstream uclamp interface. We try both legacy (schedtune, as done +-#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) ++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) && !BUILDFLAG(IS_BSD) + // static + void PlatformThread::SetThreadType(ProcessId process_id, + PlatformThreadId thread_id, diff --git a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc index 21ebe871a3ae..4058e29c6f7f 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_unittest.cc.orig 2023-01-11 09:17:16 UTC +--- base/threading/platform_thread_unittest.cc.orig 2023-02-08 09:03:45 UTC +++ base/threading/platform_thread_unittest.cc @@ -31,7 +31,7 @@ #include "base/time/time.h" @@ -9,7 +9,7 @@ #include <pthread.h> #include <sys/syscall.h> #include <sys/types.h> -@@ -417,7 +417,7 @@ TEST(PlatformThreadTest, +@@ -422,7 +422,7 @@ TEST(PlatformThreadTest, // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this // proprerty changes for a given platform. TEST(PlatformThreadTest, CanChangeThreadType) { @@ -18,7 +18,7 @@ // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be // able to increase priority to any level. constexpr bool kCanIncreasePriority = false; -@@ -684,12 +684,16 @@ INSTANTIATE_TEST_SUITE_P( +@@ -696,12 +696,16 @@ INSTANTIATE_TEST_SUITE_P( #endif // BUILDFLAG(IS_APPLE) 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 c0d85d4aa27e..aa10a5248912 100644 --- a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc +++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,6 +1,6 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2022-10-24 13:33:33 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2023-02-08 09:03:45 UTC +++ base/trace_event/malloc_dump_provider.cc -@@ -24,6 +24,8 @@ +@@ -25,6 +25,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -186,7 +188,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, +@@ -187,7 +189,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, -@@ -357,6 +359,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -358,6 +360,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_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index 7454341681d3..efcbfb08d379 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-01-11 09:17:16 UTC +--- build/config/compiler/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ build/config/compiler/BUILD.gn @@ -224,13 +224,16 @@ config("default_include_dirs") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in @@ -38,7 +38,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -808,7 +815,7 @@ config("compiler") { +@@ -813,7 +820,7 @@ config("compiler") { # lldb doesn't have the needed changes yet. # * Fuchsia isn't supported as zxdb doesn't support simple template names yet. # TODO(crbug.com/1379070): Remove if the upstream default ever changes. @@ -47,7 +47,7 @@ cflags_cc += [ "-gsimple-template-names" ] } -@@ -958,7 +965,7 @@ config("compiler_cpu_abi") { +@@ -973,7 +980,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -56,7 +56,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -973,7 +980,7 @@ config("compiler_cpu_abi") { +@@ -988,7 +995,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -65,7 +65,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1307,7 +1314,7 @@ config("compiler_deterministic") { +@@ -1322,7 +1329,7 @@ config("compiler_deterministic") { # different build directory like "out/feature_a" and "out/feature_b" if # we build same files with same compile flag. # Other paths are already given in relative, no need to normalize them. @@ -74,7 +74,7 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1359,7 +1366,7 @@ config("compiler_deterministic") { +@@ -1374,7 +1381,7 @@ config("compiler_deterministic") { } config("clang_revision") { @@ -83,7 +83,7 @@ update_args = [ "--print-revision", "--verify-version=$clang_version", -@@ -1600,7 +1607,7 @@ config("default_warnings") { +@@ -1615,7 +1622,7 @@ config("default_warnings") { "-Wno-ignored-pragma-optimize", ] @@ -92,7 +92,7 @@ cflags += [ # TODO(crbug.com/1343975) Evaluate and possibly enable. "-Wno-deprecated-builtins", -@@ -1779,7 +1786,7 @@ config("no_chromium_code") { +@@ -1794,7 +1801,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] @@ -101,7 +101,7 @@ cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -2301,7 +2308,7 @@ config("afdo_optimize_size") { +@@ -2302,7 +2309,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") { @@ -110,7 +110,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2317,7 +2324,7 @@ config("afdo") { +@@ -2318,7 +2325,7 @@ config("afdo") { cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ] inputs = [ _clang_sample_profile ] } @@ -119,7 +119,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2464,7 +2471,8 @@ config("symbols") { +@@ -2472,7 +2479,8 @@ config("symbols") { configs += [ "//build/config:compress_debug_sections" ] } diff --git a/www/chromium/files/patch-build_config_rust.gni b/www/chromium/files/patch-build_config_rust.gni index 724cec8e0742..ed959f7cf230 100644 --- a/www/chromium/files/patch-build_config_rust.gni +++ b/www/chromium/files/patch-build_config_rust.gni @@ -1,6 +1,6 @@ ---- build/config/rust.gni.orig 2022-06-17 14:20:10 UTC +--- build/config/rust.gni.orig 2023-02-08 09:03:45 UTC +++ build/config/rust.gni -@@ -124,7 +124,7 @@ if (enable_rust) { +@@ -128,7 +128,7 @@ if (enable_rust) { rust_sysroot = "//third_party/rust-toolchain" use_unverified_rust_toolchain = false } else { diff --git a/www/chromium/files/patch-build_linux_unbundle_openh264.gn b/www/chromium/files/patch-build_linux_unbundle_openh264.gn deleted file mode 100644 index 31650c55eedc..000000000000 --- a/www/chromium/files/patch-build_linux_unbundle_openh264.gn +++ /dev/null @@ -1,21 +0,0 @@ ---- build/linux/unbundle/openh264.gn.orig 2023-01-11 09:17:16 UTC -+++ build/linux/unbundle/openh264.gn -@@ -2,6 +2,7 @@ - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - -+import("//build/buildflag_header.gni") - import("//build/config/linux/pkg_config.gni") - import("//build/shim_headers.gni") - -@@ -33,4 +34,10 @@ source_set("processing") { - source_set("encoder") { - deps = [ ":openh264_shim" ] - public_configs = [ ":config" ] -+} -+ -+buildflag_header("buildflags") { -+ header = "buildflags.h" -+ header_dir = "third_party/openh264" -+ flags = [ "OPENH264_API_WELS=1" ] - } diff --git a/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py b/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py index 9aa5e6df3c75..028c588943d5 100644 --- a/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py +++ b/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py @@ -1,8 +1,8 @@ ---- build/linux/unbundle/replace_gn_files.py.orig 2022-11-30 08:12:58 UTC +--- build/linux/unbundle/replace_gn_files.py.orig 2023-02-08 09:03:45 UTC +++ build/linux/unbundle/replace_gn_files.py -@@ -53,6 +53,7 @@ REPLACEMENTS = { +@@ -54,6 +54,7 @@ REPLACEMENTS = { + 'libevent': 'third_party/libevent/BUILD.gn', 'libjpeg': 'third_party/libjpeg.gni', - 'libjxl' : 'third_party/libjxl/BUILD.gn', 'libpng': 'third_party/libpng/BUILD.gn', + 'libusb': 'third_party/libusb/BUILD.gn', 'libvpx': 'third_party/libvpx/BUILD.gn', diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index a455e879e624..f5fc81d6968b 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-01-11 09:17:16 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2023-02-08 09:03:45 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). # -@@ -799,22 +806,12 @@ template("gcc_toolchain") { +@@ -803,22 +810,12 @@ template("gcc_toolchain") { # use_gold too. template("clang_toolchain") { gcc_toolchain(target_name) { diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index dad8ed536a90..28c69bf60848 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-01-11 09:17:16 UTC +--- cc/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ cc/BUILD.gn -@@ -666,7 +666,7 @@ cc_test_static_library("test_support") { +@@ -665,7 +665,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -893,7 +893,6 @@ cc_test("cc_unittests") { +@@ -892,7 +892,6 @@ cc_test("cc_unittests") { data = [ "//components/viz/test/data/" ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc index 3abc4a419df1..3e2e1c64b911 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-01-11 09:17:16 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -136,7 +136,7 @@ +@@ -138,7 +138,7 @@ #include "components/about_ui/credit_utils.h" #endif @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -180,16 +180,16 @@ +@@ -182,16 +182,16 @@ #include "v8/include/v8.h" #endif @@ -29,7 +29,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -348,7 +348,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -351,7 +351,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 -@@ -433,7 +433,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -436,7 +436,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) || -@@ -540,7 +540,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -550,7 +550,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. -@@ -629,7 +629,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -639,7 +639,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( -@@ -911,6 +911,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() { +@@ -927,6 +927,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() { // not always enabled on ChromeOS. #if BUILDFLAG(IS_CHROMEOS) bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled(); @@ -74,7 +74,7 @@ #else bool enable_gwp_asan = true; #endif -@@ -971,7 +973,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { +@@ -987,7 +989,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { base::internal::TimerBase::InitializeFeatures(); base::InitializeCpuReductionExperiment(); base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures(); @@ -83,7 +83,7 @@ base::MessagePumpLibevent::InitializeFeatures(); #elif BUILDFLAG(IS_MAC) base::PlatformThread::InitFeaturesPostFieldTrial(); -@@ -1080,7 +1082,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo +@@ -1119,7 +1121,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo // TODO(crbug.com/1052397): Revisit the macro expression once build flag // switch of lacros-chrome is complete. @@ -92,7 +92,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1110,7 +1112,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo +@@ -1149,7 +1151,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -101,7 +101,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1492,7 +1494,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1531,7 +1533,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -110,7 +110,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) { -@@ -1572,7 +1574,7 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1611,7 +1613,7 @@ absl::variant<int, content::MainFunctionParams> Chrome // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd index 12f0af0397d3..e8045be257dd 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-01-11 09:17:16 UTC +--- chrome/app/generated_resources.grd.orig 2023-02-08 09:03:45 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. --> -@@ -3090,7 +3090,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3122,7 +3122,7 @@ are declared in tools/grit/grit_rule.gni. </if> <!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog --> @@ -18,7 +18,7 @@ <message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog."> Device Credentials </message> -@@ -4820,7 +4820,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4868,7 +4868,7 @@ are declared in tools/grit/grit_rule.gni. Read information about your browser, OS, device, installed software, registry values and files </message> </if> @@ -27,7 +27,7 @@ <message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS" desc="Permission string for enterprise private reporting permission on Linux and MacOS."> Read information about your browser, OS, device, installed software and files </message> -@@ -5493,7 +5493,7 @@ Keep your key file in a safe place. You will need it t +@@ -5529,7 +5529,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> -@@ -5521,7 +5521,7 @@ Keep your key file in a safe place. You will need it t +@@ -5575,7 +5575,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> -@@ -9168,7 +9168,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -9287,7 +9287,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW Google Pay </message> @@ -54,7 +54,7 @@ <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders."> Use system title bar and borders </message> -@@ -10501,7 +10501,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -10620,7 +10620,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> @@ -63,7 +63,7 @@ <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window."> Minimize </message> -@@ -12597,7 +12597,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -12735,7 +12735,7 @@ Please help our engineers fix this problem. Tell us wh Open Anyway </message> diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp index ad99ede4f482..c797668519f7 100644 --- a/www/chromium/files/patch-chrome_app_settings__strings.grdp +++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/settings_strings.grdp.orig 2023-01-11 09:17:16 UTC +--- chrome/app/settings_strings.grdp.orig 2023-02-08 09:03:45 UTC +++ chrome/app/settings_strings.grdp -@@ -151,7 +151,7 @@ +@@ -154,7 +154,7 @@ Theme </message> </if> @@ -9,7 +9,7 @@ <message name="IDS_SETTINGS_GTK_THEME" desc="Text of the label describing the system (GTK) browser theme on Linux"> GTK </message> -@@ -171,7 +171,7 @@ +@@ -174,7 +174,7 @@ Use Classic </message> </if> diff --git a/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd index 6d213a978d9b..fa8c0da7d814 100644 --- a/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd +++ b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd @@ -1,29 +1,29 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2022-10-24 13:33:33 UTC +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2023-02-08 09:03:45 UTC +++ chrome/app/theme/chrome_unscaled_resources.grd -@@ -19,7 +19,7 @@ - <include name="IDR_ASSISTANT_LOGO_MONOCHROME" file="google_chrome/google_assistant.svg" type="BINDATA" /> - <if expr="_google_chrome_for_testing"> +@@ -16,7 +16,7 @@ + <includes> + <if expr="_google_chrome"> + <then> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <then> + <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/linux/product_logo_64.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/linux/product_logo_128.png" type="BINDATA" /> +@@ -61,7 +61,7 @@ + <else> <!-- not _google_chrome --> + <if expr="_google_chrome_for_testing and _use_internal_chrome_for_testing_icons"> <then> - <if expr="is_linux"> + <if expr="is_posix"> <then> <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/google_chrome_for_testing/linux/product_logo_64.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/google_chrome_for_testing/linux/product_logo_128.png" type="BINDATA" /> -@@ -36,7 +36,7 @@ +@@ -75,7 +75,7 @@ </if> </then> - <else> <!-- not _google_chrome_for_testing --> + <else> <!-- not (_google_chrome_for_testing and _use_internal_chrome_for_testing_icons) --> - <if expr="is_linux"> + <if expr="is_posix"> <then> - <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/linux/product_logo_64.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/linux/product_logo_128.png" type="BINDATA" /> -@@ -78,7 +78,7 @@ - </if> - </then> - <else> <!-- not _google_chrome --> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <then> - <include name="IDR_PRODUCT_LOGO_64" file="chromium/linux/product_logo_64.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_128" file="chromium/linux/product_logo_128.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_64" file="chromium/linux/product_logo_64.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_128" file="chromium/linux/product_logo_128.png" type="BINDATA" /> diff --git a/www/chromium/files/patch-chrome_app_theme_theme__resources.grd b/www/chromium/files/patch-chrome_app_theme_theme__resources.grd index 903d659849e7..b514eb1bf801 100644 --- a/www/chromium/files/patch-chrome_app_theme_theme__resources.grd +++ b/www/chromium/files/patch-chrome_app_theme_theme__resources.grd @@ -1,47 +1,59 @@ ---- chrome/app/theme/theme_resources.grd.orig 2022-11-30 08:12:58 UTC +--- chrome/app/theme/theme_resources.grd.orig 2023-02-08 09:03:45 UTC +++ chrome/app/theme/theme_resources.grd -@@ -135,7 +135,7 @@ +@@ -135,14 +135,14 @@ </if> <if expr="_google_chrome"> <then> - <if expr="is_linux"> + <if expr="is_posix"> <then> - <if expr="_google_chrome_for_testing"> - <then> -@@ -152,7 +152,7 @@ - </else> - </if> <!-- _google_chrome_for_testing --> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/linux/product_logo_16.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/linux/product_logo_32.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/linux/product_logo_32_beta.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/linux/product_logo_32_dev.png" /> </then> - <else> <!-- not is_linux --> + <else> <!-- not is_posix --> <if expr="not is_android"> - <if expr="_google_chrome_for_testing"> - <then> -@@ -176,7 +176,7 @@ - </else> - </if> <!-- _google_chrome_for_testing --> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/product_logo_32.png" /> +@@ -150,7 +150,7 @@ + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/product_logo_32_beta.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/product_logo_32_dev.png" /> </else> - </if> <!-- is_linux --> + </if> <!-- is_posix --> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_CANARY" file="google_chrome/product_logo_32_canary.png" /> <if expr="not is_android"> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="google_chrome/product_logo_name_22.png" /> -@@ -186,7 +186,7 @@ - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_ENTERPRISE_WHITE" file="google_chrome/product_logo_enterprise_white.png" /> - </then> +@@ -162,7 +162,7 @@ <else> <!-- not _google_chrome --> -- <if expr="is_linux"> -+ <if expr="is_posix"> + <if expr="_google_chrome_for_testing and _use_internal_chrome_for_testing_icons"> <then> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/linux/product_logo_16.png" /> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/linux/product_logo_32.png" /> -@@ -195,7 +195,7 @@ - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" /> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" /> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <then> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/linux/product_logo_16.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/linux/product_logo_32.png" /> +@@ -171,10 +171,10 @@ + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/product_logo_16.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/product_logo_32.png" /> + </else> +- </if> <!-- is_linux --> ++ </if> <!-- is_posix --> + </then> + <else> <!-- not (_google_chrome_for_testing and _use_internal_chrome_for_testing_icons) --> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <then> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/linux/product_logo_16.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/linux/product_logo_32.png" /> +@@ -183,7 +183,7 @@ + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" /> + </else> +- </if> <!-- is_linux --> ++ </if> <!-- is_posix --> </else> -- </if> <!-- is_linux --> -+ </if> <!-- is_posix --> + </if> <!-- _google_chrome_for_testing and _use_internal_chrome_for_testing_icons --> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="chromium/product_logo_name_22.png" /> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22_WHITE" file="chromium/product_logo_name_22_white.png" /> - </else> diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index 9fd760092b04..adc30fa90693 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,15 +1,15 @@ ---- chrome/browser/about_flags.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/about_flags.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/about_flags.cc -@@ -217,7 +217,7 @@ - #include "ui/native_theme/native_theme_features.h" +@@ -218,7 +218,7 @@ #include "ui/ui_features.h" + #include "url/url_features.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/allocator/buildflags.h" #endif -@@ -293,7 +293,7 @@ +@@ -294,7 +294,7 @@ #include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h" // nogncheck #endif // ENABLE_SUPERVISED_USERS @@ -27,16 +27,16 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -1394,7 +1394,7 @@ const FeatureEntry::FeatureVariation kTabGroupsSaveVar - }; +@@ -1317,7 +1317,7 @@ const FeatureEntry::FeatureVariation kLocalWebApproval + #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { - {"DocumentUseServerScore", "true"}, - {"DocumentUseClientScore", "false"}, -@@ -4810,7 +4810,7 @@ const FeatureEntry kFeatureEntries[] = { + const FeatureEntry::FeatureParam + kOmniboxDocumentProviderCapLowQualitySuggestionsTo1[] = { + {"DocumentProviderMaxLowQualitySuggestions", "1"}, +@@ -4479,13 +4479,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -45,8 +45,6 @@ {"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName, flag_descriptions::kOzonePlatformHintDescription, kOsLinux, MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)}, -@@ -4823,7 +4823,7 @@ const FeatureEntry kFeatureEntries[] = { - password_manager::features::kForceInitialSyncWhenDecryptionFails)}, #endif // BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -54,7 +52,7 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -5090,7 +5090,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4752,7 +4752,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(feed::kDiscoFeedEndpoint)}, #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -63,7 +61,7 @@ {"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName, flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop, FEATURE_VALUE_TYPE(feed::kWebUiFeed)}, -@@ -5699,7 +5699,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5331,7 +5331,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -72,7 +70,7 @@ {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -6335,7 +6335,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5969,7 +5969,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kPointerLockOptionsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kPointerLockOptions)}, @@ -81,7 +79,7 @@ {"enable-async-dns", flag_descriptions::kAsyncDnsName, flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, FEATURE_VALUE_TYPE(features::kAsyncDns)}, -@@ -7337,7 +7337,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6969,7 +6969,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -90,7 +88,7 @@ {"global-media-controls-modern-ui", flag_descriptions::kGlobalMediaControlsModernUIName, flag_descriptions::kGlobalMediaControlsModernUIDescription, -@@ -8174,7 +8174,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7737,7 +7737,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -99,7 +97,7 @@ {"quick-commands", flag_descriptions::kQuickCommandsName, flag_descriptions::kQuickCommandsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kQuickCommands)}, -@@ -8439,7 +8439,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7995,7 +7995,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -108,7 +106,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9056,7 +9056,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8554,7 +8554,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc index 620726935fc4..d4d9ac20cf0f 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/browser_process_impl.cc.orig 2022-11-30 08:12:58 UTC +--- chrome/browser/browser_process_impl.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/browser_process_impl.cc @@ -211,7 +211,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" @@ -9,7 +9,7 @@ #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck #endif -@@ -1160,7 +1160,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1183,7 +1183,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); @@ -18,7 +18,7 @@ ChromeJsErrorReportProcessor::Create(); #endif -@@ -1420,7 +1420,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1443,7 +1443,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 da5c7801d61e..59cdcbbf1601 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.h +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.h @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.h.orig 2022-09-24 10:57:32 UTC +--- chrome/browser/browser_process_impl.h.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/browser_process_impl.h -@@ -363,7 +363,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -364,7 +364,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 c0dd56ccfb55..6baafafc10a1 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-01-11 09:17:16 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -113,13 +113,13 @@ +@@ -114,13 +114,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 -@@ -191,7 +191,7 @@ +@@ -192,7 +192,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" -@@ -809,7 +809,7 @@ void PopulateChromeFrameBinders( +@@ -812,7 +812,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)); -@@ -817,7 +817,7 @@ void PopulateChromeFrameBinders( +@@ -820,7 +820,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 -@@ -882,14 +882,14 @@ void PopulateChromeWebUIFrameBinders( +@@ -885,14 +885,14 @@ void PopulateChromeWebUIFrameBinders( SegmentationInternalsUI>(map); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -60,7 +60,7 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); #endif -@@ -1289,7 +1289,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1303,7 +1303,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 972312736d44..0cdea082de9e 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,4 +1,4 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/chrome_browser_main.cc @@ -240,11 +240,11 @@ @@ -23,7 +23,7 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h" #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" -@@ -987,7 +987,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -988,7 +988,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -32,7 +32,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -1035,7 +1035,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1044,7 +1044,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index 58928c0b6d15..600447f12330 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-01-11 09:17:16 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -395,7 +395,7 @@ +@@ -401,7 +401,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" -@@ -480,12 +480,12 @@ +@@ -486,12 +486,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 -@@ -494,13 +494,13 @@ +@@ -500,13 +500,13 @@ #include "components/crash/content/browser/crash_handler_host_linux.h" #endif @@ -40,7 +40,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) -@@ -529,11 +529,11 @@ +@@ -535,11 +535,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -54,7 +54,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" -@@ -1623,7 +1623,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1649,7 +1649,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( is_integration_test, &startup_data_); @@ -63,7 +63,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1662,7 +1662,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1688,7 +1688,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. @@ -72,7 +72,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1683,7 +1683,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1709,7 +1709,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); #endif @@ -81,7 +81,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1702,7 +1702,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1728,7 +1728,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -90,7 +90,7 @@ main_parts->AddParts( std::make_unique< chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2507,6 +2507,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2550,6 +2550,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin #elif BUILDFLAG(IS_POSIX) #if BUILDFLAG(IS_ANDROID) bool enable_crash_reporter = true; @@ -99,7 +99,7 @@ #elif BUILDFLAG(IS_CHROMEOS) bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { -@@ -2902,7 +2904,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2933,7 +2935,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); @@ -108,7 +108,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4352,7 +4354,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4416,7 +4418,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -117,7 +117,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4872,14 +4874,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4936,14 +4938,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -134,7 +134,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -4914,7 +4916,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4978,7 +4980,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati handle)); } 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 66b118cc0ef9..729784c58481 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-01-11 09:17:16 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -442,7 +442,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -441,7 +441,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_content__settings_chrome__content__settings__utils.cc b/www/chromium/files/patch-chrome_browser_content__settings_chrome__content__settings__utils.cc deleted file mode 100644 index c879c3ede814..000000000000 --- a/www/chromium/files/patch-chrome_browser_content__settings_chrome__content__settings__utils.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/content_settings/chrome_content_settings_utils.cc.orig 2022-11-30 08:12:58 UTC -+++ chrome/browser/content_settings/chrome_content_settings_utils.cc -@@ -44,7 +44,7 @@ void UpdateLocationBarUiForWebContents(content::WebCon - location_bar->UpdateContentSettingsIcons(); - - // TODO(https://crbug.com/1346734): Enable this on all platforms. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // The document PiP window does not have a location bar, but has some content - // setting views that need to be updated too. - if (browser->is_type_picture_in_picture()) { diff --git a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd index a794ac4cb7de..e20aad771d13 100644 --- a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd @@ -1,6 +1,6 @@ ---- chrome/browser/dev_ui_browser_resources.grd.orig 2022-09-24 10:57:32 UTC +--- chrome/browser/dev_ui_browser_resources.grd.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/dev_ui_browser_resources.grd -@@ -36,7 +36,7 @@ This file specifies browser resources for developer-fa +@@ -33,7 +33,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" /> 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 e2e4853e253d..2da502532ccd 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-01-11 09:17:16 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1567,7 +1567,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1568,7 +1568,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(); } -@@ -1683,7 +1683,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1684,7 +1684,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()) { -@@ -1729,7 +1729,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl +@@ -1730,7 +1730,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl DCHECK(download_item->IsSavePackageDownload()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-chrome_browser_download_download__file__picker.cc b/www/chromium/files/patch-chrome_browser_download_download__file__picker.cc index 8f1e6a954c1e..35122fc1135c 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__file__picker.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__file__picker.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_file_picker.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/download/download_file_picker.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/download/download_file_picker.cc @@ -17,7 +17,7 @@ #include "content/public/browser/download_manager.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "ui/aura/window.h" -@@ -86,7 +86,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl +@@ -82,7 +82,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl // dialog in Linux (See SelectFileImpl() in select_file_dialog_linux_gtk.cc). // and windows.Here we make owning_window host to browser current active // window if it is null. https://crbug.com/1301898 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 3cbeb1b29190..29f4ae52d4a3 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-01-11 09:17:16 UTC +--- chrome/browser/download/download_item_model.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/download/download_item_model.cc -@@ -787,7 +787,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -801,7 +801,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(); -@@ -830,7 +830,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -844,7 +844,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 +@@ -1255,7 +1255,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe return; } 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 new file mode 100644 index 000000000000..a6f918268403 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc @@ -0,0 +1,11 @@ +--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2023-02-08 09:03:45 UTC ++++ chrome/browser/enterprise/connectors/connectors_service.cc +@@ -513,7 +513,7 @@ bool ConnectorsService::ConnectorsEnabled() const { + + Profile* profile = Profile::FromBrowserContext(context_); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On desktop, the guest profile is actually the primary OTR profile of + // the "regular" guest profile. The regular guest profile is never used + // directly by users. Also, user are not able to create child OTR profiles diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h index 2af3a54cb018..56a46121847e 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h" @@ -9,8 +9,8 @@ #include "third_party/crashpad/crashpad/client/crash_report_database.h" #endif // !BUILDFLAG(IS_FUCHSIA) namespace enterprise_connectors { -@@ -27,7 +27,7 @@ class BrowserCrashEventRouter - BrowserCrashEventRouter& operator=(const BrowserCrashEventRouter&) = delete; +@@ -31,7 +31,7 @@ class BrowserCrashEventRouter + BrowserCrashEventRouter& operator=(BrowserCrashEventRouter&&) = delete; ~BrowserCrashEventRouter() override; -#if !BUILDFLAG(IS_FUCHSIA) @@ -18,7 +18,7 @@ void OnCloudReportingLaunched( enterprise_reporting::ReportScheduler* report_scheduler) override; void UploadToReportingServer( -@@ -42,7 +42,7 @@ class BrowserCrashEventRouter +@@ -46,7 +46,7 @@ class BrowserCrashEventRouter raw_ptr<policy::ChromeBrowserCloudManagementController, DanglingUntriaged> controller_ = nullptr; diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index 2695ffcfb2df..33b86d0aabbc 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-01-11 09:17:16 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1332,6 +1332,10 @@ static_library("extensions") { +@@ -1328,6 +1328,10 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc index 3d067f932c09..0b645afaa602 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc @@ -1,15 +1,15 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2022-08-31 12:19:35 UTC -+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc -@@ -53,7 +53,7 @@ +--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2023-02-08 09:03:45 UTC ++++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc +@@ -40,7 +40,7 @@ + #include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h" #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" - #include "ppapi/buildflags/buildflags.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h" #endif -@@ -122,7 +122,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() +@@ -92,7 +92,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt extensions::SettingsPrivateEventRouterFactory::GetInstance(); extensions::SettingsOverridesAPI::GetFactoryInstance(); extensions::SidePanelService::GetFactoryInstance(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc b/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc index 8619d31fb602..2c06b871b35b 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2022-10-24 13:33:33 UTC +--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc @@ -20,6 +20,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL @@ -6,7 +6,7 @@ DCHECK_CURRENTLY_ON(content::BrowserThread::UI); +#if !defined(OS_BSD) if (g_test_device_list.Get().get() != nullptr) { - base::ThreadTaskRunnerHandle::Get()->PostTask( + base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( FROM_HERE, @@ -33,6 +34,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}, 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 5a32dea19b15..7f1ccaa84855 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-01-11 09:17:16 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -533,7 +533,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall( +@@ -518,7 +518,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 78afcea5e4bd..907598ae7826 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 2022-11-30 08:12:58 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -190,7 +190,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -185,7 +185,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -202,7 +202,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -197,7 +197,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_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc index 72a35024e1b7..962691ef1bef 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -826,7 +826,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -825,7 +825,7 @@ void ExternalProviderImpl::CreateExternalProviders( if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, base::MakeRefCounted<ExternalPrefLoader>( -@@ -854,7 +854,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -853,7 +853,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. diff --git a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc index 64465486297b..bab6007f6ac5 100644 --- a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc +++ b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc @@ -1,11 +1,11 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -252,7 +252,7 @@ const struct { - {base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"), +@@ -255,7 +255,7 @@ const struct { + {base::DIR_HOME, FILE_PATH_LITERAL("Library/CloudStorage"), kDontBlockChildren}, #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // On Linux also block access to devices via /dev, as well as security - // sensitive data in /sys and /proc. + // On Linux also block access to devices via /dev. {kNoBasePathKey, FILE_PATH_LITERAL("/dev"), kBlockAllChildren}, + // And security sensitive data in /proc and /sys. diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index 6b3a93f4e4b0..6b48189d92c1 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-01-11 09:17:16 UTC +--- chrome/browser/flag_descriptions.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/flag_descriptions.cc -@@ -6417,7 +6417,7 @@ const char kSearchWebInSidePanelDescription[] = +@@ -6339,7 +6339,7 @@ const char kSearchWebInSidePanelDescription[] = // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const char kQuickCommandsName[] = "Quick Commands"; const char kQuickCommandsDescription[] = "Enable a text interface to browser features. Invoke with Ctrl-Space."; -@@ -6426,7 +6426,7 @@ const char kQuickCommandsDescription[] = +@@ -6348,7 +6348,7 @@ const char kQuickCommandsDescription[] = // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -6440,7 +6440,7 @@ const char kWebShareDescription[] = +@@ -6369,7 +6369,7 @@ const char kWebShareDescription[] = "platforms."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -27,26 +27,17 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -6460,7 +6460,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -6389,7 +6389,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const char kForcePasswordInitialSyncWhenDecryptionFailsName[] = - "Force initial sync to clean local undecryptable passwords during startup"; - const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[] = -@@ -6468,7 +6468,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail - "storage and requests initial sync."; - #endif // BUILDFLAG(IS_LINUX) - -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -6477,7 +6477,7 @@ const char kSkipUndecryptablePasswordsDescription[] = - "there are undecryptable ones."; +@@ -6403,7 +6403,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail + "storage and requests initial sync."; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -54,7 +45,7 @@ const char kAsyncDnsName[] = "Async DNS resolver"; const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -@@ -6577,7 +6577,7 @@ const char kElasticOverscrollDescription[] = +@@ -6496,7 +6496,7 @@ const char kElasticOverscrollDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 3bc695007297..f891ca6d06ad 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-01-11 09:17:16 UTC +--- chrome/browser/flag_descriptions.h.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/flag_descriptions.h -@@ -3693,7 +3693,7 @@ extern const char kSearchWebInSidePanelDescription[]; +@@ -3657,14 +3657,14 @@ extern const char kSearchWebInSidePanelDescription[]; // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,15 @@ extern const char kQuickCommandsName[]; extern const char kQuickCommandsDescription[]; -@@ -3710,7 +3710,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // defined (OS_FUCHSIA) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + extern const char kWebShareName[]; + extern const char kWebShareDescription[]; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) +@@ -3674,7 +3674,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -18,14 +26,17 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -3723,18 +3723,18 @@ extern const char kForcePasswordInitialSyncWhenDecrypt - extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[]; +@@ -3684,7 +3684,7 @@ extern const char kOzonePlatformHintName[]; + extern const char kOzonePlatformHintDescription[]; #endif // BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; + +@@ -3692,13 +3692,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt + extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -40,7 +51,7 @@ extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -3809,7 +3809,7 @@ extern const char kElasticOverscrollDescription[]; +@@ -3773,7 +3773,7 @@ extern const char kElasticOverscrollDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc index 6d56e2f1ab3a..274c688b8f35 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2022-05-19 14:06:27 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc -@@ -24,10 +24,10 @@ +@@ -23,10 +23,10 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/render_process_host.h" @@ -13,7 +13,7 @@ using webrtc_event_logging::WebRtcEventLogManager; -@@ -281,7 +281,7 @@ void WebRtcLoggingController::StartEventLogging( +@@ -277,7 +277,7 @@ void WebRtcLoggingController::StartEventLogging( web_app_id, callback); } @@ -22,7 +22,7 @@ void WebRtcLoggingController::GetLogsDirectory( LogsDirectoryCallback callback, LogsDirectoryErrorCallback error_callback) { -@@ -327,7 +327,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess +@@ -322,7 +322,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess FROM_HERE, base::BindOnce(std::move(callback), file_system.id(), registered_name)); } 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 e8eca8d52b72..e35545560868 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -176,7 +176,7 @@ +@@ -175,7 +175,7 @@ #include "chrome/notification_helper/notification_helper_constants.h" #endif @@ -9,7 +9,7 @@ #include "components/metrics/motherboard_metrics_provider.h" #endif -@@ -735,7 +735,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -738,7 +738,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::CPUMetricsProvider>()); @@ -18,7 +18,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::MotherboardMetricsProvider>()); #endif -@@ -814,7 +814,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -819,7 +819,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); -@@ -912,7 +912,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -917,7 +917,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -36,7 +36,7 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1097,7 +1097,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1108,7 +1108,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_metrics_perf_cpu__identity.cc b/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc index ace1a4b8f5e3..6b9920395e34 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/perf/cpu_identity.cc.orig 2022-11-30 08:12:58 UTC +--- chrome/browser/metrics/perf/cpu_identity.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/metrics/perf/cpu_identity.cc -@@ -109,7 +109,7 @@ CPUIdentity GetCPUIdentity() { +@@ -141,7 +141,7 @@ CPUIdentity GetCPUIdentity() { result.release = #if BUILDFLAG(IS_CHROMEOS_ASH) base::SysInfo::KernelVersion(); 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 42851dfdae24..e86aac6d6695 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-01-11 09:17:16 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -92,7 +92,7 @@ @@ -9,7 +9,7 @@ #include "chrome/common/chrome_paths_internal.h" #include "chrome/grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" -@@ -174,7 +174,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -177,7 +177,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -18,7 +18,7 @@ auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -452,7 +452,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -455,7 +455,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -27,7 +27,7 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -524,7 +524,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -527,7 +527,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc b/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc index 022a3a4941ca..e84dc4c7445c 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2022-09-24 10:57:32 UTC +--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/password_manager/password_reuse_manager_factory.cc -@@ -92,7 +92,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic +@@ -101,7 +101,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_platform__util__linux.cc b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc index 0648db76b2a9..521c822df258 100644 --- a/www/chromium/files/patch-chrome_browser_platform__util__linux.cc +++ b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/platform_util_linux.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/platform_util_linux.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/platform_util_linux.cc -@@ -295,7 +295,9 @@ void RunCommand(const std::string& command, +@@ -296,7 +296,9 @@ void RunCommand(const std::string& command, base::LaunchOptions options; options.current_directory = working_directory; 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 3a6b435d8c1b..06f62efc6a91 100644 --- a/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc +++ b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2022-05-19 14:06:27 UTC +--- 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 -@@ -47,7 +47,7 @@ +@@ -48,7 +48,7 @@ #include "chrome/browser/policy/browser_dm_token_storage_mac.h" #endif // BUILDFLAG(IS_MAC) @@ -9,7 +9,7 @@ #include "chrome/browser/policy/browser_dm_token_storage_linux.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -56,7 +56,7 @@ +@@ -57,7 +57,7 @@ #include "chrome/install_static/install_util.h" #endif // BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/device_trust_features.h" #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" -@@ -89,7 +89,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: +@@ -90,7 +90,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: #if BUILDFLAG(IS_MAC) storage_delegate = std::make_unique<BrowserDMTokenStorageMac>(); @@ -27,7 +27,7 @@ storage_delegate = std::make_unique<BrowserDMTokenStorageLinux>(); #elif BUILDFLAG(IS_WIN) storage_delegate = std::make_unique<BrowserDMTokenStorageWin>(); -@@ -244,7 +244,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC +@@ -245,7 +245,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC std::unique_ptr<enterprise_connectors::DeviceTrustKeyManager> ChromeBrowserCloudManagementControllerDesktop::CreateDeviceTrustKeyManager() { 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 201f6d1d07e5..8680d2a5ad31 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,11 +1,12 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -193,12 +193,12 @@ +@@ -200,13 +200,13 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/enterprise/idle/action.h" #include "components/device_signals/core/browser/pref_names.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -15,7 +16,7 @@ #include "chrome/browser/web_applications/policy/web_app_settings_policy_handler.h" #endif -@@ -727,14 +727,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -743,14 +743,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -32,7 +33,7 @@ { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1358,7 +1358,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1380,7 +1380,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -41,7 +42,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1428,18 +1428,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1450,18 +1450,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -63,7 +64,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1452,7 +1452,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1474,7 +1474,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 +73,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1562,7 +1562,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1581,7 +1581,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -81,7 +82,7 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -1649,7 +1649,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1668,7 +1668,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS) @@ -90,7 +91,7 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -1696,7 +1696,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1715,7 +1715,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) \ @@ -99,16 +100,25 @@ { key::kChromeAppsEnabled, extensions::pref_names::kChromeAppsEnabled, base::Value::Type::BOOLEAN }, -@@ -1756,7 +1756,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1775,7 +1775,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { key::kPrefixedStorageInfoEnabled, storage::kPrefixedStorageInfoEnabled, base::Value::Type::BOOLEAN }, -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) { key::kHighEfficiencyModeEnabled, performance_manager::user_tuning::prefs::kHighEfficiencyModeEnabled, base::Value::Type::BOOLEAN }, -@@ -2062,7 +2062,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2025,7 +2025,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED, + SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + handlers->AddHandler( + std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); + handlers->AddHandler( +@@ -2102,7 +2102,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -117,7 +127,7 @@ handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -2097,7 +2097,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2137,7 +2137,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) || \ @@ -126,16 +136,16 @@ signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>( key::kForceBrowserSignin, prefs::kForceBrowserSignin, base::Value::Type::BOOLEAN)); -@@ -2435,7 +2435,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH - chrome_schema)); - +@@ -2478,7 +2478,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + extensions::pref_names::kManifestV2Availability, /*min=*/0, /*max=*/3, + /*clamp=*/false)); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) handlers->AddHandler( std::make_unique<web_app::WebAppSettingsPolicyHandler>(chrome_schema)); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -2448,7 +2448,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2491,7 +2491,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -144,7 +154,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -2456,7 +2456,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2499,7 +2499,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index bc1c00c25de3..5085a6174e88 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-01-11 09:17:16 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -449,14 +449,14 @@ +@@ -455,14 +455,14 @@ #include "components/os_crypt/os_crypt.h" #endif @@ -17,7 +17,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -489,7 +489,7 @@ +@@ -495,7 +495,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -26,7 +26,7 @@ #include "ui/color/system_theme.h" #endif -@@ -1008,7 +1008,7 @@ void RegisterProfilePrefsForMigration( +@@ -1033,7 +1033,7 @@ void RegisterProfilePrefsForMigration( registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0); #endif @@ -35,7 +35,7 @@ // Deprecated 08/2022. registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false); #endif -@@ -1259,7 +1259,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1292,7 +1292,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_WIN) @@ -44,7 +44,7 @@ web_app::url_handler_prefs::RegisterLocalStatePrefs(registry); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -1586,11 +1586,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1627,11 +1627,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry); #endif @@ -58,7 +58,7 @@ browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif -@@ -1974,7 +1974,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { +@@ -2015,7 +2015,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { profile_prefs->ClearPref(kProfileAvatarTutorialShown); #endif diff --git a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc index 2ee56498371e..eb0c3b23640b 100644 --- a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc +++ b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/printing/print_backend_service_manager.cc -@@ -493,7 +493,7 @@ absl::optional<uint32_t> PrintBackendServiceManager::R +@@ -513,7 +513,7 @@ absl::optional<uint32_t> PrintBackendServiceManager::R query_clients_.insert(client_id); break; case ClientType::kQueryWithUi: @@ -9,7 +9,7 @@ if (!query_with_ui_clients_.empty()) return absl::nullopt; #endif -@@ -729,7 +729,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate +@@ -751,7 +751,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate break; case ClientType::kQueryWithUi: @@ -18,7 +18,7 @@ // No need to update if there were other query with UI clients. if (query_with_ui_clients_.size() > 1) return absl::nullopt; -@@ -786,7 +786,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate +@@ -808,7 +808,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate return kNoClientsRegisteredResetOnIdleTimeout; case ClientType::kQueryWithUi: diff --git a/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc b/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc index a972c861e8ce..15d39fa7a99e 100644 --- a/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc +++ b/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc @@ -1,11 +1,11 @@ ---- chrome/browser/printing/print_job_worker.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/printing/print_job_worker.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/printing/print_job_worker.cc -@@ -206,7 +206,7 @@ void PrintJobWorker::SetSettings(base::Value::Dict new +@@ -205,7 +205,7 @@ void PrintJobWorker::SetSettings(base::Value::Dict new crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>( print_backend->GetPrinterDriverInfo(printer_name)); --#if BUILDFLAG(IS_LINUX) && defined(USE_CUPS) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_CUPS) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_CUPS) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_CUPS) PrinterBasicInfo basic_info; if (print_backend->GetPrinterBasicInfo(printer_name, &basic_info) == mojom::ResultCode::kSuccess) { 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 4dd7268ab5af..7c02b36917bb 100644 --- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2022-08-31 12:19:35 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/process_singleton_posix.cc -@@ -97,7 +97,7 @@ +@@ -96,7 +96,7 @@ #include "net/base/network_interfaces.h" #include "ui/base/l10n/l10n_util.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/process_singleton_dialog_linux.h" #endif -@@ -351,7 +351,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo +@@ -350,7 +350,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 7d8797561f83..862868bf5bf5 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-01-11 09:17:16 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -261,7 +261,7 @@ +@@ -260,7 +260,7 @@ #include "chrome/browser/ui/cocoa/screentime/screentime_features.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/idle/idle_service_factory.h" #endif -@@ -448,11 +448,11 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -444,11 +444,11 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc index 2877f8a4cc9a..c47e91edd591 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_impl.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -258,6 +258,10 @@ +@@ -257,6 +257,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #endif @@ -11,7 +11,7 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -846,7 +850,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -861,7 +865,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/chromium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts b/www/chromium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts index b8cd2cb5a76b..26db99026dbb 100644 --- a/www/chromium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts +++ b/www/chromium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts @@ -1,4 +1,4 @@ ---- chrome/browser/resources/sandbox_internals/sandbox_internals.ts.orig 2022-09-24 10:57:32 UTC +--- chrome/browser/resources/sandbox_internals/sandbox_internals.ts.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/resources/sandbox_internals/sandbox_internals.ts @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be @@ -8,7 +8,7 @@ +// <if expr="is_posix or is_chromeos"> import './strings.m.js'; - import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; + import {loadTimeData} from 'chrome://resources/js/load_time_data.js'; @@ -121,7 +121,7 @@ function androidHandler() { } // </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 5029bf1149c9..ebe1ea0e3794 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 2022-11-30 08:12:58 UTC +--- chrome/browser/resources/settings/route.ts.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/resources/settings/route.ts -@@ -202,7 +202,7 @@ function createBrowserSettingsRoutes(): Partial<Settin +@@ -215,7 +215,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes r.ACCESSIBILITY = r.ADVANCED.createSection( '/accessibility', 'a11y', loadTimeData.getString('a11yPageTitle')); diff --git a/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html b/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html index 116bfa28eb63..7d50160e18d8 100644 --- a/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html +++ b/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html @@ -1,6 +1,6 @@ ---- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html -@@ -395,7 +395,7 @@ +@@ -443,7 +443,7 @@ consent-confirmation autofocus> $i18n{syncConfirmationConfirmLabel} </cr-button> @@ -9,7 +9,7 @@ <cr-button id="settingsButton" on-click="onGoToSettings_" disabled="[[anyButtonClicked_]]" consent-confirmation> $i18n{syncConfirmationSettingsLabel} -@@ -405,7 +405,7 @@ +@@ -453,7 +453,7 @@ disabled="[[anyButtonClicked_]]"> $i18n{syncConfirmationUndoLabel} </cr-button> @@ -18,7 +18,7 @@ <cr-button id="settingsButton" on-click="onGoToSettings_" disabled="[[anyButtonClicked_]]" consent-confirmation> $i18n{syncConfirmationSettingsLabel} -@@ -448,7 +448,7 @@ +@@ -496,7 +496,7 @@ consent-confirmation> $i18n{syncConfirmationConfirmLabel} </cr-button> @@ -27,7 +27,7 @@ <cr-button id="settingsButton" on-click="onGoToSettings_" disabled="[[anyButtonClicked_]]" consent-confirmation> $i18n{syncConfirmationSettingsLabel} -@@ -458,7 +458,7 @@ +@@ -506,7 +506,7 @@ disabled="[[anyButtonClicked_]]"> $i18n{syncConfirmationUndoLabel} </cr-button> diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc index fd15c8fa7cab..fb76734a5a1e 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2022-05-19 14:06:27 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -707,7 +707,7 @@ void IncidentReportingService::OnEnvironmentDataCollec +@@ -705,7 +705,7 @@ void IncidentReportingService::OnEnvironmentDataCollec // Process::Current().CreationTime() is missing on some platforms. #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ 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 83f91e9e116a..1229e1f28a58 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,24 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2022-11-30 08:12:58 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -445,7 +445,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -127,7 +127,7 @@ + #endif // BUILDFLAG(IS_ANDROID) + + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h" + #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || +@@ -448,7 +448,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 (features::kTabGroupsSaveSyncIntegration.Get()) { + controllers.push_back(std::make_unique<syncer::ModelTypeController>( + syncer::SAVED_TAB_GROUP, +@@ -461,7 +461,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. @@ -9,3 +27,12 @@ // Dictionary sync is enabled by default. if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { controllers.push_back( +@@ -627,7 +627,7 @@ ChromeSyncClient::GetControllerDelegateForModelType(sy + ->GetControllerDelegate(); + } + #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(features::kTabGroupsSaveSyncIntegration.Get()); + 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 new file mode 100644 index 000000000000..d77d4e7d5713 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc @@ -0,0 +1,29 @@ +--- chrome/browser/sync/sync_service_factory.cc.orig 2023-02-08 09:03:45 UTC ++++ chrome/browser/sync/sync_service_factory.cc +@@ -74,7 +74,7 @@ + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || + // BUILDFLAG(IS_WIN) +@@ -115,7 +115,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. +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + syncer::SyncPrefs prefs(profile->GetPrefs()); + local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); +@@ -251,7 +251,7 @@ SyncServiceFactory::SyncServiceFactory() + DependsOn(ThemeServiceFactory::GetInstance()); + #endif // !BUILDFLAG(IS_ANDROID) + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + DependsOn(SavedTabGroupServiceFactory::GetInstance()); + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || + // BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc index d40142e3e838..474b8ed4d673 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2022-10-24 13:33:33 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.cc -@@ -45,7 +45,7 @@ TaskGroupSampler::TaskGroupSampler( +@@ -44,7 +44,7 @@ TaskGroupSampler::TaskGroupSampler( const OnCpuRefreshCallback& on_cpu_refresh, const OnSwappedMemRefreshCallback& on_swapped_mem_refresh, const OnIdleWakeupsCallback& on_idle_wakeups, @@ -9,7 +9,7 @@ const OnOpenFdCountCallback& on_open_fd_count, #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) const OnProcessPriorityCallback& on_process_priority) -@@ -55,7 +55,7 @@ TaskGroupSampler::TaskGroupSampler( +@@ -54,7 +54,7 @@ TaskGroupSampler::TaskGroupSampler( on_cpu_refresh_callback_(on_cpu_refresh), on_swapped_mem_refresh_callback_(on_swapped_mem_refresh), on_idle_wakeups_callback_(on_idle_wakeups), @@ -18,7 +18,7 @@ on_open_fd_count_callback_(on_open_fd_count), #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) on_process_priority_callback_(on_process_priority) { -@@ -87,7 +87,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) +@@ -84,7 +84,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) base::BindOnce(on_swapped_mem_refresh_callback_)); } @@ -26,8 +26,8 @@ +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS, refresh_flags)) { - base::PostTaskAndReplyWithResult( -@@ -97,7 +97,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) + blocking_pool_runner_->PostTaskAndReplyWithResult( +@@ -94,7 +94,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) } #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -35,8 +35,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT, refresh_flags)) { - base::PostTaskAndReplyWithResult( -@@ -147,7 +147,7 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { + blocking_pool_runner_->PostTaskAndReplyWithResult( +@@ -143,7 +143,7 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { return process_metrics_->GetIdleWakeupsPerSecond(); } 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 f8bf505760e0..8835599eae0a 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 2022-10-24 13:33:33 UTC +--- chrome/browser/themes/theme_service.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/themes/theme_service.cc -@@ -72,7 +72,7 @@ +@@ -71,7 +71,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 -@@ -314,7 +314,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() +@@ -313,7 +313,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() } bool ThemeService::ShouldUseCustomFrame() const { 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 19e014a83a54..c2a5fe68ac5a 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2022-11-30 08:12:58 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -98,7 +98,7 @@ +@@ -99,7 +99,7 @@ #include "components/user_manager/user_manager.h" #endif @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -287,7 +287,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -288,7 +288,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(); -@@ -532,7 +532,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -533,7 +533,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; -@@ -1099,7 +1099,7 @@ void BrowserCommandController::InitCommandState() { +@@ -1079,7 +1079,7 @@ 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 33724a5b0e4d..473f8b7005cb 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 2022-11-30 08:12:58 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/ui/chrome_pages.cc -@@ -69,7 +69,7 @@ +@@ -68,7 +68,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -629,7 +629,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, +@@ -630,7 +630,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h index e023d7965900..88de2f04ca91 100644 --- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h +++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/chrome_pages.h.orig 2022-10-24 13:33:33 UTC +--- chrome/browser/ui/chrome_pages.h.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/ui/chrome_pages.h -@@ -30,7 +30,7 @@ enum class ConsentLevel; +@@ -33,7 +33,7 @@ enum class ConsentLevel; } // namespace signin #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ namespace web_app { enum class AppSettingsPageEntryPoint; } // namespace web_app -@@ -218,7 +218,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, +@@ -222,7 +222,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc index b54eaf3db04f..6423d810b828 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,6 +1,6 @@ ---- chrome/browser/ui/signin_view_controller.cc.orig 2022-10-24 13:33:33 UTC +--- chrome/browser/ui/signin_view_controller.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/ui/signin_view_controller.cc -@@ -273,7 +273,7 @@ void SigninViewController::ShowModalEnterpriseConfirma +@@ -275,7 +275,7 @@ void SigninViewController::ShowModalEnterpriseConfirma SkColor profile_color, signin::SigninChoiceCallback callback) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc index fcb8d59ab3e6..3d2f2240242d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2022-11-30 08:12:58 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -93,7 +93,7 @@ static const char* kBadFlags[] = { +@@ -94,7 +94,7 @@ static const char* kBadFlags[] = { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index e551805c0203..a96a722cbcf7 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc @@ -132,7 +132,7 @@ #include "chrome/credential_provider/common/gcp_strings.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/startup/web_app_info_recorder_utils.h" #endif -@@ -1011,7 +1011,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1006,7 +1006,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( silent_launch = true; } @@ -18,7 +18,7 @@ // Writes open and installed web apps to the specified file without // launching a new browser window or tab. if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) && -@@ -1203,7 +1203,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1198,7 +1198,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow) << "Failed launch with app: couldn't pick a profile"; std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId); diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc index 4286e7709925..746b815cbae5 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -257,7 +257,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( +@@ -259,7 +259,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( // at the state of the MessageLoop. Browser::CreateParams params = Browser::CreateParams(profile_, false); params.creation_source = Browser::CreationSource::kStartupCreator; 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 052a789c9d82..f1a4efe37ab8 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,21 +1,20 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -206,7 +206,7 @@ +@@ -203,7 +203,7 @@ #endif #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) - #include "chrome/browser/autofill_assistant/common_dependencies_chrome.h" - #include "chrome/browser/autofill_assistant/platform_dependencies_desktop.h" #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" -@@ -547,13 +547,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con - + #include "chrome/browser/ui/browser_finder.h" + #include "chrome/browser/ui/hats/hats_helper.h" +@@ -537,12 +537,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) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) metrics::DesktopSessionDurationObserver::CreateForWebContents(web_contents); #endif @@ -24,13 +23,4 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled( features::kHappinessTrackingSurveysForDesktopDemo) || - base::FeatureList::IsEnabled(features::kTrustSafetySentimentSurvey) || -@@ -576,7 +576,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled( - autofill_assistant::features::kAutofillAssistantDesktop)) { - autofill_assistant::CreateForWebContents( + base::FeatureList::IsEnabled(features::kTrustSafetySentimentSurvey)) { 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 aa0eba565dd7..b61f4ebe6623 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-01-11 09:17:16 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/ui/views/accelerator_table.cc -@@ -61,11 +61,11 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -64,11 +64,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}, -@@ -93,7 +93,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -96,7 +96,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}, -@@ -138,7 +138,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -141,7 +141,7 @@ const AcceleratorMapping kAcceleratorMap[] = { IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. @@ -32,12 +32,12 @@ {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}, -@@ -237,7 +237,7 @@ const AcceleratorMapping kAcceleratorMap[] = { - {ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, IDC_TOGGLE_QUICK_COMMANDS}, +@@ -241,7 +241,7 @@ const AcceleratorMapping kAcceleratorMap[] = { #endif // !BUILDFLAG(IS_CHROMEOS) #endif // !BUILDFLAG(IS_MAC) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) {ui::VKEY_S, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_RUN_SCREEN_AI_VISUAL_ANNOTATIONS}, #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_views_bubble__anchor__util__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_bubble__anchor__util__views.cc deleted file mode 100644 index 276e25fa1220..000000000000 --- a/www/chromium/files/patch-chrome_browser_ui_views_bubble__anchor__util__views.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/views/bubble_anchor_util_views.cc.orig 2022-11-30 08:12:58 UTC -+++ chrome/browser/ui/views/bubble_anchor_util_views.cc -@@ -39,7 +39,7 @@ AnchorConfiguration GetPageInfoAnchorConfiguration(Bro - views::BubbleBorder::TOP_LEFT}; - - // TODO(https://crbug.com/1346734): Enable this on all platforms. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (anchor == kLocationBar && browser_view->GetIsPictureInPictureType()) { - auto* frame_view = static_cast<PictureInPictureBrowserFrameView*>( - browser_view->frame()->GetFrameView()); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h index b55489a351f9..8bb09f96e0d6 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2022-06-17 14:20:10 UTC +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/ui/views/chrome_views_delegate.h -@@ -51,11 +51,11 @@ class ChromeViewsDelegate : public views::ViewsDelegat +@@ -54,11 +54,11 @@ class ChromeViewsDelegate : public views::ViewsDelegat base::OnceClosure callback) override; // 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_browser__non__client__frame__view__factory__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc index 2bd3192ff1cc..a26a09c5169d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc @@ -16,7 +16,7 @@ #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" @@ -18,12 +18,12 @@ auto* profile = browser_view->browser()->profile(); auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); -@@ -73,7 +73,7 @@ std::unique_ptr<BrowserNonClientFrameView> CreateBrows - BrowserFrame* frame, - BrowserView* browser_view) { - // TODO(https://crbug.com/1346734): Enable it on all platforms. --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +@@ -75,7 +75,7 @@ std::unique_ptr<BrowserNonClientFrameView> CreateBrows if (browser_view->browser()->is_type_picture_in_picture()) { auto view = std::make_unique<PictureInPictureBrowserFrameView>(frame, browser_view); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auto* profile = browser_view->browser()->profile(); + auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); + auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index 977062300bb1..9c4f86cf97c2 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-01-11 09:17:16 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2103,7 +2103,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2115,7 +2115,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 5ce5a27281c5..0ce07db87048 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,25 +1,52 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc -@@ -32,7 +32,7 @@ +@@ -36,7 +36,7 @@ #include "ui/aura/window.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #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 +@@ -57,7 +57,7 @@ constexpr int kBackToTabImageSize = 16; + // The height of the controls bar at the top of the window. + constexpr int kTopControlsHeight = 30; -@@ -256,7 +256,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( - for (ContentSettingImageView* view : content_setting_views_) - view->SetIconColor(color_provider->GetColor(kColorOmniboxResultsIcon)); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Frame border when window shadow is not drawn. + constexpr int kFrameBorderThickness = 4; + #endif +@@ -131,7 +131,7 @@ class WindowEventObserver : public ui::EventObserver { + + gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // If the top bar background is already drawn by window_frame_provider_, skip - // drawing it again below. - if (window_frame_provider_) { -@@ -292,7 +292,7 @@ void PictureInPictureBrowserFrameView::AddedToWidget() - BrowserNonClientFrameView::AddedToWidget(); + // 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()) { +@@ -226,7 +226,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow + }, + base::Unretained(this)))); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + frame_background_ = std::make_unique<views::FrameBackground>(); + #endif + +@@ -343,7 +343,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( + for (ContentSettingImageView* view : content_setting_views_) + view->SetIconColor(color_provider->GetColor(kColorOmniboxResultsIcon)); + +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + // On Linux the top bar background will be drawn in OnPaint(). + controls_container_view_->SetBackground(views::CreateSolidBackground( + SkColorSetA(color_provider->GetColor(kColorPipWindowControlsBackground), +@@ -376,7 +376,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg + BrowserNonClientFrameView::RemovedFromWidget(); } -#if BUILDFLAG(IS_LINUX) @@ -27,16 +54,16 @@ gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -494,7 +494,7 @@ void PictureInPictureBrowserFrameView::OnMouseEvent(ui +@@ -547,7 +547,7 @@ void PictureInPictureBrowserFrameView::OnWidgetDestroy /////////////////////////////////////////////////////////////////////////////// // views::View implementations: void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Draw the PiP window frame borders and shadows, including the top bar + // background. if (window_frame_provider_) { - // Draw the PiP window frame borders and shadows, including the top bar - // background. -@@ -562,7 +562,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -630,7 +630,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie } gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const { @@ -45,7 +72,16 @@ if (window_frame_provider_) { const auto insets = window_frame_provider_->GetFrameThicknessDip(); const auto tiled_edges = frame()->tiled_edges(); -@@ -582,7 +582,7 @@ int PictureInPictureBrowserFrameView::GetTopAreaHeight +@@ -651,7 +651,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor + } + + gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return FrameBorderInsets(); + #else + return gfx::Insets(kResizeBorder); +@@ -662,7 +662,7 @@ int PictureInPictureBrowserFrameView::GetTopAreaHeight return FrameBorderInsets().top() + kTopControlsHeight; } @@ -53,4 +89,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void PictureInPictureBrowserFrameView::SetWindowFrameProvider( ui::WindowFrameProvider* window_frame_provider) { - window_frame_provider_ = window_frame_provider; + DCHECK(window_frame_provider); 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 a1369d291575..ccc68dda3bdc 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h @@ -20,7 +20,7 @@ #include "ui/views/layout/box_layout_view.h" @@ -9,25 +9,25 @@ #include "ui/linux/window_frame_provider.h" #endif -@@ -67,7 +67,7 @@ class PictureInPictureBrowserFrameView - void OnThemeChanged() override; +@@ -75,7 +75,7 @@ class PictureInPictureBrowserFrameView void Layout() override; void AddedToWidget() override; + void RemovedFromWidget() override; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) gfx::Insets MirroredFrameBorderInsets() const override; gfx::Insets GetInputInsets() const override; SkRRect GetRestoredClipRegion() const override; -@@ -145,7 +145,7 @@ class PictureInPictureBrowserFrameView - // Returns the height of the top bar area, including the window top border. - int GetTopAreaHeight() const; +@@ -157,7 +157,7 @@ class PictureInPictureBrowserFrameView + // Called when mouse entered or exited the pip window. + void OnMouseEnteredOrExitedWindow(bool entered); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Sets the window frame provider so that it will be used for drawing. void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider); -@@ -177,7 +177,7 @@ class PictureInPictureBrowserFrameView +@@ -194,7 +194,7 @@ class PictureInPictureBrowserFrameView widget_observation_{this}; bool mouse_inside_window_ = false; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc index 7697ffc30943..92d21d084615 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2022-06-17 14:20:10 UTC +--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/ui/views/hung_renderer_view.cc -@@ -401,7 +401,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() +@@ -404,7 +404,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() content::RenderProcessHost* rph = hung_pages_table_model_->GetRenderWidgetHost()->GetProcess(); if (rph) { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc index 885a4872b6ba..c3ee2d018c96 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,4 +1,4 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2022-10-24 13:33:33 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc @@ -50,7 +50,7 @@ namespace { @@ -18,7 +18,7 @@ // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView( -@@ -456,7 +456,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati +@@ -447,7 +447,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_tabs_new__tab__button.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc index 2edc92cd28d5..26d4d15724e7 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/ui/views/tabs/new_tab_button.cc -@@ -59,7 +59,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, Presse +@@ -61,7 +61,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, Presse SetAnimateOnStateChange(true); // 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__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index 58abe59fd398..0fdd9ffbddc4 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,4 +1,4 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc @@ -82,7 +82,7 @@ #include "components/remote_cocoa/browser/window.h" @@ -27,7 +27,7 @@ can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); -@@ -1106,7 +1106,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -1107,7 +1107,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. -@@ -2097,7 +2097,7 @@ void TabDragController::CompleteDrag() { +@@ -2101,7 +2101,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 -@@ -2488,7 +2488,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2495,7 +2495,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_webui_app__home_app__home__page__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc new file mode 100644 index 000000000000..11f277d6d29b --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2023-02-08 09:03:45 UTC ++++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc +@@ -144,7 +144,7 @@ void AppHomePageHandler::InstallOsHooks(const web_app: + web_app->CanUserUninstallWebApp(); + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +- (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) ++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS)) + options.os_hooks[web_app::OsHookType::kUrlHandlers] = true; + #else + options.os_hooks[web_app::OsHookType::kUrlHandlers] = false; +@@ -276,7 +276,7 @@ void AppHomePageHandler::FillExtensionInfoList( + bool is_deprecated_app = false; + auto* context = extension_service_->GetBrowserContext(); + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + is_deprecated_app = extensions::IsExtensionUnsupportedDeprecatedApp( + context, extension->id()); + #endif 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 29f07b054f2e..0b74e9a454e1 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-01-11 09:17:16 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -319,7 +319,7 @@ +@@ -324,7 +324,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 -@@ -345,17 +345,17 @@ +@@ -350,17 +350,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 -@@ -716,7 +716,7 @@ bool IsAboutUI(const GURL& url) { +@@ -721,7 +721,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) -@@ -1024,7 +1024,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1012,7 +1012,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI<ash::personalization_app::PersonalizationAppUI>; } #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -48,7 +48,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -1085,7 +1085,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1073,7 +1073,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) -@@ -1145,27 +1145,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1137,27 +1137,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc index 4d22d9b552f4..2090592fc74f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc -@@ -326,7 +326,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI +@@ -323,7 +323,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI bool is_deprecated_app = false; auto* context = extension_service_->GetBrowserContext(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ is_deprecated_app = extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id()); #endif -@@ -1444,7 +1444,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: +@@ -1455,7 +1455,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: options.os_hooks[web_app::OsHookType::kUninstallationViaOsSettings] = web_app->CanUserUninstallWebApp(); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index 775c5a916520..521e5c28c534 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc @@ -122,7 +122,7 @@ #include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h" @@ -27,7 +27,7 @@ bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt); #else bool allow_qt_theme = false; -@@ -382,7 +382,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -378,7 +378,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, {"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT}, {"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT}, @@ -36,7 +36,7 @@ {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -392,7 +392,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -388,7 +388,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif @@ -45,7 +45,7 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -416,7 +416,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -412,7 +412,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc b/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc index 5d9bddaf2c36..a165c3d83aa6 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/web_applications/extensions/extension_status_utils.cc @@ -26,7 +26,7 @@ namespace { const char* g_preinstalled_app_for_testing = nullptr; @@ -6,10 +6,10 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - const char kMobilityPrintExtensionId[] = "alhngdkjgnedakdlnamimgfihgkmenbh"; + const char kMobilityPrintAndDirectPrintIoExtensionIds[] = + "alhngdkjgnedakdlnamimgfihgkmenbh,gnddkmpjjjcimefninepfmmddpgaaado"; - BASE_FEATURE(kChromeAppsDeprecationExcludeForceInstalls, -@@ -108,7 +108,7 @@ bool ClearExternalExtensionUninstalled(content::Browse +@@ -110,7 +110,7 @@ bool ClearExternalExtensionUninstalled(content::Browse } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc index c8b13b596a22..ed11e5dcddc7 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2022-10-24 13:33:33 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut.cc -@@ -54,7 +54,7 @@ namespace { +@@ -58,7 +58,7 @@ namespace { #if BUILDFLAG(IS_MAC) const int kDesiredIconSizesForShortcut[] = {16, 32, 128, 256, 512}; @@ -9,7 +9,7 @@ // Linux supports icons of any size. FreeDesktop Icon Theme Specification states // that "Minimally you should install a 48x48 icon in the hicolor theme." const int kDesiredIconSizesForShortcut[] = {16, 32, 48, 128, 256, 512}; -@@ -207,7 +207,7 @@ ShortcutOverrideForTesting::ShortcutOverrideForTesting +@@ -212,7 +212,7 @@ ShortcutOverrideForTesting::ShortcutOverrideForTesting #elif BUILDFLAG(IS_MAC) bool success = chrome_apps_folder.CreateUniqueTempDirUnderPath(base_path); DCHECK(success); @@ -18,7 +18,7 @@ bool success = desktop.CreateUniqueTempDirUnderPath(base_path); DCHECK(success); success = startup.CreateUniqueTempDirUnderPath(base_path); -@@ -226,7 +226,7 @@ ShortcutOverrideForTesting::ShortcutOverrideForTesting +@@ -231,7 +231,7 @@ ShortcutOverrideForTesting::ShortcutOverrideForTesting #elif BUILDFLAG(IS_MAC) bool success = chrome_apps_folder.CreateUniqueTempDir(); DCHECK(success); @@ -27,7 +27,7 @@ bool success = desktop.CreateUniqueTempDir(); DCHECK(success); success = startup.CreateUniqueTempDir(); -@@ -234,7 +234,7 @@ ShortcutOverrideForTesting::ShortcutOverrideForTesting +@@ -239,7 +239,7 @@ ShortcutOverrideForTesting::ShortcutOverrideForTesting #endif } @@ -36,7 +36,7 @@ auto callback = base::BindRepeating([](base::FilePath filename, std::string xdg_command, std::string file_contents) { -@@ -267,7 +267,7 @@ ShortcutOverrideForTesting::~ShortcutOverrideForTestin +@@ -272,7 +272,7 @@ ShortcutOverrideForTesting::~ShortcutOverrideForTestin } } } diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h index 9995f9df7b98..7c5767dda5c2 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h +++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut.h -@@ -21,7 +21,7 @@ +@@ -23,7 +23,7 @@ #include "ui/gfx/image/image_family.h" #include "url/gurl.h" @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h" #endif // BUILDFLAG(IS_LINUX) -@@ -39,7 +39,7 @@ class ImageSkia; +@@ -41,7 +41,7 @@ class ImageSkia; namespace web_app { @@ -18,7 +18,7 @@ struct LinuxFileRegistration { std::string xdg_command; std::string file_contents; -@@ -89,7 +89,7 @@ struct ShortcutOverrideForTesting +@@ -91,7 +91,7 @@ struct ShortcutOverrideForTesting #elif BUILDFLAG(IS_MAC) base::ScopedTempDir chrome_apps_folder; std::map<base::FilePath, bool> startup_enabled; @@ -27,7 +27,7 @@ base::ScopedTempDir desktop; base::ScopedTempDir startup; std::vector<LinuxFileRegistration> linux_file_registration; -@@ -136,7 +136,7 @@ struct ShortcutInfo { +@@ -144,7 +144,7 @@ struct ShortcutInfo { std::set<std::string> file_handler_extensions; std::set<std::string> file_handler_mime_types; std::set<std::string> protocol_handlers; diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc index 2fd063662418..24e50b2664dd 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc -@@ -449,7 +449,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B +@@ -453,7 +453,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B } } diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc index f16e78f2717a..2619d0138079 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/web_app_provider.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/browser/web_applications/web_app_provider.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/web_applications/web_app_provider.cc -@@ -283,7 +283,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile +@@ -295,7 +295,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile protocol_handler_manager.get()); std::unique_ptr<UrlHandlerManager> url_handler_manager; diff --git a/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc index d39bb32f98bd..e727147778e8 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-01-11 09:17:16 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -679,7 +679,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl +@@ -691,7 +691,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 926eb847d76e..1a9756b11a2d 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-01-11 09:17:16 UTC +--- chrome/common/chrome_features.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/common/chrome_features.cc -@@ -108,7 +108,7 @@ BASE_FEATURE(kAsyncDns, +@@ -96,7 +96,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, -@@ -126,7 +126,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, +@@ -114,7 +114,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. -@@ -310,7 +310,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, +@@ -303,7 +303,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 -@@ -334,7 +334,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles, +@@ -327,7 +327,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. -@@ -358,7 +358,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati +@@ -354,7 +354,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 -@@ -374,7 +374,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa +@@ -370,7 +370,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 -@@ -750,7 +750,7 @@ BASE_FEATURE(kUpdateHistoryEntryPointsInIncognito, +@@ -748,7 +748,7 @@ BASE_FEATURE(kUpdateHistoryEntryPointsInIncognito, "UpdateHistoryEntryPointsInIncognito", base::FEATURE_ENABLED_BY_DEFAULT); @@ -63,7 +63,7 @@ BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -763,7 +763,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -761,7 +761,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 66ba028caa73..16ff8c0343a5 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 2022-11-30 08:12:58 UTC +--- chrome/common/chrome_features.h.orig 2023-02-08 09:03:45 UTC +++ chrome/common/chrome_features.h -@@ -81,13 +81,13 @@ BASE_DECLARE_FEATURE(kAppShimNewCloseBehavior); +@@ -73,13 +73,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) -@@ -189,7 +189,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); +@@ -186,7 +186,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); -@@ -432,7 +432,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); +@@ -429,7 +429,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kUpdateHistoryEntryPointsInIncognito); @@ -34,7 +34,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor); COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel; -@@ -440,7 +440,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -437,7 +437,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index 452d99f086d7..c99e7943950a 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-01-11 09:17:16 UTC +--- chrome/common/chrome_switches.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/common/chrome_switches.cc -@@ -839,14 +839,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -854,14 +854,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h index fa0ed3a8f3ea..22f301e4eb01 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/chromium/files/patch-chrome_common_chrome__switches.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.h.orig 2023-01-11 09:17:16 UTC +--- chrome/common/chrome_switches.h.orig 2023-02-08 09:03:45 UTC +++ chrome/common/chrome_switches.h -@@ -263,12 +263,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -265,12 +265,12 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_common_media_cdm__host__file__path.cc b/www/chromium/files/patch-chrome_common_media_cdm__host__file__path.cc index a850b4fba35b..af6ceaa32452 100644 --- a/www/chromium/files/patch-chrome_common_media_cdm__host__file__path.cc +++ b/www/chromium/files/patch-chrome_common_media_cdm__host__file__path.cc @@ -1,6 +1,6 @@ ---- chrome/common/media/cdm_host_file_path.cc.orig 2022-10-24 13:33:33 UTC +--- chrome/common/media/cdm_host_file_path.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/common/media/cdm_host_file_path.cc -@@ -91,7 +91,7 @@ void AddCdmHostFilePaths( +@@ -90,7 +90,7 @@ void AddCdmHostFilePaths( cdm_host_file_paths->emplace_back(chrome_framework_path, chrome_framework_sig_path); diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index 593fc7cbf973..38e2238144a7 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.cc +++ b/www/chromium/files/patch-chrome_common_pref__names.cc @@ -1,4 +1,4 @@ ---- chrome/common/pref_names.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/common/pref_names.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/common/pref_names.cc @@ -1268,7 +1268,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox @@ -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"; -@@ -1893,7 +1893,7 @@ const char kDownloadDirUpgraded[] = "download.director +@@ -1897,7 +1897,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 -@@ -2197,7 +2197,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i +@@ -2207,7 +2207,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i // its isolation requirements. const char kWebAppsIsolationState[] = "web_apps.isolation_state"; @@ -36,7 +36,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) // Dictionary that maps origins to web apps that can act as URL handlers. const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info"; -@@ -2297,7 +2297,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled +@@ -2307,7 +2307,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled // requests. const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -45,7 +45,7 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. const char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3300,7 +3300,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto +@@ -3336,7 +3336,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto const char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index 489a1c956f28..82057c1b6019 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-01-11 09:17:16 UTC +--- chrome/common/pref_names.h.orig 2023-02-08 09:03:45 UTC +++ chrome/common/pref_names.h @@ -398,7 +398,7 @@ extern const char kUseAshProxy[]; #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -18,7 +18,7 @@ extern const char kUseCustomChromeFrame[]; #endif #if BUILDFLAG(ENABLE_PLUGINS) -@@ -616,7 +616,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[ +@@ -617,7 +617,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) -@@ -728,7 +728,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps +@@ -731,7 +731,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 -@@ -859,7 +859,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] +@@ -862,7 +862,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) -@@ -1128,7 +1128,7 @@ extern const char kBlockAutoplayEnabled[]; +@@ -1139,7 +1139,7 @@ extern const char kBlockAutoplayEnabled[]; #endif extern const char kSandboxExternalProtocolBlocked[]; diff --git a/www/chromium/files/patch-chrome_common_url__constants.cc b/www/chromium/files/patch-chrome_common_url__constants.cc index fe33baf73863..58c8c9770041 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 2022-11-30 08:12:58 UTC +--- chrome/common/url_constants.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/common/url_constants.cc -@@ -498,7 +498,7 @@ const char kPhoneHubPermissionLearnMoreURL[] = +@@ -501,7 +501,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 acc05f44501b..31401ef7b489 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 2022-11-30 08:12:58 UTC +--- chrome/common/url_constants.h.orig 2023-02-08 09:03:45 UTC +++ chrome/common/url_constants.h -@@ -471,7 +471,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; +@@ -476,7 +476,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 ccdcab5ac45a..2cc5bf27d856 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-01-11 09:17:16 UTC +--- chrome/common/webui_url_constants.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/common/webui_url_constants.cc -@@ -487,18 +487,18 @@ const char kOsUIScanningAppURL[] = "os://scanning"; +@@ -490,18 +490,18 @@ const char kOsUIScanningAppURL[] = "os://scanning"; const char kOsUIVersionURL[] = "os://version"; #endif @@ -22,7 +22,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -@@ -513,14 +513,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr +@@ -516,14 +516,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[] = -@@ -537,7 +537,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro +@@ -540,7 +540,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"; -@@ -613,7 +613,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan +@@ -616,7 +616,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 -@@ -827,7 +827,7 @@ const char* const kChromeDebugURLs[] = { +@@ -831,7 +831,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 c52623870f3c..6fcf152e36d7 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-01-11 09:17:16 UTC +--- chrome/common/webui_url_constants.h.orig 2023-02-08 09:03:45 UTC +++ chrome/common/webui_url_constants.h -@@ -414,24 +414,24 @@ extern const char kOsUIScanningAppURL[]; +@@ -416,24 +416,24 @@ extern const char kOsUIScanningAppURL[]; extern const char kOsUIVersionURL[]; #endif @@ -29,7 +29,7 @@ extern const char kChromeUIWebAppSettingsURL[]; extern const char kChromeUIWebAppSettingsHost[]; #endif -@@ -446,14 +446,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; +@@ -448,14 +448,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -46,7 +46,7 @@ extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIEnterpriseProfileWelcomeHost[]; -@@ -467,7 +467,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -469,7 +469,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif diff --git a/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc index 1ae2b8418f42..a6da22438dc5 100644 --- a/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc +++ b/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc @@ -1,6 +1,6 @@ ---- chrome/services/printing/print_backend_service_impl.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/services/printing/print_backend_service_impl.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/services/printing/print_backend_service_impl.cc -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ #include "printing/backend/cups_connection_pool.h" #endif @@ -9,7 +9,7 @@ #include "base/no_destructor.h" #include "ui/linux/linux_ui.h" #include "ui/linux/linux_ui_delegate_stub.h" -@@ -68,7 +68,7 @@ namespace printing { +@@ -69,7 +69,7 @@ namespace printing { namespace { @@ -18,7 +18,7 @@ void InstantiateLinuxUiDelegate() { // TODO(crbug.com/809738) Until a real UI can be used in a utility process, // need to use the stub version. -@@ -437,7 +437,7 @@ void PrintBackendServiceImpl::Init(const std::string& +@@ -485,7 +485,7 @@ void PrintBackendServiceImpl::Init( // `InitCommon()`. InitializeProcessForPrinting(); print_backend_ = PrintBackend::CreateInstance(locale); @@ -27,12 +27,12 @@ // Test framework already initializes the UI, so this should not go in // `InitCommon()`. Additionally, low-level Linux UI is not needed when tests // are using `TestPrintingContext`. -@@ -620,7 +620,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( +@@ -672,7 +672,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>( print_backend_->GetPrinterDriverInfo(*printer_name)); --#if BUILDFLAG(IS_LINUX) && defined(USE_CUPS) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_CUPS) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_CUPS) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_CUPS) // Try to fill in advanced settings based upon basic info options. PrinterBasicInfo basic_info; if (print_backend_->GetPrinterBasicInfo(*printer_name, &basic_info) == diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index 7d77cdd0376c..15260f87faf2 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-01-11 09:17:16 UTC +--- chrome/test/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ chrome/test/BUILD.gn -@@ -10141,7 +10141,7 @@ test("chrome_app_unittests") { +@@ -10219,7 +10219,7 @@ test("chrome_app_unittests") { "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", ] diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc index 59ffc8813111..bcfa108e4ed3 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 2022-03-25 21:59:56 UTC +--- chrome/test/chromedriver/chrome_launcher.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/test/chromedriver/chrome_launcher.cc -@@ -65,6 +65,7 @@ +@@ -64,6 +64,7 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc index ce32ad6feb3a..0c05e3e92510 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2022-04-21 18:48:31 UTC +--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/test/chromedriver/chrome/chrome_finder.cc -@@ -53,7 +53,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l +@@ -57,7 +57,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l installation_locations[i].Append(L"Chromium\\Application")); } } @@ -9,7 +9,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* locations) { // TODO: Respect users' PATH variables. // Until then, we use an approximation of the most common defaults. -@@ -138,7 +138,7 @@ bool FindChrome(base::FilePath* browser_exe) { +@@ -142,7 +142,7 @@ bool FindChrome(base::FilePath* browser_exe) { base::FilePath browser_exes_array[] = { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) base::FilePath(chrome::kBrowserProcessExecutablePath), diff --git a/www/chromium/files/patch-chrome_test_interaction_interaction__test__util__browser.cc b/www/chromium/files/patch-chrome_test_interaction_interaction__test__util__browser.cc index 8c4051cbba7a..534ecac8686a 100644 --- a/www/chromium/files/patch-chrome_test_interaction_interaction__test__util__browser.cc +++ b/www/chromium/files/patch-chrome_test_interaction_interaction__test__util__browser.cc @@ -1,6 +1,6 @@ ---- chrome/test/interaction/interaction_test_util_browser.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/test/interaction/interaction_test_util_browser.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/test/interaction/interaction_test_util_browser.cc -@@ -26,7 +26,7 @@ +@@ -31,7 +31,7 @@ #include "ui/base/interaction/interaction_test_util_mac.h" #endif diff --git a/www/chromium/files/patch-chrome_updater_app_app__install.cc b/www/chromium/files/patch-chrome_updater_app_app__install.cc deleted file mode 100644 index 517b0746e2e8..000000000000 --- a/www/chromium/files/patch-chrome_updater_app_app__install.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/updater/app/app_install.cc.orig 2023-01-11 09:17:16 UTC -+++ chrome/updater/app/app_install.cc -@@ -214,7 +214,7 @@ void AppInstall::WakeCandidate() { - update_service_internal, base::WrapRefCounted(this))); - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/1276114) - implement. - void AppInstall::WakeCandidateDone() { - NOTIMPLEMENTED(); diff --git a/www/chromium/files/patch-chrome_updater_app_app__uninstall.cc b/www/chromium/files/patch-chrome_updater_app_app__uninstall.cc deleted file mode 100644 index 141b761283b9..000000000000 --- a/www/chromium/files/patch-chrome_updater_app_app__uninstall.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/updater/app/app_uninstall.cc.orig 2022-02-28 16:54:41 UTC -+++ chrome/updater/app/app_uninstall.cc -@@ -32,7 +32,7 @@ - #include "chrome/updater/win/setup/uninstall.h" - #elif BUILDFLAG(IS_MAC) - #include "chrome/updater/mac/setup/setup.h" --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "chrome/updater/linux/setup/setup.h" - #endif - diff --git a/www/chromium/files/patch-chrome_updater_configurator.cc b/www/chromium/files/patch-chrome_updater_configurator.cc new file mode 100644 index 000000000000..77cbfaf78d69 --- /dev/null +++ b/www/chromium/files/patch-chrome_updater_configurator.cc @@ -0,0 +1,11 @@ +--- chrome/updater/configurator.cc.orig 2023-02-08 09:03:45 UTC ++++ chrome/updater/configurator.cc +@@ -57,7 +57,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs> + base::MakeRefCounted<update_client::InProcessUnzipperFactory>()), + patch_factory_( + base::MakeRefCounted<update_client::InProcessPatcherFactory>()) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On Linux creating the NetworkFetcherFactory requires performing blocking IO + // to load an external library. This should be done when the configurator is + // created. diff --git a/www/chromium/files/patch-chrome_updater_installer.cc b/www/chromium/files/patch-chrome_updater_installer.cc deleted file mode 100644 index 9d60f181a542..000000000000 --- a/www/chromium/files/patch-chrome_updater_installer.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/updater/installer.cc.orig 2023-01-11 09:17:16 UTC -+++ chrome/updater/installer.cc -@@ -252,7 +252,7 @@ absl::optional<base::FilePath> Installer::GetCurrentIn - return path->AppendASCII(pv_.GetString()); - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - - AppInstallerResult RunApplicationInstaller( - const AppInfo& /*app_info*/, diff --git a/www/chromium/files/patch-chrome_updater_ipc_ipc__names.h b/www/chromium/files/patch-chrome_updater_ipc_ipc__names.h new file mode 100644 index 000000000000..3d33a2bac2ea --- /dev/null +++ b/www/chromium/files/patch-chrome_updater_ipc_ipc__names.h @@ -0,0 +1,11 @@ +--- chrome/updater/ipc/ipc_names.h.orig 2023-02-08 09:03:45 UTC ++++ chrome/updater/ipc/ipc_names.h +@@ -13,7 +13,7 @@ namespace updater { + mojo::NamedPlatformChannel::ServerName GetUpdateServiceInternalServerName( + UpdaterScope scope); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + mojo::NamedPlatformChannel::ServerName GetUpdateServiceServerName( + UpdaterScope scope); + #endif // BUILDFLAG(IS_LINUX) diff --git a/www/chromium/files/patch-chrome_updater_updater.cc b/www/chromium/files/patch-chrome_updater_updater.cc index b4293f0a3956..1b12ee734f50 100644 --- a/www/chromium/files/patch-chrome_updater_updater.cc +++ b/www/chromium/files/patch-chrome_updater_updater.cc @@ -1,20 +1,11 @@ ---- chrome/updater/updater.cc.orig 2023-01-11 09:17:16 UTC +--- chrome/updater/updater.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/updater/updater.cc -@@ -44,7 +44,7 @@ - #include "chrome/updater/win/win_util.h" +@@ -49,7 +49,7 @@ + #include "chrome/updater/util/win_util.h" #elif BUILDFLAG(IS_MAC) #include "chrome/updater/app/server/mac/server.h" -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/updater/app/server/linux/server.h" - #include "chrome/updater/linux/ipc_support.h" #endif -@@ -137,7 +137,7 @@ int HandleUpdaterCommands(UpdaterScope updater_scope, - CHECK(false) << "--crash-me was used."; - } --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // As long as this object is alive, all Mojo API surface relevant to IPC - // connections is usable, and message pipes which span a process boundary will - // continue to function. diff --git a/www/chromium/files/patch-chrome_updater_util.cc b/www/chromium/files/patch-chrome_updater_util.cc deleted file mode 100644 index 2ef8ac63e4a3..000000000000 --- a/www/chromium/files/patch-chrome_updater_util.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/updater/util.cc.orig 2023-01-11 09:17:16 UTC -+++ chrome/updater/util.cc -@@ -36,7 +36,7 @@ - #include "third_party/abseil-cpp/absl/types/optional.h" - #include "url/gurl.h" - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "chrome/updater/linux/linux_util.h" - #elif BUILDFLAG(IS_MAC) - #import "chrome/updater/mac/mac_util.h" -@@ -119,7 +119,7 @@ absl::optional<base::FilePath> GetBaseDataDirectory(Up - app_data_dir = GetApplicationDataDirectory(scope); - #elif BUILDFLAG(IS_MAC) - app_data_dir = GetApplicationSupportDirectory(scope); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - app_data_dir = GetApplicationDataDirectory(scope); - #endif - if (!app_data_dir) { diff --git a/www/chromium/files/patch-chrome_updater_util_posix__util.cc b/www/chromium/files/patch-chrome_updater_util_posix__util.cc new file mode 100644 index 000000000000..019f8e5f2773 --- /dev/null +++ b/www/chromium/files/patch-chrome_updater_util_posix__util.cc @@ -0,0 +1,20 @@ +--- chrome/updater/util/posix_util.cc.orig 2023-02-08 09:03:45 UTC ++++ chrome/updater/util/posix_util.cc +@@ -10,7 +10,7 @@ + #include "chrome/updater/updater_branding.h" + #include "chrome/updater/util/util.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/updater/util/linux_util.h" + #endif + +@@ -42,7 +42,7 @@ base::FilePath GetUpdaterFolderName() { + + absl::optional<base::FilePath> GetBaseInstallDirectory(UpdaterScope scope) { + absl::optional<base::FilePath> path; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + path = GetApplicationDataDirectory(scope); + #elif BUILDFLAG(IS_MAC) + path = GetLibraryFolderPath(scope); diff --git a/www/chromium/files/patch-chrome_utility_services.cc b/www/chromium/files/patch-chrome_utility_services.cc index 020df159a333..f0765bb1424e 100644 --- a/www/chromium/files/patch-chrome_utility_services.cc +++ b/www/chromium/files/patch-chrome_utility_services.cc @@ -1,4 +1,4 @@ ---- chrome/utility/services.cc.orig 2022-09-24 10:57:32 UTC +--- chrome/utility/services.cc.orig 2023-02-08 09:03:45 UTC +++ chrome/utility/services.cc @@ -56,7 +56,7 @@ #include "chrome/services/system_signals/mac/mac_system_signals_service.h" @@ -27,7 +27,7 @@ auto RunSystemSignalsService( mojo::PendingReceiver<device_signals::mojom::SystemSignalsService> receiver) { -@@ -287,7 +287,7 @@ auto RunCupsIppParser( +@@ -285,7 +285,7 @@ auto RunCupsIppParser( } #endif @@ -36,7 +36,7 @@ auto RunDocumentAnalysis( mojo::PendingReceiver<chrome::mojom::DocumentAnalysisService> receiver) { return std::make_unique<DocumentAnalysisService>(std::move(receiver)); -@@ -471,7 +471,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -465,7 +465,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunWindowsIconReader); #endif // BUILDFLAG(IS_WIN) @@ -45,7 +45,7 @@ services.Add(RunSystemSignalsService); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -487,7 +487,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -481,7 +481,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunFileUtil); #endif diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc index a9732ce7f6f8..b6c9559e91e4 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,4 +1,4 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2022-09-24 10:57:32 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2023-02-08 09:03:45 UTC +++ chromecast/browser/cast_browser_main_parts.cc @@ -90,7 +90,7 @@ #include "ui/base/ui_base_switches.h" @@ -9,7 +9,7 @@ #include <fontconfig/fontconfig.h> #include <signal.h> #include <sys/prctl.h> -@@ -265,7 +265,7 @@ class CastViewsDelegate : public views::ViewsDelegate +@@ -263,7 +263,7 @@ class CastViewsDelegate : public views::ViewsDelegate #endif // defined(USE_AURA) @@ -18,7 +18,7 @@ base::FilePath GetApplicationFontsDir() { std::unique_ptr<base::Environment> env(base::Environment::Create()); -@@ -311,7 +311,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -309,7 +309,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {cc::switches::kDisableThreadedAnimation, ""}, #endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) @@ -27,7 +27,7 @@ #if defined(ARCH_CPU_X86_FAMILY) // This is needed for now to enable the x11 Ozone platform to work with // current Linux/NVidia OpenGL drivers. -@@ -482,7 +482,7 @@ void CastBrowserMainParts::ToolkitInitialized() { +@@ -480,7 +480,7 @@ void CastBrowserMainParts::ToolkitInitialized() { views_delegate_ = std::make_unique<CastViewsDelegate>(); #endif // defined(USE_AURA) diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc index d7460a9b0fdc..037ac5a0032e 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2023-01-11 09:17:16 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2023-02-08 09:03:45 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -433,7 +433,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -434,7 +434,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { diff --git a/www/chromium/files/patch-components_autofill__assistant_browser_client__context.cc b/www/chromium/files/patch-components_autofill__assistant_browser_client__context.cc deleted file mode 100644 index 79721bfebd28..000000000000 --- a/www/chromium/files/patch-components_autofill__assistant_browser_client__context.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/autofill_assistant/browser/client_context.cc.orig 2023-01-11 09:17:16 UTC -+++ components/autofill_assistant/browser/client_context.cc -@@ -109,7 +109,7 @@ ClientContextProto::PlatformType ClientContext::GetPla - #if BUILDFLAG(IS_ANDROID) - return ClientContextProto::PLATFORM_TYPE_ANDROID; - #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - return ClientContextProto::PLATFORM_TYPE_DESKTOP; - #else - return ClientContextProto::PLATFORM_TYPE_UNDEFINED; diff --git a/www/chromium/files/patch-components_autofill__assistant_browser_client__context__unittest.cc b/www/chromium/files/patch-components_autofill__assistant_browser_client__context__unittest.cc deleted file mode 100644 index b7dd3970a05c..000000000000 --- a/www/chromium/files/patch-components_autofill__assistant_browser_client__context__unittest.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- components/autofill_assistant/browser/client_context_unittest.cc.orig 2023-01-11 09:17:16 UTC -+++ components/autofill_assistant/browser/client_context_unittest.cc -@@ -75,7 +75,7 @@ TEST_F(ClientContextTest, Initialize) { - ClientContextProto::PLATFORM_TYPE_ANDROID); - #endif - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - EXPECT_THAT(actual_client_context.platform_type(), - ClientContextProto::PLATFORM_TYPE_DESKTOP); - #endif -@@ -256,7 +256,7 @@ TEST(GetPlatformType, ReturnsCorrectPlatform) { - ClientContextProto::PLATFORM_TYPE_ANDROID); - #endif - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - EXPECT_THAT(ClientContext::GetPlatformType(), - ClientContextProto::PLATFORM_TYPE_DESKTOP); - #endif diff --git a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc index e71968c8c301..7f547bfd6a23 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-01-11 09:17:16 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2023-02-08 09:03:45 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -2079,7 +2079,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2148,7 +2148,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 77630f4e7401..912bc338b5ef 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2022-11-30 08:12:58 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2023-02-08 09:03:45 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -267,7 +267,7 @@ const base::FeatureParam<int> +@@ -247,7 +247,7 @@ const base::FeatureParam<int> bool ShouldShowImprovedUserConsentForCreditCardSave() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_components__chromium__strings.grd b/www/chromium/files/patch-components_components__chromium__strings.grd index d88e2bafa1a4..affeda3751bf 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 2022-07-22 17:30:31 UTC +--- components/components_chromium_strings.grd.orig 2023-02-08 09:03:45 UTC +++ components/components_chromium_strings.grd -@@ -223,7 +223,7 @@ +@@ -220,7 +220,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 779ac3540136..53ff1e162e3d 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 2022-07-22 17:30:31 UTC +--- components/components_google_chrome_strings.grd.orig 2023-02-08 09:03:45 UTC +++ components/components_google_chrome_strings.grd -@@ -230,7 +230,7 @@ +@@ -220,7 +220,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_feature__engagement_public_feature__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc index ba62f1cc5d93..29c5bd9f1776 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2023-01-11 09:17:16 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2023-02-08 09:03:45 UTC +++ components/feature_engagement/public/feature_constants.cc @@ -24,7 +24,7 @@ BASE_FEATURE(kUseClientConfigIPH, BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ BASE_FEATURE(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -424,7 +424,8 @@ BASE_FEATURE(kIPHOverflowMenuTipFeature, +@@ -424,7 +424,8 @@ BASE_FEATURE(kIPHPriceNotificationsWhileBrowsingFeatur #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 2d71ef750be5..6f2a0940641c 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2023-01-11 09:17:16 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2023-02-08 09:03:45 UTC +++ components/feature_engagement/public/feature_constants.h @@ -32,7 +32,7 @@ BASE_DECLARE_FEATURE(kIPHDummyFeature); BASE_DECLARE_FEATURE(kEnableIPH); @@ -9,7 +9,7 @@ BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature); BASE_DECLARE_FEATURE(kIPHDesktopSharedHighlightingFeature); BASE_DECLARE_FEATURE(kIPHDesktopTabGroupsNewGroupFeature); -@@ -185,7 +185,8 @@ BASE_DECLARE_FEATURE(kIPHOverflowMenuTipFeature); +@@ -185,7 +185,8 @@ BASE_DECLARE_FEATURE(kIPHPriceNotificationsWhileBrowsi #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 6111e53ba6dd..98f3ef9456f1 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-01-11 09:17:16 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2023-02-08 09:03:45 UTC +++ components/feature_engagement/public/feature_list.cc @@ -122,7 +122,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHOverflowMenuTipFeature, + &kIPHPriceNotificationsWhileBrowsingFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) 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 e92c687b77c6..86c4b5098c38 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-01-11 09:17:16 UTC +--- components/feature_engagement/public/feature_list.h.orig 2023-02-08 09:03:45 UTC +++ components/feature_engagement/public/feature_list.h -@@ -222,7 +222,7 @@ DEFINE_VARIATION_PARAM(kIPHOverflowMenuTipFeature, "IP +@@ -223,7 +223,7 @@ DEFINE_VARIATION_PARAM(kIPHPriceNotificationsWhileBrow #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode"); DEFINE_VARIATION_PARAM(kIPHDesktopTabGroupsNewGroupFeature, "IPH_DesktopTabGroupsNewGroup"); -@@ -268,7 +268,8 @@ DEFINE_VARIATION_PARAM(kIPHPriceTrackingInSidePanelFea +@@ -269,7 +269,8 @@ DEFINE_VARIATION_PARAM(kIPHPriceTrackingInSidePanelFea // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,16 +19,16 @@ DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardSuggestionFeature, "IPH_AutofillVirtualCardSuggestion"); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || -@@ -375,7 +376,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHFollowWhileBrowsingFeature), +@@ -377,7 +378,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHOverflowMenuTipFeature), + VARIATION_ENTRY(kIPHPriceNotificationsWhileBrowsingFeature), #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) VARIATION_ENTRY(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHDesktopTabGroupsNewGroupFeature), VARIATION_ENTRY(kIPHExtensionsMenuFeature), -@@ -408,7 +409,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -410,7 +411,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_feed_core_v2_proto__util.cc b/www/chromium/files/patch-components_feed_core_v2_proto__util.cc index e33e80a5cd19..155887126104 100644 --- a/www/chromium/files/patch-components_feed_core_v2_proto__util.cc +++ b/www/chromium/files/patch-components_feed_core_v2_proto__util.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/proto_util.cc.orig 2022-04-21 18:48:31 UTC +--- components/feed/core/v2/proto_util.cc.orig 2023-02-08 09:03:45 UTC +++ components/feed/core/v2/proto_util.cc -@@ -90,8 +90,8 @@ feedwire::Version GetPlatformVersionMessage() { +@@ -91,8 +91,8 @@ feedwire::Version GetPlatformVersionMessage() { int32_t major, minor, revision; base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &revision); @@ -11,7 +11,7 @@ result.set_revision(revision); #if BUILDFLAG(IS_ANDROID) result.set_api_version(base::android::BuildInfo::GetInstance()->sdk_int()); -@@ -106,8 +106,8 @@ feedwire::Version GetAppVersionMessage(const ChromeInf +@@ -107,8 +107,8 @@ feedwire::Version GetAppVersionMessage(const ChromeInf // Chrome's version is in the format: MAJOR,MINOR,BUILD,PATCH. const std::vector<uint32_t>& numbers = chrome_info.version.components(); if (numbers.size() > 3) { diff --git a/www/chromium/files/patch-components_named__mojo__ipc__server_connection__info.h b/www/chromium/files/patch-components_named__mojo__ipc__server_connection__info.h new file mode 100644 index 000000000000..f4b66ca0942d --- /dev/null +++ b/www/chromium/files/patch-components_named__mojo__ipc__server_connection__info.h @@ -0,0 +1,20 @@ +--- components/named_mojo_ipc_server/connection_info.h.orig 2023-02-08 09:03:45 UTC ++++ components/named_mojo_ipc_server/connection_info.h +@@ -13,7 +13,7 @@ + #include "base/win/scoped_handle.h" + #elif BUILDFLAG(IS_MAC) + #include <bsm/libbsm.h> +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include <sys/socket.h> + #endif + +@@ -32,7 +32,7 @@ struct ConnectionInfo { + absl::optional<base::win::ScopedHandle> impersonation_token{}; + #elif BUILDFLAG(IS_MAC) + audit_token_t audit_token{}; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ucred credentials{}; + #endif + }; diff --git a/www/chromium/files/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc b/www/chromium/files/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc new file mode 100644 index 000000000000..d588c07870e1 --- /dev/null +++ b/www/chromium/files/patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc @@ -0,0 +1,11 @@ +--- components/named_mojo_ipc_server/named_mojo_ipc_server_client_util.cc.orig 2023-02-08 09:03:45 UTC ++++ components/named_mojo_ipc_server/named_mojo_ipc_server_client_util.cc +@@ -22,7 +22,7 @@ namespace named_mojo_ipc_server { + // static + mojo::PlatformChannelEndpoint ConnectToServer( + const mojo::NamedPlatformChannel::ServerName& server_name) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + return mojo::NamedPlatformChannel::ConnectToServer(server_name); + #elif BUILDFLAG(IS_MAC) + mojo::PlatformChannelEndpoint endpoint = diff --git a/www/chromium/files/patch-components_neterror_resources_neterror.js b/www/chromium/files/patch-components_neterror_resources_neterror.js index 033e50bea392..442584d3d936 100644 --- a/www/chromium/files/patch-components_neterror_resources_neterror.js +++ b/www/chromium/files/patch-components_neterror_resources_neterror.js @@ -1,6 +1,6 @@ ---- components/neterror/resources/neterror.js.orig 2022-09-24 10:57:32 UTC +--- components/neterror/resources/neterror.js.orig 2023-02-08 09:03:45 UTC +++ components/neterror/resources/neterror.js -@@ -130,7 +130,7 @@ function detailsButtonClick() { +@@ -137,7 +137,7 @@ function detailsButtonClick() { let primaryControlOnLeft = true; // clang-format off diff --git a/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc b/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc index 9fd6193908c4..39482cd26790 100644 --- a/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc +++ b/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc @@ -1,6 +1,6 @@ ---- components/paint_preview/browser/paint_preview_client.cc.orig 2022-10-24 13:33:33 UTC +--- components/paint_preview/browser/paint_preview_client.cc.orig 2023-02-08 09:03:45 UTC +++ components/paint_preview/browser/paint_preview_client.cc -@@ -307,8 +307,8 @@ void PaintPreviewClient::CapturePaintPreview( +@@ -308,8 +308,8 @@ void PaintPreviewClient::CapturePaintPreview( metadata->set_url(url.spec()); metadata->set_version(kPaintPreviewVersion); auto* chromeVersion = metadata->mutable_chrome_version(); diff --git a/www/chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc b/www/chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc index 66060a482ee9..186c6d70ab39 100644 --- a/www/chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc +++ b/www/chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc @@ -1,6 +1,6 @@ ---- components/paint_preview/player/player_compositor_delegate.cc.orig 2022-05-19 14:06:27 UTC +--- components/paint_preview/player/player_compositor_delegate.cc.orig 2023-02-08 09:03:45 UTC +++ components/paint_preview/player/player_compositor_delegate.cc -@@ -444,8 +444,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT +@@ -445,8 +445,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT // use the AXTreeUpdate. auto chrome_version = capture_result_->proto.metadata().chrome_version(); if (capture_result_->proto.metadata().has_chrome_version() && 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 65da04d61354..9e9401acbd40 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 2022-11-30 08:12:58 UTC +--- components/password_manager/core/browser/login_database.cc.orig 2023-02-08 09:03:45 UTC +++ components/password_manager/core/browser/login_database.cc -@@ -732,7 +732,7 @@ std::string GeneratePlaceholders(size_t count) { +@@ -728,7 +728,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) { -@@ -749,7 +749,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme +@@ -745,7 +745,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; -@@ -1578,7 +1578,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { +@@ -1559,7 +1559,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { } DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() { diff --git a/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc b/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc index 29d94a80ed1a..dc639afa25e1 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/login_database_unittest.cc.orig 2023-01-11 09:17:16 UTC +--- components/password_manager/core/browser/login_database_unittest.cc.orig 2023-02-08 09:03:45 UTC +++ components/password_manager/core/browser/login_database_unittest.cc -@@ -2092,7 +2092,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd +@@ -2109,7 +2109,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd base::HistogramTester histogram_tester; ASSERT_TRUE(db.Init()); @@ -9,7 +9,7 @@ // Make sure that we can't get any logins when database is corrupted. // Disabling the checks in chromecast because encryption is unavailable. std::vector<std::unique_ptr<PasswordForm>> result; -@@ -2118,7 +2118,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd +@@ -2136,7 +2136,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd #endif // Check histograms. @@ -18,7 +18,7 @@ histogram_tester.ExpectUniqueSample( "PasswordManager.DeleteUndecryptableLoginsReturnValue", metrics_util::DeleteCorruptedPasswordsResult::kSuccessPasswordsDeleted, -@@ -2161,7 +2161,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL +@@ -2179,7 +2179,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL } #endif // BUILDFLAG(IS_MAC) @@ -26,4 +26,4 @@ +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Test getting auto sign in logins when there are undecryptable ones TEST_F(LoginDatabaseUndecryptableLoginsTest, GetAutoSignInLogins) { - PrimaryKeyToFormMap key_to_form_map; + std::vector<std::unique_ptr<PasswordForm>> forms; 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 a93024dbcd9e..35fbf554f731 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,9 +1,9 @@ ---- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2023-01-11 09:17:16 UTC +--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2023-02-08 09:03:45 UTC +++ components/password_manager/core/browser/sync/password_sync_bridge.cc @@ -185,7 +185,7 @@ bool IsCredentialPhished(const sync_pb::PasswordSpecif // merge. bool ShouldRecoverPasswordsDuringMerge() { - // Delete the local undecryptable copy when this is MacOS only. + // Delete the local undecryptable copy when this is MacOS or Linux only. -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return true; @@ -13,8 +13,8 @@ } bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() { --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return ShouldRecoverPasswordsDuringMerge() && base::FeatureList::IsEnabled( features::kForceInitialSyncWhenDecryptionFails); 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 30d3468b0e39..edf1f8a8ecb5 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,15 +1,24 @@ ---- components/password_manager/core/common/password_manager_features.cc.orig 2023-01-11 09:17:16 UTC +--- components/password_manager/core/common/password_manager_features.cc.orig 2023-02-08 09:03:45 UTC +++ components/password_manager/core/common/password_manager_features.cc -@@ -86,7 +86,7 @@ BASE_FEATURE(kFillOnAccountSelect, +@@ -80,7 +80,7 @@ BASE_FEATURE(kFillOnAccountSelect, "fill-on-account-select", base::FEATURE_DISABLED_BY_DEFAULT); --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // When enabled, initial sync will be forced during startup if the password // store has encryption service failures. BASE_FEATURE(kForceInitialSyncWhenDecryptionFails, -@@ -235,7 +235,7 @@ BASE_FEATURE(kPasswordStrengthIndicator, +@@ -152,7 +152,7 @@ BASE_FEATURE(kPasswordChangeWellKnown, + // Controls the ability to import passwords from Chrome's settings page. + BASE_FEATURE(kPasswordImport, + "PasswordImport", +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT); + #else + base::FEATURE_DISABLED_BY_DEFAULT); +@@ -195,7 +195,7 @@ BASE_FEATURE(kPasswordStrengthIndicator, "PasswordStrengthIndicator", base::FEATURE_DISABLED_BY_DEFAULT); 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 a0274b238e88..bc8110e95a8d 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,15 +1,15 @@ ---- components/password_manager/core/common/password_manager_features.h.orig 2023-01-11 09:17:16 UTC +--- components/password_manager/core/common/password_manager_features.h.orig 2023-02-08 09:03:45 UTC +++ components/password_manager/core/common/password_manager_features.h -@@ -37,7 +37,7 @@ BASE_DECLARE_FEATURE(kEnablePasswordGenerationForClear +@@ -36,7 +36,7 @@ BASE_DECLARE_FEATURE(kEnablePasswordGenerationForClear BASE_DECLARE_FEATURE(kEnablePasswordManagerWithinFencedFrame); BASE_DECLARE_FEATURE(kFillingAcrossAffiliatedWebsites); BASE_DECLARE_FEATURE(kFillOnAccountSelect); --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kForceInitialSyncWhenDecryptionFails); #endif BASE_DECLARE_FEATURE(kInferConfirmationPasswordField); -@@ -68,7 +68,7 @@ BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid); +@@ -62,7 +62,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_policy_core_browser_policy__pref__mapping__test.cc b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc index 8a43c055774c..20f50e9f8a61 100644 --- a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc +++ b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc @@ -1,6 +1,6 @@ ---- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2022-11-30 08:12:58 UTC +--- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2023-02-08 09:03:45 UTC +++ components/policy/core/browser/policy_pref_mapping_test.cc -@@ -337,7 +337,7 @@ class PolicyTestCase { +@@ -325,7 +325,7 @@ class PolicyTestCase { const std::string os("chromeos_lacros"); #elif BUILDFLAG(IS_IOS) const std::string os("ios"); diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc index 27c2b1c03a21..689504e06c7e 100644 --- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc +++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc @@ -1,6 +1,6 @@ ---- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2022-11-30 08:12:58 UTC +--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2023-02-08 09:03:45 UTC +++ components/policy/core/common/cloud/cloud_policy_client.cc -@@ -448,7 +448,7 @@ void CloudPolicyClient::FetchPolicy() { +@@ -432,7 +432,7 @@ void CloudPolicyClient::FetchPolicy() { fetch_request->set_invalidation_payload(invalidation_payload_); } } diff --git a/www/chromium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc b/www/chromium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc index 2c95923a7133..b019d63ef647 100644 --- a/www/chromium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc +++ b/www/chromium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc @@ -1,6 +1,6 @@ ---- components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc.orig 2022-11-30 08:12:58 UTC +--- components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc.orig 2023-02-08 09:03:45 UTC +++ components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc -@@ -200,7 +200,7 @@ void CrossDeviceUserSegment::ExecuteModelWithInput( +@@ -201,7 +201,7 @@ void CrossDeviceUserSegment::ExecuteModelWithInput( // Check for current device type and subtract it from the device count // calculation. #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc b/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc index aefef0ad115a..40070240b963 100644 --- a/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc +++ b/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc @@ -1,6 +1,6 @@ ---- components/sync_device_info/local_device_info_util.cc.orig 2022-11-30 08:12:58 UTC +--- components/sync_device_info/local_device_info_util.cc.orig 2023-02-08 09:03:45 UTC +++ components/sync_device_info/local_device_info_util.cc -@@ -78,7 +78,7 @@ void OnMachineStatisticsLoaded(LocalDeviceNameInfo* na +@@ -82,7 +82,7 @@ void OnMachineStatisticsLoaded(LocalDeviceNameInfo* na sync_pb::SyncEnums::DeviceType GetLocalDeviceType() { #if BUILDFLAG(IS_CHROMEOS) return sync_pb::SyncEnums_DeviceType_TYPE_CROS; @@ -9,7 +9,7 @@ return sync_pb::SyncEnums_DeviceType_TYPE_LINUX; #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) return ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET -@@ -98,7 +98,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { +@@ -102,7 +102,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { return DeviceInfo::OsType::kChromeOsAsh; #elif BUILDFLAG(IS_CHROMEOS_LACROS) return DeviceInfo::OsType::kChromeOsLacros; @@ -18,7 +18,7 @@ return DeviceInfo::OsType::kLinux; #elif BUILDFLAG(IS_ANDROID) return DeviceInfo::OsType::kAndroid; -@@ -117,7 +117,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { +@@ -121,7 +121,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { DeviceInfo::FormFactor GetLocalDeviceFormFactor() { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc index b66b8c936826..53f4768c0536 100644 --- a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc +++ b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc @@ -1,6 +1,6 @@ ---- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2022-02-28 16:54:41 UTC +--- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2023-02-08 09:03:45 UTC +++ components/url_formatter/spoof_checks/idn_spoof_checker.cc -@@ -285,7 +285,7 @@ IDNSpoofChecker::IDNSpoofChecker() { +@@ -286,7 +286,7 @@ IDNSpoofChecker::IDNSpoofChecker() { // The ideal fix would be to change the omnibox font used for Thai. In // that case, the Linux-only list should be revisited and potentially // removed. 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 d621d1145553..b346b10daa76 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-01-11 09:17:16 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2023-02-08 09:03:45 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1174,7 +1174,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1231,7 +1231,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetDeviceQueue() ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, ycbcr_info); @@ -9,12 +9,3 @@ // Textures that were allocated _on linux_ with ycbcr info came from // VaapiVideoDecoder, which exports using DRM format modifiers. return GrBackendFormat::MakeVk(gr_ycbcr_info, -@@ -1193,7 +1193,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor - return GrBackendFormat::MakeMtl(ToMTLPixelFormat(resource_format)); - #endif - } else { --#if !BUILDFLAG(IS_LINUX) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - // Skip the check as ycbcr info is always set by `VaapiVideoDecoder` on - // Linux. - DCHECK(!ycbcr_info); diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc index 60a9b79b134d..0d307362a783 100644 --- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc +++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/software_output_surface.cc.orig 2022-07-22 17:30:31 UTC +--- components/viz/service/display_embedder/software_output_surface.cc.orig 2023-02-08 09:03:45 UTC +++ components/viz/service/display_embedder/software_output_surface.cc -@@ -93,7 +93,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: +@@ -98,7 +98,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ if (needs_swap_size_notifications_) client_->DidSwapWithSize(pixel_size); #endif -@@ -120,7 +120,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla +@@ -125,7 +125,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc index e51d210a7c75..f42a9d9b841b 100644 --- a/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc +++ b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display/skia_renderer.cc.orig 2022-11-30 08:12:58 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2023-02-08 09:03:45 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1129,7 +1129,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1145,7 +1145,7 @@ void SkiaRenderer::ClearFramebuffer() { if (current_frame()->current_render_pass->has_transparent_background) { ClearCanvas(SkColors::kTransparent); } else { diff --git a/www/chromium/files/patch-content_app_content__main.cc b/www/chromium/files/patch-content_app_content__main.cc index f71062d242d3..d6322429c4d1 100644 --- a/www/chromium/files/patch-content_app_content__main.cc +++ b/www/chromium/files/patch-content_app_content__main.cc @@ -1,6 +1,6 @@ ---- content/app/content_main.cc.orig 2022-10-24 13:33:33 UTC +--- content/app/content_main.cc.orig 2023-02-08 09:03:45 UTC +++ content/app/content_main.cc -@@ -226,7 +226,7 @@ RunContentProcess(ContentMainParams params, +@@ -228,7 +228,7 @@ RunContentProcess(ContentMainParams params, #endif base::EnableTerminationOnOutOfMemory(); diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc index 6e005270c386..55e5d36fd80d 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-01-11 09:17:16 UTC +--- content/app/content_main_runner_impl.cc.orig 2023-02-08 09:03:45 UTC +++ content/app/content_main_runner_impl.cc -@@ -135,13 +135,13 @@ +@@ -138,13 +138,13 @@ #include "content/browser/posix_file_descriptor_info_impl.h" #include "content/public/common/content_descriptors.h" @@ -13,10 +13,10 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "base/files/file_path_watcher_inotify.h" #include "base/native_library.h" #include "base/rand_util.h" - #include "content/public/common/zygote/sandbox_support_linux.h" -@@ -180,6 +180,10 @@ +@@ -184,6 +184,10 @@ #include "media/base/media_switches.h" #endif @@ -27,7 +27,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -361,7 +365,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -365,7 +369,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -36,7 +36,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -397,7 +401,7 @@ void PreloadLibraryCdms() { +@@ -401,15 +405,17 @@ void PreloadLibraryCdms() { } #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS) @@ -45,7 +45,17 @@ void PreSandboxInit() { // Pre-acquire resources needed by BoringSSL. See // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md -@@ -420,6 +424,11 @@ void PreSandboxInit() { + CRYPTO_pre_sandbox_init(); + ++#if !BUILDFLAG(IS_BSD) + // Pre-read /proc/sys/fs/inotify/max_user_watches so it doesn't have to be + // allowed by the sandbox. + base::GetMaxNumberOfInotifyWatches(); ++#endif + + #if BUILDFLAG(ENABLE_PPAPI) + // Ensure access to the Pepper plugins before the sandbox is turned on. +@@ -428,6 +434,11 @@ void PreSandboxInit() { } #endif @@ -57,7 +67,7 @@ // Set the android SkFontMgr for blink. We need to ensure this is done // before the sandbox is initialized to allow the font manager to access // font configuration files on disk. -@@ -602,7 +611,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* +@@ -615,7 +626,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -66,7 +76,7 @@ PreSandboxInit(); #endif -@@ -796,11 +805,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -809,11 +820,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -80,7 +90,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -982,6 +990,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -997,6 +1007,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam } #endif @@ -97,7 +107,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE_HANDLE) -@@ -1045,7 +1063,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1060,7 +1080,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { process_type); } @@ -106,7 +116,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 -@@ -1078,6 +1096,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1093,6 +1113,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 ae9a1ac3aa55..758d2b41386c 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-01-26 06:54:16 UTC +--- content/browser/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ content/browser/BUILD.gn -@@ -2340,6 +2340,13 @@ source_set("browser") { +@@ -2368,6 +2368,13 @@ source_set("browser") { ] } diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc index 05ee8ad1eacd..21cb5ecf5047 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2022-11-30 08:12:58 UTC +--- content/browser/browser_main_loop.cc.orig 2023-02-08 09:03:45 UTC +++ content/browser/browser_main_loop.cc -@@ -242,6 +242,12 @@ +@@ -244,6 +244,12 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" #endif @@ -13,7 +13,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -526,6 +532,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -528,6 +534,12 @@ int BrowserMainLoop::EarlyInitialization() { // by now since a thread to start the ServiceManager has been created // before the browser main loop starts. DCHECK(SandboxHostLinux::GetInstance()->IsInitialized()); @@ -26,7 +26,7 @@ #endif // GLib's spawning of new processes is buggy, so it's important that at this -@@ -557,7 +569,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -559,7 +571,7 @@ int BrowserMainLoop::EarlyInitialization() { base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc index 3d04caffdc6f..b5b071b2072b 100644 --- a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc +++ b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc @@ -1,4 +1,4 @@ ---- content/browser/child_process_launcher_helper_linux.cc.orig 2022-07-22 17:30:31 UTC +--- content/browser/child_process_launcher_helper_linux.cc.orig 2023-02-08 09:03:45 UTC +++ content/browser/child_process_launcher_helper_linux.cc @@ -20,7 +20,9 @@ #include "content/public/common/result_codes.h" @@ -77,4 +77,4 @@ +#endif } - void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread( + void ChildProcessLauncherHelper::SetProcessBackgroundedOnLauncherThread( diff --git a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc index bd801fad0411..2944b29f8268 100644 --- a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc +++ b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc @@ -1,6 +1,6 @@ ---- content/browser/devtools/protocol/system_info_handler.cc.orig 2023-01-11 09:17:16 UTC +--- content/browser/devtools/protocol/system_info_handler.cc.orig 2023-02-08 09:03:45 UTC +++ content/browser/devtools/protocol/system_info_handler.cc -@@ -49,7 +49,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS +@@ -50,7 +50,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS // 1046598, and 1153667. // Windows builds need more time -- see Issue 873112 and 1004472. // Mac builds need more time - see Issue angleproject:6182. diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc index 1bd444ae2dbe..cd6a185c60e8 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,14 +1,14 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2022-11-30 08:12:58 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2023-02-08 09:03:45 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -255,6 +255,7 @@ static const char* const kSwitchNames[] = { +@@ -249,6 +249,7 @@ static const char* const kSwitchNames[] = { switches::kEnableBackgroundThreadPool, switches::kEnableGpuRasterization, switches::kEnableLogging, + switches::kDisableUnveil, - switches::kEnableDeJelly, - switches::kDeJellyScreenWidth, switches::kDoubleBufferCompositing, -@@ -288,7 +289,7 @@ static const char* const kSwitchNames[] = { + switches::kHeadless, + switches::kLoggingLevel, +@@ -280,7 +281,7 @@ static const char* const kSwitchNames[] = { switches::kOzoneDumpFile, switches::kDisableBufferBWCompression, #endif diff --git a/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc index e4db469b146e..92151b08bebb 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/delegated_frame_host.cc.orig 2022-08-31 12:19:35 UTC +--- content/browser/renderer_host/delegated_frame_host.cc.orig 2023-02-08 09:03:45 UTC +++ content/browser/renderer_host/delegated_frame_host.cc -@@ -289,7 +289,7 @@ void DelegatedFrameHost::EmbedSurface( +@@ -295,7 +295,7 @@ void DelegatedFrameHost::EmbedSurface( if (!primary_surface_id || primary_surface_id->local_surface_id() != local_surface_id_) { diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc deleted file mode 100644 index eff76c7c0c06..000000000000 --- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- content/browser/renderer_host/render_message_filter.cc.orig 2022-11-30 08:12:58 UTC -+++ content/browser/renderer_host/render_message_filter.cc -@@ -66,7 +66,7 @@ - #if BUILDFLAG(IS_MAC) - #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" - #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "base/linux_util.h" - #include "base/threading/platform_thread.h" - #endif -@@ -130,7 +130,7 @@ void RenderMessageFilter::GenerateFrameRoutingID( - document_token); - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void RenderMessageFilter::SetThreadTypeOnWorkerThread( - base::PlatformThreadId ns_tid, - base::ThreadType thread_type) { -@@ -151,7 +151,7 @@ void RenderMessageFilter::SetThreadTypeOnWorkerThread( - } - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void RenderMessageFilter::SetThreadType(int32_t ns_tid, - base::ThreadType thread_type) { - constexpr base::TaskTraits kTraits = { diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h deleted file mode 100644 index 9b037a8d3664..000000000000 --- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h +++ /dev/null @@ -1,18 +0,0 @@ ---- content/browser/renderer_host/render_message_filter.h.orig 2022-08-31 12:19:35 UTC -+++ content/browser/renderer_host/render_message_filter.h -@@ -78,13 +78,13 @@ class RenderMessageFilter - void GenerateRoutingID(GenerateRoutingIDCallback routing_id) override; - void GenerateFrameRoutingID(GenerateFrameRoutingIDCallback callback) override; - void HasGpuProcess(HasGpuProcessCallback callback) override; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void SetThreadType(int32_t ns_tid, base::ThreadType thread_type) override; - #endif - - void OnResolveProxy(const GURL& url, IPC::Message* reply_msg); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void SetThreadTypeOnWorkerThread(base::PlatformThreadId ns_tid, - base::ThreadType thread_type); - #endif diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index f723cf5b9b60..d3c8e5f1e6f2 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-01-11 09:17:16 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-02-08 09:03:45 UTC +++ content/browser/renderer_host/render_process_host_impl.cc @@ -215,7 +215,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" @@ -9,7 +9,7 @@ #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -1139,7 +1139,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1141,7 +1141,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; -@@ -1226,7 +1226,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1228,7 +1228,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } @@ -27,7 +27,16 @@ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -2129,7 +2129,7 @@ void RenderProcessHostImpl::ReinitializeLogging( +@@ -1317,7 +1317,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public + std::unique_ptr<service_manager::BinderRegistry> binders_; + mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory> + video_encode_accelerator_factory_remote_; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -2169,7 +2169,7 @@ void RenderProcessHostImpl::ReinitializeLogging( } #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -36,15 +45,15 @@ void RenderProcessHostImpl::CreateStableVideoDecoder( mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) { if (!stable_video_decoder_factory_remote_.is_bound()) { -@@ -3284,6 +3284,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3331,6 +3331,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, + switches::kDisableUnveil, + switches::kDisableUseMojoVideoDecoderForPepper, switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, - switches::kDisableWebGLImageChromium, -@@ -4757,7 +4758,7 @@ void RenderProcessHostImpl::ResetIPC() { +@@ -4807,7 +4808,7 @@ void RenderProcessHostImpl::ResetIPC() { coordinator_connector_receiver_.reset(); tracing_registration_.reset(); diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h index db28d8ff4f70..20e7f1cb748b 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-01-11 09:17:16 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2023-02-08 09:03:45 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -84,7 +84,7 @@ +@@ -85,7 +85,7 @@ #include "content/public/browser/android/child_process_importance.h" #endif @@ -9,7 +9,7 @@ #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -484,7 +484,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -489,7 +489,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); @@ -18,7 +18,7 @@ // Launch the zygote early in the browser startup. static void EarlyZygoteLaunch(); #endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC) -@@ -684,7 +684,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -704,7 +704,7 @@ class CONTENT_EXPORT RenderProcessHostImpl mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) override; @@ -27,7 +27,7 @@ void CreateStableVideoDecoder( mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) override; -@@ -1139,7 +1139,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -1165,7 +1165,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // RenderProcessHost. This is destroyed early in ResetIPC() method. std::unique_ptr<PermissionServiceContext> permission_service_context_; diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h b/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h index 0d5970ba399b..8f8878201b5b 100644 --- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h +++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h @@ -1,6 +1,6 @@ ---- content/browser/scheduler/responsiveness/native_event_observer.h.orig 2022-02-28 16:54:41 UTC +--- content/browser/scheduler/responsiveness/native_event_observer.h.orig 2023-02-08 09:03:45 UTC +++ content/browser/scheduler/responsiveness/native_event_observer.h -@@ -15,7 +15,7 @@ +@@ -16,7 +16,7 @@ #include "content/public/browser/native_event_processor_observer_mac.h" #endif @@ -9,7 +9,7 @@ #include "ui/aura/window_event_dispatcher_observer.h" #endif -@@ -40,7 +40,7 @@ namespace responsiveness { +@@ -41,7 +41,7 @@ namespace responsiveness { class CONTENT_EXPORT NativeEventObserver #if BUILDFLAG(IS_MAC) : public NativeEventProcessorObserver @@ -18,7 +18,7 @@ : public aura::WindowEventDispatcherObserver #elif BUILDFLAG(IS_WIN) : public base::MessagePumpForUI::Observer -@@ -57,7 +57,7 @@ class CONTENT_EXPORT NativeEventObserver +@@ -58,7 +58,7 @@ class CONTENT_EXPORT NativeEventObserver NativeEventObserver(WillRunEventCallback will_run_event_callback, DidRunEventCallback did_run_event_callback); @@ -27,7 +27,7 @@ NativeEventObserver(const NativeEventObserver&) = delete; NativeEventObserver& operator=(const NativeEventObserver&) = delete; -@@ -73,7 +73,7 @@ class CONTENT_EXPORT NativeEventObserver +@@ -74,7 +74,7 @@ class CONTENT_EXPORT NativeEventObserver // Exposed for tests. void WillRunNativeEvent(const void* opaque_identifier) override; void DidRunNativeEvent(const void* opaque_identifier) override; @@ -36,12 +36,12 @@ // aura::WindowEventDispatcherObserver overrides: void OnWindowEventDispatcherStartedProcessing( aura::WindowEventDispatcher* dispatcher, -@@ -90,7 +90,7 @@ class CONTENT_EXPORT NativeEventObserver +@@ -91,7 +91,7 @@ class CONTENT_EXPORT NativeEventObserver void RegisterObserver(); void DeregisterObserver(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) struct EventInfo { - const void* unique_id; + raw_ptr<const void> unique_id; }; diff --git a/www/chromium/files/patch-content_browser_v8__snapshot__files.cc b/www/chromium/files/patch-content_browser_v8__snapshot__files.cc index 187b0f5d2e76..dbec907d8016 100644 --- a/www/chromium/files/patch-content_browser_v8__snapshot__files.cc +++ b/www/chromium/files/patch-content_browser_v8__snapshot__files.cc @@ -1,11 +1,11 @@ ---- content/browser/v8_snapshot_files.cc.orig 2022-02-28 16:54:41 UTC +--- content/browser/v8_snapshot_files.cc.orig 2023-02-08 09:03:45 UTC +++ content/browser/v8_snapshot_files.cc -@@ -10,7 +10,7 @@ +@@ -11,7 +11,7 @@ namespace content { std::map<std::string, base::FilePath> GetV8SnapshotFilesToPreload() { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #if defined(USE_V8_CONTEXT_SNAPSHOT) + #if BUILDFLAG(USE_V8_CONTEXT_SNAPSHOT) return {{kV8ContextSnapshotDataDescriptor, - base::FilePath(FILE_PATH_LITERAL(V8_CONTEXT_SNAPSHOT_FILENAME))}}; + base::FilePath( diff --git a/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h index cde191278ea7..2750bfc84521 100644 --- a/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h +++ b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h @@ -1,4 +1,4 @@ ---- content/browser/zygote_host/zygote_host_impl_linux.h.orig 2022-11-30 08:12:58 UTC +--- content/browser/zygote_host/zygote_host_impl_linux.h.orig 2023-02-08 09:03:45 UTC +++ content/browser/zygote_host/zygote_host_impl_linux.h @@ -47,12 +47,14 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHos base::ScopedFD* control_fd, @@ -7,10 +7,10 @@ +#if !BUILDFLAG(IS_BSD) void AdjustRendererOOMScore(base::ProcessHandle process_handle, int score) override; - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS) void ReinitializeLogging(uint32_t logging_dest, base::PlatformFile log_file_fd) override; - #endif + #endif // BUILDFLAG(IS_CHROMEOS) +#endif bool HasZygote() { return !zygote_pids_.empty(); } diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index 61b8ea61d556..51affb03ec46 100644 --- a/www/chromium/files/patch-content_common_BUILD.gn +++ b/www/chromium/files/patch-content_common_BUILD.gn @@ -1,4 +1,4 @@ ---- content/common/BUILD.gn.orig 2023-01-11 09:17:16 UTC +--- content/common/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ content/common/BUILD.gn @@ -433,6 +433,9 @@ if (is_linux || is_chromeos) { public = [ "set_process_title_linux.h" ] @@ -10,3 +10,12 @@ } } +@@ -481,7 +484,7 @@ mojom("mojo_bindings") { + if (enable_ipc_logging) { + enabled_features += [ "ipc_logging" ] + } +- if (is_linux || is_chromeos) { ++ if (!is_bsd && (is_linux || is_chromeos)) { + enabled_features += [ "supports_thread_types" ] + } + if (use_clang_profiling_inside_sandbox) { diff --git a/www/chromium/files/patch-content_common_font__list__unittest.cc b/www/chromium/files/patch-content_common_font__list__unittest.cc index 763fd8114fa1..2abc9696304c 100644 --- a/www/chromium/files/patch-content_common_font__list__unittest.cc +++ b/www/chromium/files/patch-content_common_font__list__unittest.cc @@ -1,6 +1,6 @@ ---- content/common/font_list_unittest.cc.orig 2022-08-31 12:19:35 UTC +--- content/common/font_list_unittest.cc.orig 2023-02-08 09:03:45 UTC +++ content/common/font_list_unittest.cc -@@ -48,7 +48,7 @@ TEST(FontList, GetFontList) { +@@ -47,7 +47,7 @@ TEST(FontList, GetFontList) { EXPECT_TRUE(HasFontWithName(fonts, "MS Gothic", "MS Gothic")); EXPECT_TRUE(HasFontWithName(fonts, "Segoe UI", "Segoe UI")); EXPECT_TRUE(HasFontWithName(fonts, "Verdana", "Verdana")); diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index 99c0d491e380..27f73fe9dc7b 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_main.cc.orig 2023-01-11 09:17:16 UTC +--- content/gpu/gpu_main.cc.orig 2023-02-08 09:03:45 UTC +++ content/gpu/gpu_main.cc -@@ -87,7 +87,7 @@ +@@ -88,7 +88,7 @@ #include "sandbox/win/src/sandbox.h" #endif @@ -9,7 +9,7 @@ #include "content/gpu/gpu_sandbox_hook_linux.h" #include "sandbox/policy/linux/sandbox_linux.h" #include "sandbox/policy/sandbox_type.h" -@@ -108,7 +108,7 @@ namespace content { +@@ -109,7 +109,7 @@ namespace content { namespace { @@ -18,7 +18,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -170,7 +170,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -171,7 +171,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_); -@@ -267,7 +267,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -269,7 +269,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 -@@ -402,7 +402,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -404,7 +404,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { 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 462fd1b29648..421351e080a5 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,6 +1,6 @@ ---- content/ppapi_plugin/ppapi_plugin_main.cc.orig 2022-11-30 08:12:58 UTC +--- content/ppapi_plugin/ppapi_plugin_main.cc.orig 2023-02-08 09:03:45 UTC +++ content/ppapi_plugin/ppapi_plugin_main.cc -@@ -53,6 +53,11 @@ +@@ -54,6 +54,11 @@ #include "gin/v8_initializer.h" #endif @@ -12,7 +12,7 @@ #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) #include <stdlib.h> #endif -@@ -146,7 +151,7 @@ int PpapiPluginMain(MainFunctionParams parameters) { +@@ -148,7 +153,7 @@ int PpapiPluginMain(MainFunctionParams parameters) { gin::V8Initializer::LoadV8Snapshot(); #endif diff --git a/www/chromium/files/patch-content_public_browser_render__process__host.h b/www/chromium/files/patch-content_public_browser_render__process__host.h index 8d15dfe7a76a..930f366de673 100644 --- a/www/chromium/files/patch-content_public_browser_render__process__host.h +++ b/www/chromium/files/patch-content_public_browser_render__process__host.h @@ -1,4 +1,4 @@ ---- content/public/browser/render_process_host.h.orig 2023-01-11 09:17:16 UTC +--- content/public/browser/render_process_host.h.orig 2023-02-08 09:03:45 UTC +++ content/public/browser/render_process_host.h @@ -54,7 +54,7 @@ #include "content/public/browser/android/child_process_importance.h" @@ -9,7 +9,7 @@ #include "media/mojo/mojom/stable/stable_video_decoder.mojom-forward.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -629,7 +629,7 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::S +@@ -641,7 +641,7 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::S const blink::StorageKey& storage_key, mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) = 0; diff --git a/www/chromium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h b/www/chromium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h index 25220873327b..38fc251c1674 100644 --- a/www/chromium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h +++ b/www/chromium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h @@ -1,4 +1,4 @@ ---- content/public/browser/zygote_host/zygote_host_linux.h.orig 2022-11-30 08:12:58 UTC +--- content/public/browser/zygote_host/zygote_host_linux.h.orig 2023-02-08 09:03:45 UTC +++ content/public/browser/zygote_host/zygote_host_linux.h @@ -35,11 +35,13 @@ class ZygoteHost { // after the first render has been forked. @@ -12,5 +12,5 @@ int score) = 0; +#endif - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS) // Reinitialize logging for the Zygote processes. Needed on ChromeOS, which diff --git a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h index b8fd4e2b569a..ed9632502882 100644 --- a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h +++ b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h @@ -1,6 +1,6 @@ ---- content/public/common/common_param_traits_macros.h.orig 2022-10-24 13:33:33 UTC +--- content/public/common/common_param_traits_macros.h.orig 2023-02-08 09:03:45 UTC +++ content/public/common/common_param_traits_macros.h -@@ -125,7 +125,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::RendererPreferences) +@@ -113,7 +113,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::RendererPreferences) IPC_STRUCT_TRAITS_MEMBER(accept_languages) IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed) IPC_STRUCT_TRAITS_MEMBER(caret_browsing_enabled) 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 9a8a491d35d7..a8984afd07e0 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-01-11 09:17:16 UTC +--- content/public/common/content_features.cc.orig 2023-02-08 09:03:45 UTC +++ content/public/common/content_features.cc @@ -41,7 +41,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, "AudioServiceOutOfProcess", @@ -18,7 +18,16 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1251,7 +1251,7 @@ BASE_FEATURE(kWebAssemblyCodeProtection, +@@ -499,7 +499,7 @@ BASE_FEATURE(kGetDisplayMediaSetAutoSelectAllScreens, + // (activated by kUserAgentClientHint) + BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // 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 +@@ -1258,7 +1258,7 @@ BASE_FEATURE(kWebAssemblyCodeProtection, "WebAssemblyCodeProtection", base::FEATURE_DISABLED_BY_DEFAULT); @@ -27,7 +36,7 @@ // Use memory protection keys in userspace (PKU) (if available) to protect code // JITed for WebAssembly. Fall back to traditional memory protection if // WebAssemblyCodeProtection is also enabled. -@@ -1287,7 +1287,7 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1305,7 +1305,7 @@ BASE_FEATURE(kWebAssemblyTiering, BASE_FEATURE(kWebAssemblyTrapHandler, "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -36,7 +45,7 @@ defined(ARCH_CPU_X86_64)) || \ (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -1362,7 +1362,11 @@ BASE_FEATURE(kWebUIReportOnlyTrustedTypes, +@@ -1381,7 +1381,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 5619ddce0446..4e4ec8317ab1 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,15 @@ ---- content/public/common/content_features.h.orig 2023-01-11 09:17:16 UTC +--- content/public/common/content_features.h.orig 2023-02-08 09:03:45 UTC +++ content/public/common/content_features.h -@@ -272,7 +272,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kVideoPlaybackQual +@@ -107,7 +107,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollO + CONTENT_EXPORT BASE_DECLARE_FEATURE(kGetDisplayMediaSet); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kGetDisplayMediaSetAutoSelectAllScreens); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kGreaseUACH); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + CONTENT_EXPORT BASE_DECLARE_FEATURE(kHandleRendererThreadTypeChangesInBrowser); + #endif + CONTENT_EXPORT BASE_DECLARE_FEATURE(kIdleDetection); +@@ -282,7 +282,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kVideoPlaybackQual CONTENT_EXPORT BASE_DECLARE_FEATURE(kV8VmFuture); CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyBaseline); CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyCodeProtection); diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc index e2b5ffda2d07..bd70703c3625 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.cc +++ b/www/chromium/files/patch-content_public_common_content__switches.cc @@ -1,4 +1,4 @@ ---- content/public/common/content_switches.cc.orig 2022-11-30 08:12:58 UTC +--- content/public/common/content_switches.cc.orig 2023-02-08 09:03:45 UTC +++ content/public/common/content_switches.cc @@ -367,6 +367,8 @@ const char kEnableGpuMemoryBufferVideoFrames[] = // builds. @@ -9,7 +9,7 @@ // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables // triggering of change attribute of the NetInfo API when there is a change in // the connection type. -@@ -994,7 +996,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -1003,7 +1005,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 c83f05d2e31b..5306eb3c5867 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,4 +1,4 @@ ---- content/public/common/content_switches.h.orig 2022-11-30 08:12:58 UTC +--- content/public/common/content_switches.h.orig 2023-02-08 09:03:45 UTC +++ content/public/common/content_switches.h @@ -118,6 +118,7 @@ CONTENT_EXPORT extern const char kEnableBlinkTestFeatu CONTENT_EXPORT extern const char kEnableGpuMemoryBufferVideoFrames[]; @@ -8,7 +8,7 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -269,7 +270,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD +@@ -271,7 +272,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-content_public_test_mock__render__process__host.h b/www/chromium/files/patch-content_public_test_mock__render__process__host.h index 6b01b3596c0c..cc899c413103 100644 --- a/www/chromium/files/patch-content_public_test_mock__render__process__host.h +++ b/www/chromium/files/patch-content_public_test_mock__render__process__host.h @@ -1,6 +1,6 @@ ---- content/public/test/mock_render_process_host.h.orig 2023-01-11 09:17:16 UTC +--- content/public/test/mock_render_process_host.h.orig 2023-02-08 09:03:45 UTC +++ content/public/test/mock_render_process_host.h -@@ -267,7 +267,7 @@ class MockRenderProcessHost : public RenderProcessHost +@@ -276,7 +276,7 @@ class MockRenderProcessHost : public RenderProcessHost const blink::StorageKey& storage_key, mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) override {} diff --git a/www/chromium/files/patch-content_renderer_BUILD.gn b/www/chromium/files/patch-content_renderer_BUILD.gn new file mode 100644 index 000000000000..fa3415feb17a --- /dev/null +++ b/www/chromium/files/patch-content_renderer_BUILD.gn @@ -0,0 +1,16 @@ +--- content/renderer/BUILD.gn.orig 2023-02-08 09:03:45 UTC ++++ content/renderer/BUILD.gn +@@ -198,6 +198,13 @@ target(link_target_type, "renderer") { + ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "renderer_thread_type_handler.cc", ++ "renderer_thread_type_handler.h", ++ ] ++ } ++ + if (is_mac) { + sources += [ + "renderer_main_platform_delegate_mac.mm", 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 32ed9c89d289..ec944154516b 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-01-11 09:17:16 UTC +--- content/renderer/render_process_impl.cc.orig 2023-02-08 09:03:45 UTC +++ content/renderer/render_process_impl.cc @@ -46,7 +46,7 @@ #if BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ SetV8FlagIfFeature(features::kWebAssemblyCodeProtectionPku, "--wasm-memory-protection-keys"); SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtectionPku, -@@ -224,7 +224,7 @@ RenderProcessImpl::RenderProcessImpl() +@@ -234,7 +234,7 @@ RenderProcessImpl::RenderProcessImpl() SetV8FlagIfNotFeature(features::kWebAssemblyDynamicTiering, "--no-wasm-dynamic-tiering"); 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 c9839decefab..cd7bf7430b81 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,24 +1,15 @@ ---- content/renderer/render_thread_impl.cc.orig 2023-01-11 09:17:16 UTC +--- content/renderer/render_thread_impl.cc.orig 2023-02-08 09:03:45 UTC +++ content/renderer/render_thread_impl.cc -@@ -194,7 +194,7 @@ +@@ -197,6 +197,8 @@ #if BUILDFLAG(IS_MAC) #include <malloc/malloc.h> --#else -+#elif !BUILDFLAG(IS_OPENBSD) ++#elif BUILDFLAG(IS_BSD) ++#include <stdlib.h> + #else #include <malloc.h> #endif - -@@ -665,7 +665,7 @@ void RenderThreadImpl::Init() { - base::DiscardableMemoryAllocator::SetInstance( - discardable_memory_allocator_.get()); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - render_message_filter()->SetThreadType( - ChildProcess::current()->io_thread_id(), base::ThreadType::kCompositing); - #endif -@@ -1043,7 +1043,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1038,7 +1040,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: kGpuStreamPriorityMedia); const bool enable_video_decode_accelerator = @@ -27,7 +18,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && #endif // BUILDFLAG(IS_LINUX) !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1053,7 +1053,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1048,7 +1050,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: const bool enable_video_encode_accelerator = @@ -36,3 +27,12 @@ base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) && +@@ -1082,7 +1084,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: + mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider> + vea_provider; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled(media::kUseOutOfProcessVideoEncoding)) { + BindHostReceiver(vea_provider.InitWithNewPipeAndPassReceiver()); + } else { diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc index 3cdb06ca3233..99260365ffad 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2023-01-11 09:17:16 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2023-02-08 09:03:45 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -112,7 +112,7 @@ +@@ -113,7 +113,7 @@ #if BUILDFLAG(IS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -182,7 +182,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -183,7 +183,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( main_thread_scheduler_(main_thread_scheduler) { // RenderThread may not exist in some tests. if (RenderThreadImpl::current()) { @@ -18,7 +18,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -192,7 +192,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -193,7 +193,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -27,16 +27,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -263,7 +263,7 @@ RendererBlinkPlatformImpl::WrapURLLoaderFactory( - /*terminate_sync_load_event=*/nullptr); - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void RendererBlinkPlatformImpl::SetThreadType(base::PlatformThreadId thread_id, - base::ThreadType thread_type) { - if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) { -@@ -274,7 +274,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -275,7 +275,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl #endif blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index 2e322fc2d396..da4a5710dad5 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-01-11 09:17:16 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2023-02-08 09:03:45 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -30,7 +30,7 @@ +@@ -31,7 +31,7 @@ #include "third_party/blink/public/common/user_agent/user_agent_metadata.h" #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h" @@ -9,16 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -172,7 +172,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi - const blink::WebURL& top_document_web_url) override; - gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; - blink::WebString ConvertIDNToUnicode(const blink::WebString& host) override; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void SetThreadType(base::PlatformThreadId thread_id, - base::ThreadType) override; - #endif -@@ -240,7 +240,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -243,7 +243,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) const; @@ -27,7 +18,7 @@ std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif -@@ -260,7 +260,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -263,7 +263,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi mutable base::WaitableEvent io_thread_id_ready_event_; base::PlatformThreadId io_thread_id_ = base::kInvalidThreadId; diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index 5994da64f3f7..f698ed6c38d9 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-01-11 09:17:16 UTC +--- content/shell/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ content/shell/BUILD.gn -@@ -901,7 +901,7 @@ group("content_shell_crash_test") { +@@ -903,7 +903,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc index 5b16977e01c7..e6610f9965dd 100644 --- a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc +++ b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc @@ -1,6 +1,6 @@ ---- content/shell/app/shell_main_delegate.cc.orig 2022-10-24 13:33:33 UTC +--- content/shell/app/shell_main_delegate.cc.orig 2023-02-08 09:03:45 UTC +++ content/shell/app/shell_main_delegate.cc -@@ -213,7 +213,7 @@ void ShellMainDelegate::PreSandboxStartup() { +@@ -214,7 +214,7 @@ void ShellMainDelegate::PreSandboxStartup() { // Reporting for sub-processes will be initialized in ZygoteForked. if (process_type != switches::kZygoteProcess) { crash_reporter::InitializeCrashpad(process_type.empty(), process_type); diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc index 9a04a65a2b94..aa91417f1b8e 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc @@ -1,4 +1,4 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2022-10-24 13:33:33 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2023-02-08 09:03:45 UTC +++ content/shell/browser/shell_browser_main_parts.cc @@ -50,7 +50,7 @@ #include "net/base/network_change_notifier.h" @@ -27,7 +27,7 @@ ui::InitializeInputMethodForTesting(); #endif #if BUILDFLAG(IS_ANDROID) -@@ -153,7 +153,7 @@ void ShellBrowserMainParts::ToolkitInitialized() { +@@ -158,7 +158,7 @@ void ShellBrowserMainParts::ToolkitInitialized() { if (switches::IsRunWebTestsSwitchPresent()) return; @@ -36,7 +36,7 @@ ui::LinuxUi::SetInstance(ui::GetDefaultLinuxUi()); #endif } -@@ -196,7 +196,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() { +@@ -201,7 +201,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() { ShellDevToolsManagerDelegate::StopHttpHandler(); browser_context_.reset(); off_the_record_browser_context_.reset(); diff --git a/www/chromium/files/patch-content_shell_utility_shell__content__utility__client.cc b/www/chromium/files/patch-content_shell_utility_shell__content__utility__client.cc index dc9474ec5ace..5a9764cbf54b 100644 --- a/www/chromium/files/patch-content_shell_utility_shell__content__utility__client.cc +++ b/www/chromium/files/patch-content_shell_utility_shell__content__utility__client.cc @@ -1,4 +1,4 @@ ---- content/shell/utility/shell_content_utility_client.cc.orig 2023-01-11 09:17:16 UTC +--- content/shell/utility/shell_content_utility_client.cc.orig 2023-02-08 09:03:45 UTC +++ content/shell/utility/shell_content_utility_client.cc @@ -34,7 +34,7 @@ #include "sandbox/policy/sandbox.h" @@ -12,7 +12,7 @@ @@ -155,7 +155,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrow binders->Add<mojom::PowerMonitorTest>( base::BindRepeating(&PowerMonitorTestImpl::MakeSelfOwnedReceiver), - base::ThreadTaskRunnerHandle::Get()); + base::SingleThreadTaskRunner::GetCurrentDefault()); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (register_sandbox_status_helper_) { diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn index ffa39a90edec..017643581bfc 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-01-11 09:17:16 UTC +--- content/test/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ content/test/BUILD.gn -@@ -2038,7 +2038,7 @@ static_library("run_all_unittests") { +@@ -2091,7 +2091,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -9,7 +9,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -3031,7 +3031,7 @@ test("content_unittests") { +@@ -3111,7 +3111,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 d386faed3a10..0a9ff54593ab 100644 --- a/www/chromium/files/patch-content_utility_services.cc +++ b/www/chromium/files/patch-content_utility_services.cc @@ -1,14 +1,14 @@ ---- content/utility/services.cc.orig 2023-01-11 09:17:16 UTC +--- content/utility/services.cc.orig 2023-02-08 09:03:45 UTC +++ content/utility/services.cc -@@ -64,7 +64,7 @@ +@@ -63,7 +63,7 @@ extern sandbox::TargetServices* g_utility_target_services; #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "media/mojo/services/mojo_video_encode_accelerator_provider_factory.h" #include "sandbox/linux/services/libc_interceptor.h" #include "sandbox/policy/mojom/sandbox.mojom.h" - #include "sandbox/policy/sandbox_type.h" @@ -86,7 +86,7 @@ extern sandbox::TargetServices* g_utility_target_servi #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -18,7 +18,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) #include "media/mojo/services/stable_video_decoder_factory_service.h" // nogncheck #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && -@@ -209,7 +209,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi +@@ -214,7 +214,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi << "task_policy_set TASK_QOS_POLICY"; #endif @@ -27,7 +27,7 @@ auto* command_line = base::CommandLine::ForCurrentProcess(); if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) { -@@ -311,7 +311,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( +@@ -316,7 +316,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -36,7 +36,16 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) auto RunStableVideoDecoderFactoryService( mojo::PendingReceiver<media::stable::mojom::StableVideoDecoderFactory> -@@ -365,7 +365,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -328,7 +328,7 @@ auto RunStableVideoDecoderFactoryService( + #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && + // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + auto RunVideoEncodeAcceleratorProviderFactory( + mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory> + receiver) { +@@ -386,13 +386,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -45,3 +54,10 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) services.Add(RunStableVideoDecoderFactoryService); #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && + // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + services.Add(RunVideoEncodeAcceleratorProviderFactory); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + diff --git a/www/chromium/files/patch-content_zygote_zygote__linux.cc b/www/chromium/files/patch-content_zygote_zygote__linux.cc index d55b5f4055e0..a3c313f43521 100644 --- a/www/chromium/files/patch-content_zygote_zygote__linux.cc +++ b/www/chromium/files/patch-content_zygote_zygote__linux.cc @@ -1,4 +1,4 @@ ---- content/zygote/zygote_linux.cc.orig 2022-11-30 08:12:58 UTC +--- content/zygote/zygote_linux.cc.orig 2023-02-08 09:03:45 UTC +++ content/zygote/zygote_linux.cc @@ -1,6 +1,7 @@ // Copyright 2012 The Chromium Authors @@ -8,7 +8,7 @@ #include "content/zygote/zygote_linux.h" -@@ -696,3 +697,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi +@@ -706,3 +707,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi } } // namespace content diff --git a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc index a1a2e8e3d470..39c68a2ce5cf 100644 --- a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc +++ b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc @@ -1,6 +1,6 @@ ---- device/gamepad/gamepad_provider.cc.orig 2022-02-28 16:54:41 UTC +--- device/gamepad/gamepad_provider.cc.orig 2023-02-08 09:03:45 UTC +++ device/gamepad/gamepad_provider.cc -@@ -216,7 +216,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep +@@ -218,7 +218,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep if (!polling_thread_) polling_thread_ = std::make_unique<base::Thread>("Gamepad polling thread"); diff --git a/www/chromium/files/patch-extensions_browser_extension__prefs.cc b/www/chromium/files/patch-extensions_browser_extension__prefs.cc index b357facbd118..8379e8a6693f 100644 --- a/www/chromium/files/patch-extensions_browser_extension__prefs.cc +++ b/www/chromium/files/patch-extensions_browser_extension__prefs.cc @@ -1,6 +1,6 @@ ---- extensions/browser/extension_prefs.cc.orig 2023-01-11 09:17:16 UTC +--- extensions/browser/extension_prefs.cc.orig 2023-02-08 09:03:45 UTC +++ extensions/browser/extension_prefs.cc -@@ -2273,7 +2273,7 @@ void ExtensionPrefs::RegisterProfilePrefs( +@@ -2216,7 +2216,7 @@ void ExtensionPrefs::RegisterProfilePrefs( registry->RegisterDictionaryPref(kInstallSignature); registry->RegisterListPref(kExternalUninstalls); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-extensions_browser_pref__names.cc b/www/chromium/files/patch-extensions_browser_pref__names.cc index 0ebb07fa1313..b17d2fb92e99 100644 --- a/www/chromium/files/patch-extensions_browser_pref__names.cc +++ b/www/chromium/files/patch-extensions_browser_pref__names.cc @@ -1,6 +1,6 @@ ---- extensions/browser/pref_names.cc.orig 2023-01-11 09:17:16 UTC +--- extensions/browser/pref_names.cc.orig 2023-02-08 09:03:45 UTC +++ extensions/browser/pref_names.cc -@@ -48,7 +48,7 @@ const char kStorageGarbageCollect[] = "extensions.stor +@@ -49,7 +49,7 @@ const char kStorageGarbageCollect[] = "extensions.stor const char kDeletedComponentExtensions[] = "extensions.deleted_component_extensions"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-extensions_browser_pref__names.h b/www/chromium/files/patch-extensions_browser_pref__names.h index 4742c85e0b9f..80684ce90c2a 100644 --- a/www/chromium/files/patch-extensions_browser_pref__names.h +++ b/www/chromium/files/patch-extensions_browser_pref__names.h @@ -1,6 +1,6 @@ ---- extensions/browser/pref_names.h.orig 2022-09-24 10:57:32 UTC +--- extensions/browser/pref_names.h.orig 2023-02-08 09:03:45 UTC +++ extensions/browser/pref_names.h -@@ -98,7 +98,7 @@ extern const char kStorageGarbageCollect[]; +@@ -103,7 +103,7 @@ extern const char kStorageGarbageCollect[]; extern const char kDeletedComponentExtensions[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc index 14eef9280376..099e9046041f 100644 --- a/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc +++ b/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2023-01-11 09:17:16 UTC +--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2023-02-08 09:03:45 UTC +++ gpu/command_buffer/common/gpu_memory_buffer_support.cc @@ -173,7 +173,7 @@ uint32_t GetPlatformSpecificTextureTarget() { #if BUILDFLAG(IS_MAC) @@ -8,8 +8,8 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) return GL_TEXTURE_EXTERNAL_OES; #elif BUILDFLAG(IS_FUCHSIA) - return GL_TEXTURE_2D; -@@ -205,7 +205,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu + // Fuchsia uses Vulkan. +@@ -206,7 +206,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu gfx::BufferFormat format, gfx::BufferPlane plane) { #if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc index 6f738d78838b..91118c96cf46 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2022-11-30 08:12:58 UTC +--- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2023-02-08 09:03:45 UTC +++ gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc -@@ -94,7 +94,7 @@ bool AngleVulkanImageBackingFactory::CanUseAngleVulkan +@@ -123,7 +123,7 @@ bool AngleVulkanImageBackingFactory::CanUseAngleVulkan // TODO(penghuang): verify the scanout is the right usage for video playback. // crbug.com/1280798 constexpr auto kSupportedUsages = diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc index b4d716d3638f..2d225c09e79e 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-01-11 09:17:16 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-02-08 09:03:45 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc -@@ -32,7 +32,7 @@ +@@ -33,7 +33,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/scoped_binders.h" @@ -9,12 +9,12 @@ #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" #endif -@@ -572,7 +572,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma - MemoryTypeTracker* tracker, +@@ -574,7 +574,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma WGPUDevice wgpuDevice, - WGPUBackendType backend_type) { + WGPUBackendType backend_type, + std::vector<WGPUTextureFormat> view_formats) { -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(USE_DAWN) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) - auto wgpu_format = viz::ToWGPUFormat(format()); + auto wgpu_format = ToWGPUFormat(format()); if (wgpu_format == WGPUTextureFormat_Undefined) { diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc new file mode 100644 index 000000000000..c71d374cbb07 --- /dev/null +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc @@ -0,0 +1,11 @@ +--- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-02-08 09:03:45 UTC ++++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc +@@ -173,7 +173,7 @@ bool ExternalVkImageBackingFactory::IsSupported( + + // TODO: remove it when below formats are converted to multi plane shared + // image formats. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + switch (format.resource_format()) { + case viz::YUV_420_BIPLANAR: + case viz::YUVA_420_TRIPLANAR: diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc index 10a3c7a15aac..17ca2548868e 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc.orig 2023-01-11 09:17:16 UTC +--- gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc.orig 2023-02-08 09:03:45 UTC +++ gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc -@@ -346,7 +346,7 @@ void GLTextureImageBacking::InitializeGLTexture( +@@ -465,7 +465,7 @@ void GLTextureImageBacking::InitializeGLTexture( } void GLTextureImageBacking::CreateEGLImage() { diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc index 2295e37baeba..8ab6baa7e7c3 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc.orig 2023-01-11 09:17:16 UTC +--- gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc.orig 2023-02-08 09:03:45 UTC +++ gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc -@@ -165,7 +165,7 @@ bool GLTextureImageBackingFactory::IsSupported( +@@ -143,7 +143,7 @@ bool GLTextureImageBackingFactory::IsSupported( // Linux and ChromeOS support WebGPU/Compat on GL. All other platforms // do not support WebGPU on GL. if (usage & SHARED_IMAGE_USAGE_WEBGPU) { diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc new file mode 100644 index 000000000000..b8dc3f021508 --- /dev/null +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc @@ -0,0 +1,11 @@ +--- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2023-02-08 09:03:45 UTC ++++ gpu/command_buffer/service/shared_image/shared_image_manager.cc +@@ -472,7 +472,7 @@ bool SharedImageManager::SupportsScanoutImages() { + return true; + #elif BUILDFLAG(IS_ANDROID) + return base::AndroidHardwareBufferCompat::IsSupportAvailable(); +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + return ui::OzonePlatform::GetInstance() + ->GetPlatformRuntimeProperties() + .supports_native_pixmaps; diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc index 4a5766ada84b..f9ad09dbbe0a 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc.orig 2023-01-11 09:17:16 UTC +--- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc.orig 2023-02-08 09:03:45 UTC +++ gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc -@@ -237,7 +237,7 @@ class WrappedSkImage : public ClearTrackingSharedImage +@@ -216,7 +216,7 @@ class WrappedSkImage : public ClearTrackingSharedImage : GrMipMapped::kNo; const std::string label = "WrappedSkImageBackingFactory_Initialize" + CreateLabelForSharedImageUsage(usage()); 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 5ab1e1b7cfa6..379a43daea4b 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-01-11 09:17:16 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-02-08 09:03:45 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1213,7 +1213,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1225,7 +1225,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( if (gr_context_type_ != GrContextType::kVulkan && use_webgpu_adapter_ != WebGPUAdapterName::kCompat) { diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc index a9324925bf51..be083a63e2f8 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,4 +1,4 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2022-11-30 08:12:58 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2023-02-08 09:03:45 UTC +++ gpu/ipc/service/gpu_init.cc @@ -351,7 +351,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; @@ -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 -@@ -869,7 +869,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -870,7 +870,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled; @@ -72,7 +72,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 -@@ -932,7 +932,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -933,7 +933,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc index d624092a277c..8aca5439547d 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc @@ -1,4 +1,4 @@ ---- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2022-02-28 16:54:41 UTC +--- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2023-02-08 09:03:45 UTC +++ gpu/ipc/service/gpu_memory_buffer_factory.cc @@ -12,7 +12,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h" @@ -9,7 +9,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h" #endif -@@ -34,7 +34,7 @@ GpuMemoryBufferFactory::CreateNativeType( +@@ -35,7 +35,7 @@ GpuMemoryBufferFactory::CreateNativeType( return std::make_unique<GpuMemoryBufferFactoryIOSurface>(); #elif BUILDFLAG(IS_ANDROID) return std::make_unique<GpuMemoryBufferFactoryAndroidHardwareBuffer>(); diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__image.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__image.cc index 6e56f5b75688..79e798629213 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__image.cc +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__image.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_image.cc.orig 2022-02-28 16:54:41 UTC +--- gpu/vulkan/vulkan_image.cc.orig 2023-02-08 09:03:45 UTC +++ gpu/vulkan/vulkan_image.cc -@@ -322,7 +322,7 @@ bool VulkanImage::InitializeWithExternalMemory( +@@ -392,7 +392,7 @@ bool VulkanImage::InitializeWithExternalMemory( // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__image.h b/www/chromium/files/patch-gpu_vulkan_vulkan__image.h index e6caa33c4def..e50d3fc98eeb 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__image.h +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__image.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_image.h.orig 2022-02-28 16:54:41 UTC +--- gpu/vulkan/vulkan_image.h.orig 2023-02-08 09:03:45 UTC +++ gpu/vulkan/vulkan_image.h -@@ -86,7 +86,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { +@@ -87,7 +87,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { VkImageUsageFlags usage, VkImageCreateFlags flags); @@ -9,7 +9,7 @@ static std::unique_ptr<VulkanImage> CreateWithExternalMemoryAndModifiers( VulkanDeviceQueue* device_queue, const gfx::Size& size, -@@ -170,7 +170,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { +@@ -199,7 +199,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { VkImageTiling image_tiling, uint32_t queue_family_index); diff --git a/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc b/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc index aa16328ae570..e39ba3cb5c16 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_web_contents_impl.cc.orig 2022-10-24 13:33:33 UTC +--- headless/lib/browser/headless_web_contents_impl.cc.orig 2023-02-08 09:03:45 UTC +++ headless/lib/browser/headless_web_contents_impl.cc -@@ -60,7 +60,7 @@ namespace headless { +@@ -61,7 +61,7 @@ namespace headless { namespace { void UpdatePrefsFromSystemSettings(blink::RendererPreferences* prefs) { diff --git a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc index b40d6a2b668f..04bec9d024f3 100644 --- a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc +++ b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc @@ -1,6 +1,6 @@ ---- headless/lib/headless_content_main_delegate.cc.orig 2022-11-30 08:12:58 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2023-02-08 09:03:45 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -336,7 +336,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -337,7 +337,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( if (process_type != switches::kZygoteProcess) { g_headless_crash_client.Pointer()->set_crash_dumps_dir( options()->crash_dumps_dir); diff --git a/www/chromium/files/patch-ipc_ipc__channel__common.cc b/www/chromium/files/patch-ipc_ipc__channel__common.cc index ba398d72e225..f11c89965674 100644 --- a/www/chromium/files/patch-ipc_ipc__channel__common.cc +++ b/www/chromium/files/patch-ipc_ipc__channel__common.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_channel_common.cc.orig 2022-05-19 14:06:27 UTC +--- ipc/ipc_channel_common.cc.orig 2023-02-08 09:03:45 UTC +++ ipc/ipc_channel_common.cc -@@ -11,7 +11,7 @@ +@@ -10,7 +10,7 @@ namespace IPC { diff --git a/www/chromium/files/patch-ipc_ipc__channel__mojo.cc b/www/chromium/files/patch-ipc_ipc__channel__mojo.cc index c36c54707a43..0dcf959a6109 100644 --- a/www/chromium/files/patch-ipc_ipc__channel__mojo.cc +++ b/www/chromium/files/patch-ipc_ipc__channel__mojo.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_channel_mojo.cc.orig 2023-01-11 09:17:16 UTC +--- ipc/ipc_channel_mojo.cc.orig 2023-02-08 09:03:45 UTC +++ ipc/ipc_channel_mojo.cc -@@ -113,7 +113,7 @@ class ThreadSafeChannelProxy : public mojo::ThreadSafe +@@ -105,7 +105,7 @@ class ThreadSafeChannelProxy : public mojo::ThreadSafe }; base::ProcessId GetSelfPID() { diff --git a/www/chromium/files/patch-media_BUILD.gn b/www/chromium/files/patch-media_BUILD.gn index 14e79e3a25c0..ce17c789ad9b 100644 --- a/www/chromium/files/patch-media_BUILD.gn +++ b/www/chromium/files/patch-media_BUILD.gn @@ -1,6 +1,6 @@ ---- media/BUILD.gn.orig 2023-01-11 09:17:16 UTC +--- media/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ media/BUILD.gn -@@ -88,6 +88,9 @@ config("media_config") { +@@ -87,6 +87,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn index 9c3f4b0aeb6e..bad62e29eef8 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-01-11 09:17:16 UTC +--- media/audio/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ media/audio/BUILD.gn -@@ -248,9 +248,20 @@ source_set("audio") { +@@ -246,9 +246,20 @@ source_set("audio") { ] } diff --git a/www/chromium/files/patch-media_audio_audio__output__proxy__unittest.cc b/www/chromium/files/patch-media_audio_audio__output__proxy__unittest.cc index 3110c8f24c5f..6a78f59e7a28 100644 --- a/www/chromium/files/patch-media_audio_audio__output__proxy__unittest.cc +++ b/www/chromium/files/patch-media_audio_audio__output__proxy__unittest.cc @@ -1,6 +1,6 @@ ---- media/audio/audio_output_proxy_unittest.cc.orig 2022-02-28 16:54:41 UTC +--- media/audio/audio_output_proxy_unittest.cc.orig 2023-02-08 09:03:45 UTC +++ media/audio/audio_output_proxy_unittest.cc -@@ -412,7 +412,11 @@ class AudioOutputProxyTest : public testing::Test { +@@ -444,7 +444,11 @@ class AudioOutputProxyTest : public testing::Test { // |stream| is closed at this point. Start() should reopen it again. EXPECT_CALL(manager(), MakeAudioOutputStream(_, _, _)) .Times(2) diff --git a/www/chromium/files/patch-media_audio_sndio_sndio__output.cc b/www/chromium/files/patch-media_audio_sndio_sndio__output.cc index 694b777465d7..e875d0c0d87b 100644 --- a/www/chromium/files/patch-media_audio_sndio_sndio__output.cc +++ b/www/chromium/files/patch-media_audio_sndio_sndio__output.cc @@ -1,4 +1,4 @@ ---- media/audio/sndio/sndio_output.cc.orig 2022-02-28 16:54:41 UTC +--- media/audio/sndio/sndio_output.cc.orig 2023-02-08 09:03:45 UTC +++ media/audio/sndio/sndio_output.cc @@ -0,0 +1,187 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. @@ -165,7 +165,7 @@ + // Get data to play + const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, + params.sample_rate()); -+ count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get()); ++ count = source->OnMoreData(delay, base::TimeTicks::Now(), {}, audio_bus.get()); + audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer)); + if (count == 0) { + // We have to submit something to the device diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc index 91297593ee29..fa7c07484068 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-01-11 09:17:16 UTC +--- media/base/media_switches.cc.orig 2023-02-08 09:03:45 UTC +++ media/base/media_switches.cc @@ -12,7 +12,7 @@ #include "components/system_media_controls/linux/buildflags/buildflags.h" @@ -9,7 +9,25 @@ #include "base/cpu.h" #endif -@@ -494,7 +494,7 @@ BASE_FEATURE(kGav1VideoDecoder, +@@ -407,7 +407,7 @@ BASE_FEATURE(kCdmProcessSiteIsolation, + // playback going to a specific output device in the audio service. + BASE_FEATURE(kChromeWideEchoCancellation, + "ChromeWideEchoCancellation", +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT); + #else + base::FEATURE_DISABLED_BY_DEFAULT); +@@ -419,7 +419,7 @@ BASE_FEATURE(kChromeWideEchoCancellation, + // processing is done on the audio capture thread itself. + const base::FeatureParam<int> kChromeWideEchoCancellationProcessingFifoSize{ + &kChromeWideEchoCancellation, "processing_fifo_size", +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + 110 // Default value for the enabled feature. + #else + 0 +@@ -510,7 +510,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", @@ -18,7 +36,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -535,7 +535,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP +@@ -558,7 +558,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +45,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -579,7 +579,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -602,7 +602,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -36,9 +54,9 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. BASE_FEATURE(kVaapiVideoDecodeLinux, -@@ -1084,14 +1084,14 @@ const base::Feature MEDIA_EXPORT kDeprecateLowUsageCod - "DeprecateLowUsageCodecs", base::FEATURE_ENABLED_BY_DEFAULT}; - #endif // BUILDFLAG(IS_CHROMEOS) +@@ -1097,14 +1097,14 @@ BASE_FEATURE(kAllowClearDolbyVisionInMseWhenPlatformEn + base::FEATURE_DISABLED_BY_DEFAULT); + #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-media_base_media__switches.h b/www/chromium/files/patch-media_base_media__switches.h index 13ac010ae7de..95dae05cd365 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-01-11 09:17:16 UTC +--- media/base/media_switches.h.orig 2023-02-08 09:03:45 UTC +++ media/base/media_switches.h -@@ -217,7 +217,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor +@@ -252,7 +252,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,8 +9,8 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux); -@@ -328,11 +328,11 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE( - MEDIA_EXPORT BASE_DECLARE_FEATURE(kDeprecateLowUsageCodecs); +@@ -352,11 +352,11 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE( + kAllowClearDolbyVisionInMseWhenPlatformEncryptedDvEnabled); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-media_base_user__input__monitor__unittest.cc b/www/chromium/files/patch-media_base_user__input__monitor__unittest.cc index 08c5284ee7a6..6922ad201945 100644 --- a/www/chromium/files/patch-media_base_user__input__monitor__unittest.cc +++ b/www/chromium/files/patch-media_base_user__input__monitor__unittest.cc @@ -1,4 +1,4 @@ ---- media/base/user_input_monitor_unittest.cc.orig 2022-02-28 16:54:41 UTC +--- media/base/user_input_monitor_unittest.cc.orig 2023-02-08 09:03:45 UTC +++ media/base/user_input_monitor_unittest.cc @@ -13,7 +13,7 @@ #include "build/build_config.h" @@ -18,7 +18,7 @@ base::test::TaskEnvironment task_environment( base::test::TaskEnvironment::MainThreadType::IO); #else -@@ -71,7 +71,7 @@ TEST_F(UserInputMonitorTest, CreatePlatformSpecific) { +@@ -72,7 +72,7 @@ TEST_F(UserInputMonitorTest, CreatePlatformSpecific) { } TEST_F(UserInputMonitorTest, CreatePlatformSpecificWithMapping) { diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index 2226dfd18e3a..9e1786c32431 100644 --- a/www/chromium/files/patch-media_base_video__frame.cc +++ b/www/chromium/files/patch-media_base_video__frame.cc @@ -1,4 +1,4 @@ ---- media/base/video_frame.cc.orig 2023-01-11 09:17:16 UTC +--- media/base/video_frame.cc.orig 2023-02-08 09:03:45 UTC +++ media/base/video_frame.cc @@ -79,7 +79,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; @@ -45,7 +45,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -910,7 +910,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -912,7 +912,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( } } @@ -54,7 +54,7 @@ DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1301,7 +1301,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( +@@ -1303,7 +1303,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( : mailbox_holders_[texture_index]; } @@ -63,7 +63,7 @@ const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1413,7 +1413,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1415,7 +1415,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, storage_type_(storage_type), visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), natural_size_(natural_size), diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc index 0b8fd8d4a5db..e7158f87da9a 100644 --- a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc +++ b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc @@ -1,6 +1,6 @@ ---- media/capture/video/video_capture_device_client.cc.orig 2022-06-17 14:20:10 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2023-02-08 09:03:45 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -317,7 +317,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( +@@ -318,7 +318,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. // Windows RGB24 defines blue at lowest byte, // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 diff --git a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc index 04063157bb3a..debbaba4aced 100644 --- a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc +++ b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-01-11 09:17:16 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-02-08 09:03:45 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -768,7 +768,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -789,7 +789,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } } @@ -9,7 +9,7 @@ // Linux should always use a custom allocator (to allocate buffers using // libva) and a PlatformVideoFramePool. CHECK(allocator.has_value()); -@@ -790,7 +790,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -811,7 +811,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( #error "Unsupported platform" #endif diff --git a/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc b/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc index e97b3e579545..a018920c7df5 100644 --- a/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc +++ b/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc @@ -1,6 +1,6 @@ ---- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2022-08-31 12:19:35 UTC +--- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2023-02-08 09:03:45 UTC +++ media/gpu/gpu_video_encode_accelerator_factory.cc -@@ -111,7 +111,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions +@@ -121,7 +121,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions return vea_factory_functions; #if BUILDFLAG(USE_VAAPI) diff --git a/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc index ba3b57dea187..fe3d46e219bb 100644 --- a/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc @@ -1,6 +1,6 @@ ---- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2022-10-24 13:33:33 UTC +--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2023-02-08 09:03:45 UTC +++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc -@@ -14,12 +14,15 @@ +@@ -15,7 +15,9 @@ #include "media/gpu/vaapi/vaapi_wrapper.h" #endif @@ -8,19 +8,37 @@ using sandbox::syscall_broker::BrokerFilePermission; +#endif + // TODO(b/195769334): the hardware video decoding sandbox is really only useful + // when building with VA-API or V4L2 (otherwise, we're not really doing hardware +@@ -31,6 +33,7 @@ using sandbox::syscall_broker::BrokerFilePermission; namespace media { + namespace { ++#if !BUILDFLAG(IS_BSD) + void AllowAccessToRenderNodes(std::vector<BrokerFilePermission>& permissions, + bool include_sys_dev_char, + bool read_write) { +@@ -160,6 +163,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( + return false; + #endif // BUILDFLAG(USE_V4L2_CODEC) + } ++#endif + + } // namespace + +@@ -175,6 +179,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( + // (at least). bool HardwareVideoDecodingPreSandboxHook( sandbox::policy::SandboxLinux::Options options) { +#if !BUILDFLAG(IS_BSD) - sandbox::syscall_broker::BrokerCommandSet command_set; - std::vector<BrokerFilePermission> permissions; - -@@ -126,6 +129,7 @@ bool HardwareVideoDecodingPreSandboxHook( - dlopen("/usr/lib/libv4l2.so", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE); - #endif // defined(__aarch64__) - #endif // BUILDFLAG(USE_VAAPI) + using HardwareVideoDecodingProcessPolicy = + sandbox::policy::HardwareVideoDecodingProcessPolicy; + using PolicyType = +@@ -212,6 +217,7 @@ bool HardwareVideoDecodingPreSandboxHook( + sandbox::policy::SandboxLinux::GetInstance()->StartBrokerProcess( + command_set, permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), + options); +#endif - return true; } + 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 2e08d719bf91..fcf4a29c1d04 100644 --- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc +++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc @@ -1,6 +1,6 @@ ---- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2022-09-24 10:57:32 UTC +--- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2023-02-08 09:03:45 UTC +++ media/gpu/vaapi/vaapi_video_decoder.cc -@@ -767,7 +767,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree +@@ -769,7 +769,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree const gfx::Size decoder_natural_size = aspect_ratio_.GetNaturalSize(decoder_visible_rect); diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc index ffecd0feeb5f..7208c9a3d052 100644 --- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc +++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc @@ -1,6 +1,6 @@ ---- media/gpu/vaapi/vaapi_wrapper.cc.orig 2023-01-11 09:17:16 UTC +--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2023-02-08 09:03:45 UTC +++ media/gpu/vaapi/vaapi_wrapper.cc -@@ -740,7 +740,7 @@ VADisplayState::VADisplayState() +@@ -755,7 +755,7 @@ VADisplayState::VADisplayState() bool VADisplayState::Initialize() { base::AutoLock auto_lock(va_lock_); diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni index 91f8c0436b9b..23dc6522fe13 100644 --- a/www/chromium/files/patch-media_media__options.gni +++ b/www/chromium/files/patch-media_media__options.gni @@ -1,6 +1,6 @@ ---- media/media_options.gni.orig 2023-01-11 09:17:16 UTC +--- media/media_options.gni.orig 2023-02-08 09:03:45 UTC +++ media/media_options.gni -@@ -160,12 +160,15 @@ declare_args() { +@@ -172,12 +172,15 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false @@ -17,7 +17,7 @@ (!is_castos || (target_cpu == "x86" || target_cpu == "x64") || is_cast_audio_only)) { use_alsa = true -@@ -181,6 +184,10 @@ declare_args() { +@@ -193,6 +196,10 @@ declare_args() { if (!use_cras && !is_castos && !is_asan && !is_tsan) { use_pulseaudio = true } diff --git a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc index b4ac204e278e..c24794f10fbb 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,4 +1,4 @@ ---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2022-11-30 08:12:58 UTC +--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2023-02-08 09:03:45 UTC +++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc @@ -42,7 +42,7 @@ media::stable::mojom::VideoFrameDataPtr MakeVideoFrame gfx::GpuMemoryBufferHandle gpu_memory_buffer_handle = @@ -9,7 +9,7 @@ CHECK_EQ(gpu_memory_buffer_handle.type, gfx::NATIVE_PIXMAP); CHECK(!gpu_memory_buffer_handle.native_pixmap_handle.planes.empty()); #else -@@ -747,7 +747,7 @@ const gfx::GpuMemoryBufferId& StructTraits< +@@ -751,7 +751,7 @@ const gfx::GpuMemoryBufferId& StructTraits< return input.id; } @@ -18,7 +18,7 @@ // static gfx::NativePixmapHandle StructTraits< media::stable::mojom::NativeGpuMemoryBufferHandleDataView, -@@ -768,7 +768,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor +@@ -772,7 +772,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 e52d9da1f23c..7e8de8594283 100644 --- a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,6 +1,6 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2023-01-11 09:17:16 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2023-02-08 09:03:45 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -735,7 +735,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -736,7 +736,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); @@ -9,7 +9,7 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1164,7 +1164,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1167,7 +1167,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 &= -@@ -1183,7 +1183,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1186,7 +1186,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | gpu::SHARED_IMAGE_USAGE_SCANOUT; diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc index c4ff601ea2cc..a9a52c9d5629 100644 --- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc +++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter.cc.orig 2023-01-11 09:17:16 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2023-02-08 09:03:45 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -135,7 +135,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( +@@ -137,7 +137,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( if (is_rgb) config.input_format = PIXEL_FORMAT_I420; @@ -9,9 +9,9 @@ if (format != PIXEL_FORMAT_I420 || !VideoFrame::IsStorageTypeMappable(storage_type)) { // ChromeOS/Linux hardware video encoders supports I420 on-memory -@@ -453,7 +453,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -457,7 +457,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal SetUpVeaConfig(profile_, options_, format, first_frame->storage_type(), - supported_rc_modes_); + supported_rc_modes_, required_encoder_type_); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) 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 e3c78ad1a3c6..c8d53c36af2c 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-01-11 09:17:16 UTC +--- media/video/video_encode_accelerator_adapter_test.cc.orig 2023-02-08 09:03:45 UTC +++ media/video/video_encode_accelerator_adapter_test.cc -@@ -444,7 +444,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes +@@ -443,7 +443,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-media_webrtc_helpers.cc b/www/chromium/files/patch-media_webrtc_helpers.cc index d7a6e570cbee..a2ca0ddebbdc 100644 --- a/www/chromium/files/patch-media_webrtc_helpers.cc +++ b/www/chromium/files/patch-media_webrtc_helpers.cc @@ -1,19 +1,11 @@ ---- media/webrtc/helpers.cc.orig 2023-01-11 09:17:16 UTC +--- media/webrtc/helpers.cc.orig 2023-02-08 09:03:45 UTC +++ media/webrtc/helpers.cc -@@ -17,14 +17,14 @@ - namespace media { - namespace { - +@@ -40,7 +40,7 @@ void ConfigAutomaticGainControl(const AudioProcessingS + apm_config.gain_controller2.enabled = false; + return; + } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - constexpr bool kUseHybridAgc = true; - #else - constexpr bool kUseHybridAgc = false; - #endif + // Use the Hybrid AGC setup, which combines the AGC1 input volume controller + // and the AGC2 digital adaptive controller. - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - constexpr bool kUseClippingController = true; - #else - constexpr bool kUseClippingController = false; diff --git a/www/chromium/files/patch-media_webrtc_helpers__unittests.cc b/www/chromium/files/patch-media_webrtc_helpers__unittests.cc index 3fba74be9256..0cf160f71490 100644 --- a/www/chromium/files/patch-media_webrtc_helpers__unittests.cc +++ b/www/chromium/files/patch-media_webrtc_helpers__unittests.cc @@ -1,20 +1,29 @@ ---- media/webrtc/helpers_unittests.cc.orig 2022-06-17 14:20:10 UTC +--- media/webrtc/helpers_unittests.cc.orig 2023-02-08 09:03:45 UTC +++ media/webrtc/helpers_unittests.cc -@@ -36,7 +36,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau +@@ -39,7 +39,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau EXPECT_FALSE(config.pre_amplifier.enabled); EXPECT_TRUE(config.echo_canceller.enabled); - EXPECT_TRUE(config.gain_controller1.enabled); + -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + EXPECT_TRUE(config.gain_controller1.enabled); EXPECT_TRUE(config.gain_controller2.enabled); - #else - EXPECT_FALSE(config.gain_controller2.enabled); -@@ -98,7 +98,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau + #elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) +@@ -77,7 +77,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, + EXPECT_EQ(config.gain_controller2, kDefaultApmConfig.gain_controller2); + } - // Check that either AGC1 digital or AGC2 digital is used based on the - // platforms where the Hybrid AGC is enabled by default. -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - EXPECT_FALSE(agc1_analog_config.enable_digital_adaptive); - EXPECT_TRUE(config.gain_controller2.enabled); - EXPECT_TRUE(config.gain_controller2.adaptive_digital.enabled); + TEST(CreateWebRtcAudioProcessingModuleTest, + InputVolumeAdjustmentEnabledWithHybridAgc) { + ::base::test::ScopedFeatureList feature_list; +@@ -103,7 +103,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + + #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) + TEST(CreateWebRtcAudioProcessingModuleTest, + OnlyOneInputVolumeControllerEnabledOnDesktopPlatforms) { + auto config = CreateApmGetConfig( diff --git a/www/chromium/files/patch-mojo_core_BUILD.gn b/www/chromium/files/patch-mojo_core_BUILD.gn index db738f15c976..1738e95dedd2 100644 --- a/www/chromium/files/patch-mojo_core_BUILD.gn +++ b/www/chromium/files/patch-mojo_core_BUILD.gn @@ -1,6 +1,6 @@ ---- mojo/core/BUILD.gn.orig 2022-11-30 08:12:58 UTC +--- mojo/core/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ mojo/core/BUILD.gn -@@ -163,7 +163,7 @@ template("core_impl_source_set") { +@@ -164,7 +164,7 @@ template("core_impl_source_set") { ] } diff --git a/www/chromium/files/patch-mojo_core_channel.cc b/www/chromium/files/patch-mojo_core_channel.cc index 102eb1a837b8..d990a6bc5949 100644 --- a/www/chromium/files/patch-mojo_core_channel.cc +++ b/www/chromium/files/patch-mojo_core_channel.cc @@ -1,6 +1,6 @@ ---- mojo/core/channel.cc.orig 2022-10-24 13:33:33 UTC +--- mojo/core/channel.cc.orig 2023-02-08 09:03:45 UTC +++ mojo/core/channel.cc -@@ -72,7 +72,11 @@ const size_t kMaxUnusedReadBufferCapacity = 4096; +@@ -74,7 +74,11 @@ const size_t kMaxUnusedReadBufferCapacity = 4096; // Fuchsia: The zx_channel_write() API supports up to 64 handles. const size_t kMaxAttachedHandles = 64; diff --git a/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni index d89b8c78413e..69b30b6b0076 100644 --- a/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni +++ b/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni @@ -1,6 +1,6 @@ ---- mojo/public/tools/bindings/mojom.gni.orig 2023-01-11 09:17:16 UTC +--- mojo/public/tools/bindings/mojom.gni.orig 2023-02-08 09:03:45 UTC +++ mojo/public/tools/bindings/mojom.gni -@@ -699,6 +699,16 @@ template("mojom") { +@@ -696,6 +696,16 @@ template("mojom") { enabled_features += [ "is_win" ] } diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index ec868951cfea..d30a5a2a01d4 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-01-11 09:17:16 UTC +--- net/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ net/BUILD.gn @@ -103,7 +103,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1209,6 +1209,15 @@ component("net") { +@@ -1212,6 +1212,15 @@ component("net") { deps += [ "//third_party/xdg_shared_mime_info" ] } @@ -25,7 +25,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1341,7 +1350,7 @@ component("net") { +@@ -1344,7 +1353,7 @@ component("net") { } } @@ -34,7 +34,7 @@ sources += [ "base/network_change_notifier_posix.cc", "base/network_change_notifier_posix.h", -@@ -1374,7 +1383,7 @@ component("net") { +@@ -1377,7 +1386,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -43,8 +43,8 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -4642,7 +4651,7 @@ test("net_unittests") { - ] +@@ -4640,7 +4649,7 @@ test("net_unittests") { + sources += [ "proxy_resolution/proxy_config_service_linux_unittest.cc" ] } - if (is_linux || is_chromeos) { @@ -52,7 +52,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -4717,6 +4726,10 @@ test("net_unittests") { +@@ -4712,6 +4721,10 @@ test("net_unittests") { "//url:buildflags", ] @@ -63,7 +63,7 @@ if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -4784,7 +4797,7 @@ test("net_unittests") { +@@ -4779,7 +4792,7 @@ test("net_unittests") { ] } @@ -72,7 +72,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -4906,7 +4919,7 @@ test("net_unittests") { +@@ -4901,7 +4914,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc.cc b/www/chromium/files/patch-net_cert_cert__verify__proc.cc index 4277d6c08e04..b7644e54122c 100644 --- a/www/chromium/files/patch-net_cert_cert__verify__proc.cc +++ b/www/chromium/files/patch-net_cert_cert__verify__proc.cc @@ -1,6 +1,6 @@ ---- net/cert/cert_verify_proc.cc.orig 2022-11-30 08:12:58 UTC +--- net/cert/cert_verify_proc.cc.orig 2023-02-08 09:03:45 UTC +++ net/cert/cert_verify_proc.cc -@@ -506,7 +506,7 @@ base::Value CertVerifyParams(X509Certificate* cert, +@@ -507,7 +507,7 @@ base::Value CertVerifyParams(X509Certificate* cert, } // namespace diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc b/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc index 05938c1b29e5..21e898d25920 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 2022-11-30 08:12:58 UTC +--- net/cert/cert_verify_proc_unittest.cc.orig 2023-02-08 09:03:45 UTC +++ net/cert/cert_verify_proc_unittest.cc -@@ -242,7 +242,7 @@ const std::vector<CertVerifyProcType> kAllCertVerifier +@@ -269,7 +269,7 @@ const std::vector<CertVerifyProcType> kAllCertVerifier #if BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED) CERT_VERIFY_PROC_BUILTIN_CHROME_ROOTS #endif diff --git a/www/chromium/files/patch-net_dns_BUILD.gn b/www/chromium/files/patch-net_dns_BUILD.gn index 77940158b21b..589418b5fb5f 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-01-11 09:17:16 UTC +--- net/dns/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ net/dns/BUILD.gn -@@ -122,7 +122,7 @@ source_set("dns") { +@@ -124,7 +124,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", -@@ -163,6 +163,7 @@ source_set("dns") { +@@ -165,6 +165,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +17,7 @@ ] allow_circular_includes_from = [ -@@ -425,9 +426,9 @@ source_set("tests") { +@@ -428,9 +429,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/www/chromium/files/patch-net_dns_dns__util.cc b/www/chromium/files/patch-net_dns_dns__util.cc index 9001b9322f68..e2633472d6b7 100644 --- a/www/chromium/files/patch-net_dns_dns__util.cc +++ b/www/chromium/files/patch-net_dns_dns__util.cc @@ -1,11 +1,11 @@ ---- net/dns/dns_util.cc.orig 2022-04-21 18:48:31 UTC +--- net/dns/dns_util.cc.orig 2023-02-08 09:03:45 UTC +++ net/dns/dns_util.cc -@@ -28,6 +28,8 @@ +@@ -29,6 +29,8 @@ + #include "net/dns/public/util.h" #include "net/third_party/uri_template/uri_template.h" - #include "third_party/abseil-cpp/absl/types/optional.h" +#include <sys/socket.h> + #if BUILDFLAG(IS_POSIX) - #include <netinet/in.h> #include <net/if.h> + #include <netinet/in.h> diff --git a/www/chromium/files/patch-net_dns_host__resolver__system__task.cc b/www/chromium/files/patch-net_dns_host__resolver__system__task.cc index dabcd25570a0..99e6366e4f14 100644 --- a/www/chromium/files/patch-net_dns_host__resolver__system__task.cc +++ b/www/chromium/files/patch-net_dns_host__resolver__system__task.cc @@ -1,6 +1,6 @@ ---- net/dns/host_resolver_system_task.cc.orig 2023-01-11 09:17:16 UTC +--- net/dns/host_resolver_system_task.cc.orig 2023-02-08 09:03:45 UTC +++ net/dns/host_resolver_system_task.cc -@@ -351,8 +351,8 @@ void HostResolverSystemTask::OnLookupComplete(const ui +@@ -353,8 +353,8 @@ void HostResolverSystemTask::OnLookupComplete(const ui } void EnsureSystemHostResolverCallReady() { @@ -11,7 +11,7 @@ EnsureDnsReloaderInit(); #elif BUILDFLAG(IS_WIN) EnsureWinsockInit(); -@@ -438,7 +438,7 @@ int SystemHostResolverCall(const std::string& host, +@@ -440,7 +440,7 @@ int SystemHostResolverCall(const std::string& host, base::BlockingType::WILL_BLOCK); #if BUILDFLAG(IS_POSIX) && \ diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc index e02668b4c754..6eb4fcdfc0c0 100644 --- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_posix.cc.orig 2022-10-24 13:33:33 UTC +--- net/socket/udp_socket_posix.cc.orig 2023-02-08 09:03:45 UTC +++ net/socket/udp_socket_posix.cc -@@ -558,7 +558,7 @@ int UDPSocketPosix::SetDoNotFragment() { +@@ -559,7 +559,7 @@ int UDPSocketPosix::SetDoNotFragment() { } void UDPSocketPosix::SetMsgConfirm(bool confirm) { @@ -9,7 +9,7 @@ if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { -@@ -579,7 +579,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { +@@ -580,7 +580,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); int value = broadcast ? 1 : 0; int rv; @@ -18,7 +18,7 @@ // SO_REUSEPORT on OSX permits multiple processes to each receive // UDP multicast or broadcast datagrams destined for the bound // port. -@@ -892,7 +892,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) +@@ -893,7 +893,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) #if BUILDFLAG(IS_CHROMEOS_ASH) if (last_error == EINVAL) return ERR_ADDRESS_IN_USE; diff --git a/www/chromium/files/patch-net_socket_udp__socket__unittest.cc b/www/chromium/files/patch-net_socket_udp__socket__unittest.cc index 696eeb738f0f..09db35a32177 100644 --- a/www/chromium/files/patch-net_socket_udp__socket__unittest.cc +++ b/www/chromium/files/patch-net_socket_udp__socket__unittest.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_unittest.cc.orig 2022-11-30 08:12:58 UTC +--- net/socket/udp_socket_unittest.cc.orig 2023-02-08 09:03:45 UTC +++ net/socket/udp_socket_unittest.cc -@@ -342,7 +342,7 @@ TEST_F(UDPSocketTest, PartialRecv) { +@@ -341,7 +341,7 @@ TEST_F(UDPSocketTest, PartialRecv) { EXPECT_EQ(second_packet, received); } @@ -9,7 +9,7 @@ // - MacOS: requires root permissions on OSX 10.7+. // - Android: devices attached to testbots don't have default network, so // broadcasting to 255.255.255.255 returns error -109 (Address not reachable). -@@ -602,7 +602,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) { +@@ -601,7 +601,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) { EXPECT_THAT(rv, IsOk()); rv = client.SetDoNotFragment(); @@ -18,7 +18,7 @@ // TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia. EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); #elif BUILDFLAG(IS_MAC) -@@ -630,7 +630,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) { +@@ -629,7 +629,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) { EXPECT_THAT(rv, IsOk()); rv = server.SetDoNotFragment(); @@ -27,7 +27,7 @@ // TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia. EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); #elif BUILDFLAG(IS_MAC) -@@ -695,7 +695,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { +@@ -694,7 +694,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { // TODO(https://crbug.com/947115): failing on device on iOS 12.2. // TODO(https://crbug.com/1227554): flaky on Mac 11. @@ -36,7 +36,7 @@ #define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress #else #define MAYBE_SharedMulticastAddress SharedMulticastAddress -@@ -749,7 +749,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { +@@ -748,7 +748,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { NetLogSource()); ASSERT_THAT(client_socket.Connect(send_address), IsOk()); diff --git a/www/chromium/files/patch-net_tools_net__watcher_net__watcher.cc b/www/chromium/files/patch-net_tools_net__watcher_net__watcher.cc new file mode 100644 index 000000000000..9f5c72dbbece --- /dev/null +++ b/www/chromium/files/patch-net_tools_net__watcher_net__watcher.cc @@ -0,0 +1,29 @@ +--- net/tools/net_watcher/net_watcher.cc.orig 2023-02-08 09:03:45 UTC ++++ net/tools/net_watcher/net_watcher.cc +@@ -32,7 +32,7 @@ + #include "net/proxy_resolution/proxy_config_service.h" + #include "net/proxy_resolution/proxy_config_with_annotation.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "net/base/network_change_notifier_linux.h" + #endif + +@@ -44,7 +44,7 @@ namespace { + + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Flag to specifies which network interfaces to ignore. Interfaces should + // follow as a comma seperated list. + const char kIgnoreNetifFlag[] = "ignore-netif"; +@@ -163,7 +163,7 @@ int main(int argc, char* argv[]) { + + NetWatcher net_watcher; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); + std::string ignored_netifs_str = + command_line->GetSwitchValueASCII(kIgnoreNetifFlag); diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc index 5158db37ed3f..393ae353d41b 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context_builder.cc.orig 2022-10-24 13:33:33 UTC +--- net/url_request/url_request_context_builder.cc.orig 2023-02-08 09:03:45 UTC +++ net/url_request/url_request_context_builder.cc -@@ -443,7 +443,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -442,7 +442,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc index dcfe4c3200ff..173b4cd28203 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 2022-11-30 08:12:58 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2023-02-08 09:03:45 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -82,7 +82,7 @@ +@@ -84,7 +84,7 @@ #include "gin/public/cppgc.h" #endif @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -521,7 +521,7 @@ void InitializeSDK(bool enable_v8, FontMappingMode fon +@@ -528,7 +528,7 @@ void InitializeSDK(bool enable_v8, FontMappingMode fon FPDF_InitLibraryWithConfig(&config); diff --git a/www/chromium/files/patch-printing_print__settings.cc b/www/chromium/files/patch-printing_print__settings.cc index 4817f01524ad..2934346d9c35 100644 --- a/www/chromium/files/patch-printing_print__settings.cc +++ b/www/chromium/files/patch-printing_print__settings.cc @@ -1,6 +1,6 @@ ---- printing/print_settings.cc.orig 2023-01-11 09:17:16 UTC +--- printing/print_settings.cc.orig 2023-02-08 09:03:45 UTC +++ printing/print_settings.cc -@@ -272,7 +272,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet +@@ -273,7 +273,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet #endif is_modifiable_ = settings.is_modifiable_; pages_per_sheet_ = settings.pages_per_sheet_; @@ -9,7 +9,7 @@ for (const auto& item : settings.advanced_settings_) advanced_settings_.emplace(item.first, item.second.Clone()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -313,7 +313,7 @@ void PrintSettings::Clear() { +@@ -314,7 +314,7 @@ void PrintSettings::Clear() { #endif is_modifiable_ = true; pages_per_sheet_ = 1; diff --git a/www/chromium/files/patch-printing_print__settings.h b/www/chromium/files/patch-printing_print__settings.h index 7181445a1cfc..5ae7806af8bf 100644 --- a/www/chromium/files/patch-printing_print__settings.h +++ b/www/chromium/files/patch-printing_print__settings.h @@ -1,6 +1,6 @@ ---- printing/print_settings.h.orig 2023-01-11 09:17:16 UTC +--- printing/print_settings.h.orig 2023-02-08 09:03:45 UTC +++ printing/print_settings.h -@@ -18,7 +18,7 @@ +@@ -19,7 +19,7 @@ #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" @@ -9,7 +9,7 @@ #include <map> #include "base/values.h" -@@ -66,7 +66,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -67,7 +67,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { } }; @@ -18,7 +18,7 @@ using AdvancedSettings = std::map<std::string, base::Value>; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -221,7 +221,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -232,7 +232,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { pages_per_sheet_ = pages_per_sheet; } @@ -27,7 +27,7 @@ AdvancedSettings& advanced_settings() { return advanced_settings_; } const AdvancedSettings& advanced_settings() const { return advanced_settings_; -@@ -327,7 +327,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -342,7 +342,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { // Number of pages per sheet. int pages_per_sheet_; diff --git a/www/chromium/files/patch-printing_print__settings__conversion.cc b/www/chromium/files/patch-printing_print__settings__conversion.cc index 9a3a389af72f..f6e8e536ad24 100644 --- a/www/chromium/files/patch-printing_print__settings__conversion.cc +++ b/www/chromium/files/patch-printing_print__settings__conversion.cc @@ -1,11 +1,11 @@ ---- printing/print_settings_conversion.cc.orig 2022-08-31 12:19:35 UTC +--- printing/print_settings_conversion.cc.orig 2023-02-08 09:03:45 UTC +++ printing/print_settings_conversion.cc -@@ -256,7 +256,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet +@@ -260,7 +260,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet settings->set_is_modifiable(is_modifiable.value()); } --#if BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && defined(USE_CUPS)) -+#if BUILDFLAG(IS_CHROMEOS) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_CUPS)) +-#if BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_CUPS)) ++#if BUILDFLAG(IS_CHROMEOS) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_CUPS)) const base::Value::Dict* advanced_settings = job_settings.FindDict(kSettingAdvancedSettings); if (advanced_settings) { diff --git a/www/chromium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc b/www/chromium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc index db949c62110d..674d5002dc4d 100644 --- a/www/chromium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc @@ -1,9 +1,9 @@ ---- printing/sandbox/print_backend_sandbox_hook_linux.cc.orig 2022-02-28 16:54:41 UTC +--- printing/sandbox/print_backend_sandbox_hook_linux.cc.orig 2023-02-08 09:03:45 UTC +++ printing/sandbox/print_backend_sandbox_hook_linux.cc -@@ -9,21 +9,28 @@ - #include "base/files/file_util.h" +@@ -10,21 +10,28 @@ #include "base/path_service.h" #include "build/build_config.h" + #include "printing/buildflags/buildflags.h" +#if !BUILDFLAG(IS_BSD) #include "sandbox/linux/syscall_broker/broker_command.h" #include "sandbox/linux/syscall_broker/broker_file_permission.h" @@ -14,7 +14,7 @@ +#include "sandbox/policy/openbsd/sandbox_openbsd.h" +#endif - #if BUILDFLAG(IS_CHROMEOS) && defined(USE_CUPS) + #if BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(USE_CUPS) #include "printing/backend/cups_connection_pool.h" #endif @@ -29,7 +29,7 @@ namespace { sandbox::syscall_broker::BrokerCommandSet GetPrintBackendBrokerCommandSet() { -@@ -84,9 +91,11 @@ std::vector<BrokerFilePermission> GetPrintBackendFileP +@@ -85,9 +92,11 @@ std::vector<BrokerFilePermission> GetPrintBackendFileP } } // namespace @@ -38,10 +38,10 @@ bool PrintBackendPreSandboxHook( sandbox::policy::SandboxLinux::Options options) { +#if !BUILDFLAG(IS_BSD) - #if BUILDFLAG(IS_CHROMEOS) && defined(USE_CUPS) + #if BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(USE_CUPS) // Create the socket connections to the CUPS server before engaging the // sandbox, since new connections cannot be made after that. -@@ -100,6 +109,7 @@ bool PrintBackendPreSandboxHook( +@@ -101,6 +110,7 @@ bool PrintBackendPreSandboxHook( sandbox::policy::SandboxLinux::PreSandboxHook(), options); instance->EngageNamespaceSandboxIfPossible(); diff --git a/www/chromium/files/patch-remoting_host_chromoting__host.cc b/www/chromium/files/patch-remoting_host_chromoting__host.cc index 7316914b738b..0e22c9bf95ae 100644 --- a/www/chromium/files/patch-remoting_host_chromoting__host.cc +++ b/www/chromium/files/patch-remoting_host_chromoting__host.cc @@ -1,11 +1,11 @@ ---- remoting/host/chromoting_host.cc.orig 2023-01-11 09:17:16 UTC +--- remoting/host/chromoting_host.cc.orig 2023-02-08 09:03:45 UTC +++ remoting/host/chromoting_host.cc -@@ -125,7 +125,7 @@ void ChromotingHost::StartChromotingHostServices() { +@@ -130,7 +130,7 @@ void ChromotingHost::StartChromotingHostServices() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(!ipc_server_); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - ipc_server_ = std::make_unique< - named_mojo_ipc_server::NamedMojoIpcServer<mojom::ChromotingHostServices>>( - GetChromotingHostServicesServerName(), this, + named_mojo_ipc_server::EndpointOptions options; + options.server_name = GetChromotingHostServicesServerName(); + #if BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-remoting_host_chromoting__host__services__client.cc b/www/chromium/files/patch-remoting_host_chromoting__host__services__client.cc index 18c13a723b7c..acb6c45303c2 100644 --- a/www/chromium/files/patch-remoting_host_chromoting__host__services__client.cc +++ b/www/chromium/files/patch-remoting_host_chromoting__host__services__client.cc @@ -1,6 +1,6 @@ ---- remoting/host/chromoting_host_services_client.cc.orig 2022-02-28 16:54:41 UTC +--- remoting/host/chromoting_host_services_client.cc.orig 2023-02-08 09:03:45 UTC +++ remoting/host/chromoting_host_services_client.cc -@@ -28,7 +28,7 @@ bool g_initialized = false; +@@ -51,7 +51,7 @@ mojo::PendingRemote<mojom::ChromotingHostServices> Con } // namespace @@ -9,7 +9,7 @@ // static constexpr char -@@ -112,7 +112,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic +@@ -129,7 +129,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic if (session_services_remote_.is_bound()) { return true; } diff --git a/www/chromium/files/patch-remoting_host_ipc__constants.cc b/www/chromium/files/patch-remoting_host_ipc__constants.cc index 06dd5a9f2a17..157a0d647307 100644 --- a/www/chromium/files/patch-remoting_host_ipc__constants.cc +++ b/www/chromium/files/patch-remoting_host_ipc__constants.cc @@ -1,4 +1,4 @@ ---- remoting/host/ipc_constants.cc.orig 2023-01-11 09:17:16 UTC +--- remoting/host/ipc_constants.cc.orig 2023-02-08 09:03:45 UTC +++ remoting/host/ipc_constants.cc @@ -17,7 +17,7 @@ namespace remoting { @@ -9,7 +9,7 @@ #if !defined(NDEBUG) // Use a different IPC name for debug builds so that we can run the host -@@ -66,7 +66,7 @@ GetChromotingHostServicesServerName() { +@@ -68,7 +68,7 @@ GetChromotingHostServicesServerName() { static const base::NoDestructor<mojo::NamedPlatformChannel::ServerName> server_name( named_mojo_ipc_server::WorkingDirectoryIndependentServerNameFromUTF8( diff --git a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc index 92d506dcc707..d4263540611c 100644 --- a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc +++ b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc @@ -1,4 +1,4 @@ ---- remoting/host/me2me_desktop_environment.cc.orig 2023-01-11 09:17:16 UTC +--- remoting/host/me2me_desktop_environment.cc.orig 2023-02-08 09:03:45 UTC +++ remoting/host/me2me_desktop_environment.cc @@ -124,7 +124,7 @@ std::string Me2MeDesktopEnvironment::GetCapabilities() capabilities += protocol::kRemoteWebAuthnCapability; @@ -9,7 +9,16 @@ capabilities += " "; capabilities += protocol::kMultiStreamCapability; -@@ -180,7 +180,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( +@@ -161,7 +161,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( + // properly under Xvfb. + mutable_desktop_capture_options()->set_use_update_notifications(true); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Setting this option to false means that the capture differ wrapper will not + // be used when the X11 capturer is selected. This reduces the X11 capture + // time by a few milliseconds per frame and is safe because we can rely on +@@ -193,7 +193,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( // Otherwise, if the session is shared with the local user start monitoring // the local input and create the in-session UI. diff --git a/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc b/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc index 58f274d57c36..3375e977def2 100644 --- a/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc +++ b/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc @@ -1,7 +1,7 @@ ---- remoting/host/webauthn/remote_webauthn_extension_notifier.cc.orig 2022-06-17 14:20:10 UTC +--- remoting/host/webauthn/remote_webauthn_extension_notifier.cc.orig 2023-02-08 09:03:45 UTC +++ remoting/host/webauthn/remote_webauthn_extension_notifier.cc -@@ -23,7 +23,7 @@ - #include "base/threading/sequenced_task_runner_handle.h" +@@ -24,7 +24,7 @@ + #include "base/task/thread_pool.h" #include "build/build_config.h" -#if BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #include "base/strings/string_util.h" -@@ -68,14 +68,14 @@ static constexpr char kExtensionWakeupFileContent[] = +@@ -69,14 +69,14 @@ static constexpr char kExtensionWakeupFileContent[] = // Caller should check if the directory exists before writing files to it. A // directory only exists if the corresponding Chrome version is installed. std::vector<base::FilePath> GetRemoteStateChangeDirPaths() { diff --git a/www/chromium/files/patch-remoting_protocol_webrtc__video__stream.cc b/www/chromium/files/patch-remoting_protocol_webrtc__video__stream.cc index 328b0eccd555..6ab56635327e 100644 --- a/www/chromium/files/patch-remoting_protocol_webrtc__video__stream.cc +++ b/www/chromium/files/patch-remoting_protocol_webrtc__video__stream.cc @@ -1,6 +1,6 @@ ---- remoting/protocol/webrtc_video_stream.cc.orig 2022-11-30 08:12:58 UTC +--- remoting/protocol/webrtc_video_stream.cc.orig 2023-02-08 09:03:45 UTC +++ remoting/protocol/webrtc_video_stream.cc -@@ -219,7 +219,7 @@ WebrtcVideoStream::WebrtcVideoStream(const std::string +@@ -242,7 +242,7 @@ WebrtcVideoStream::WebrtcVideoStream(const std::string : stream_name_(stream_name), session_options_(session_options) { // TODO(joedow): Dig into the threading model on other platforms to see if they // can also be updated to run on a dedicated thread. diff --git a/www/chromium/files/patch-sandbox_linux_BUILD.gn b/www/chromium/files/patch-sandbox_linux_BUILD.gn index 6a4fd43ab003..ca345c979964 100644 --- a/www/chromium/files/patch-sandbox_linux_BUILD.gn +++ b/www/chromium/files/patch-sandbox_linux_BUILD.gn @@ -1,6 +1,6 @@ ---- sandbox/linux/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- sandbox/linux/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ sandbox/linux/BUILD.gn -@@ -12,12 +12,12 @@ if (is_android) { +@@ -12,11 +12,11 @@ if (is_android) { } declare_args() { @@ -10,18 +10,15 @@ - compile_credentials = is_linux || is_chromeos + compile_credentials = (is_linux || is_chromeos) && !is_bsd - # On Android, use plain GTest. -- use_base_test_suite = is_linux || is_chromeos -+ use_base_test_suite = (is_linux || is_chromeos) && !is_bsd - } +- compile_syscall_broker = is_linux || is_chromeos ++ compile_syscall_broker = (is_linux || is_chromeos) && !is_bsd - # We have two principal targets: sandbox and sandbox_linux_unittests -@@ -367,6 +367,39 @@ component("sandbox_services") { - sources += [ - "services/libc_interceptor.cc", + # On Android, use plain GTest. + use_base_test_suite = is_linux || is_chromeos +@@ -379,6 +379,17 @@ component("sandbox_services") { "services/libc_interceptor.h", -+ ] -+ } + ] + } + + if (is_bsd) { + sources -= [ @@ -31,28 +28,8 @@ + "services/syscall_wrappers.h", + "services/yama.cc", + "services/yama.h", -+ "syscall_broker/broker_channel.cc", -+ "syscall_broker/broker_channel.h", -+ "syscall_broker/broker_client.cc", -+ "syscall_broker/broker_client.h", -+ "syscall_broker/broker_command.cc", -+ "syscall_broker/broker_command.h", -+ "syscall_broker/broker_file_permission.cc", -+ "syscall_broker/broker_file_permission.h", -+ "syscall_broker/broker_host.cc", -+ "syscall_broker/broker_host.h", -+ "syscall_broker/broker_permission_list.cc", -+ "syscall_broker/broker_permission_list.h", -+ "syscall_broker/broker_process.cc", -+ "syscall_broker/broker_process.h", -+ "syscall_broker/broker_sandbox_config.cc", -+ "syscall_broker/broker_sandbox_config.h", -+ "syscall_broker/broker_simple_message.cc", -+ "syscall_broker/broker_simple_message.h", -+ "syscall_broker/remote_syscall_arg_handler.cc", -+ "syscall_broker/remote_syscall_arg_handler.h", -+ "syscall_broker/syscall_dispatcher.cc", -+ "syscall_broker/syscall_dispatcher.h", - ] - } ++ ] ++ } } + + source_set("sandbox_services_headers") { diff --git a/www/chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc b/www/chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc index ad30b2a4413e..ff9cd09f3768 100644 --- a/www/chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc +++ b/www/chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/freebsd/sandbox_freebsd.cc.orig 2022-09-02 10:45:05 UTC +--- sandbox/policy/freebsd/sandbox_freebsd.cc.orig 2023-02-08 09:03:45 UTC +++ sandbox/policy/freebsd/sandbox_freebsd.cc -@@ -0,0 +1,253 @@ +@@ -0,0 +1,241 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -60,11 +60,8 @@ +#include "crypto/nss_util.h" +#endif + -+#include "ui/gfx/x/connection.h" +#include "ui/gfx/font_util.h" + -+#include <X11/Xlib.h> -+ +#define MAXTOKENS 3 + +#define _UNVEIL_MAIN "/etc/chromium/unveil.main"; @@ -125,15 +122,6 @@ + crypto::EnsureNSSInit(); +#endif + -+ // cache the XErrorDB by forcing a read on it -+ { -+ auto* connection = x11::Connection::Get(); -+ auto* display = connection->GetXlibDisplay().display(); -+ -+ char buf[1]; -+ XGetErrorDatabaseText(display, "XProtoError", "0", "", buf, std::size(buf)); -+ } -+ + if (process_type.empty()) { + base::FilePath cache_directory, local_directory; + diff --git a/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc b/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc index 307217ed3ac3..61ea88e219f8 100644 --- a/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc +++ b/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2022-09-02 10:45:05 UTC +--- sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2023-02-08 09:03:45 UTC +++ sandbox/policy/openbsd/sandbox_openbsd.cc -@@ -0,0 +1,413 @@ +@@ -0,0 +1,401 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -63,11 +63,8 @@ + +#include "third_party/boringssl/src/include/openssl/crypto.h" + -+#include "ui/gfx/x/connection.h" +#include "ui/gfx/font_util.h" + -+#include <X11/Xlib.h> -+ +#define MAXTOKENS 3 + +#define _UNVEIL_MAIN "/etc/chromium/unveil.main"; @@ -133,15 +130,6 @@ + if (process_type.empty()) + CRYPTO_pre_sandbox_init(); + -+ // cache the XErrorDB by forcing a read on it -+ { -+ auto* connection = x11::Connection::Get(); -+ auto* display = connection->GetXlibDisplay().display(); -+ -+ char buf[1]; -+ XGetErrorDatabaseText(display, "XProtoError", "0", "", buf, std::size(buf)); -+ } -+ + if (process_type.empty()) { + base::FilePath cache_directory, local_directory; + diff --git a/www/chromium/files/patch-sandbox_policy_switches.cc b/www/chromium/files/patch-sandbox_policy_switches.cc index 21a7359df44c..e299b057c580 100644 --- a/www/chromium/files/patch-sandbox_policy_switches.cc +++ b/www/chromium/files/patch-sandbox_policy_switches.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/switches.cc.orig 2023-01-11 09:17:16 UTC +--- sandbox/policy/switches.cc.orig 2023-02-08 09:03:45 UTC +++ sandbox/policy/switches.cc -@@ -54,10 +54,10 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro +@@ -53,10 +53,10 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro const char kMirroringSandbox[] = "mirroring"; #endif // BUILDFLAG(IS_MAC) @@ -13,7 +13,7 @@ const char kHardwareVideoEncodingSandbox[] = "hardware_video_encoding"; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -104,7 +104,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f +@@ -103,7 +103,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f // Meant to be used as a browser-level switch for testing purposes only. const char kNoSandbox[] = "no-sandbox"; diff --git a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc index 86f216c72fe8..04fa36251753 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 2022-02-28 16:54:41 UTC +--- services/device/geolocation/location_arbitrator.cc.orig 2023-02-08 09:03:45 UTC +++ services/device/geolocation/location_arbitrator.cc -@@ -161,7 +161,7 @@ LocationArbitrator::NewNetworkLocationProvider( +@@ -158,7 +158,7 @@ LocationArbitrator::NewNetworkLocationProvider( std::unique_ptr<LocationProvider> LocationArbitrator::NewSystemLocationProvider() { diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index ce15483aff77..9a55ebe8b177 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-01-11 09:17:16 UTC +--- services/network/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ services/network/BUILD.gn -@@ -336,7 +336,6 @@ if (is_linux || is_chromeos) { +@@ -334,7 +334,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", diff --git a/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc b/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc new file mode 100644 index 000000000000..0169dca62131 --- /dev/null +++ b/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc @@ -0,0 +1,11 @@ +--- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2023-02-08 09:03:45 UTC ++++ services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc +@@ -37,7 +37,7 @@ + #include "third_party/perfetto/protos/perfetto/trace/track_event/process_descriptor.pbzero.h" + #include "third_party/perfetto/protos/perfetto/trace/track_event/thread_descriptor.pbzero.h" + +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) + #include "base/profiler/thread_delegate_posix.h" + #define INITIALIZE_THREAD_DELEGATE_POSIX 1 + #else // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_APPLE) diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index 59f8451c3f2d..5052b3d84392 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-01-11 09:17:16 UTC +--- third_party/angle/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ third_party/angle/BUILD.gn -@@ -276,7 +276,6 @@ config("extra_warnings") { +@@ -279,7 +279,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,7 +8,7 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -459,7 +458,7 @@ angle_static_library("angle_common") { +@@ -465,7 +464,7 @@ angle_static_library("angle_common") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -601,6 +600,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -607,6 +606,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] @@ -27,7 +27,7 @@ } if (angle_use_wayland && angle_has_build) { -@@ -1104,12 +1106,12 @@ if (angle_use_wayland) { +@@ -1092,12 +1094,12 @@ if (angle_use_wayland) { "wayland-client", "wayland-egl", ] diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp index 34cb96d10f1e..6af3b3e1bd07 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-01-11 09:17:16 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2023-02-08 09:03:45 UTC +++ third_party/angle/src/libANGLE/Display.cpp @@ -55,7 +55,7 @@ # include "libANGLE/renderer/gl/wgl/DisplayWGL.h" @@ -7,9 +7,9 @@ -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) # include "libANGLE/renderer/gl/egl/DisplayEGL.h" - # if defined(ANGLE_USE_GBM) - # include "libANGLE/renderer/gl/egl/gbm/DisplayGbm.h" -@@ -346,7 +346,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di + # if defined(ANGLE_USE_X11) + # include "libANGLE/renderer/gl/glx/DisplayGLX.h" +@@ -343,7 +343,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateDisplayCGLOrEAGL(state); break; @@ -18,7 +18,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -389,7 +389,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -384,7 +384,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) -@@ -440,7 +440,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -433,7 +433,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()) { -@@ -2042,7 +2042,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2038,7 +2038,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif 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 02f10cf6b491..a69114328eef 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-01-11 09:17:16 UTC +--- third_party/angle/util/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ third_party/angle/util/BUILD.gn -@@ -271,7 +271,7 @@ foreach(is_shared_library, +@@ -292,7 +292,7 @@ foreach(is_shared_library, ] libs = [] 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 6c8312d4b3aa..fa6f2c6c06e2 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-01-11 09:17:16 UTC +--- third_party/blink/public/platform/platform.h.orig 2023-02-08 09:03:45 UTC +++ third_party/blink/public/platform/platform.h -@@ -351,7 +351,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -357,7 +357,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 a0a2737ec752..92113d031a7f 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-11-30 08:12:58 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-02-08 09:03:45 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -408,7 +408,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { @@ -9,7 +9,7 @@ if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3278,7 +3278,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3296,7 +3296,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs renderer_preferences_.use_subpixel_positioning); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc index 2a0126d5ae15..dce53a1d81ac 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2023-01-11 09:17:16 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2023-02-08 09:03:45 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6449,7 +6449,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6451,7 +6451,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { MoveCaretStaysHorizontallyAlignedWhenMoved #endif // TODO(crbug.com/1317375): Build these tests on all platforms. @@ -9,7 +9,7 @@ TEST_F(WebFrameTest, MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved) { RegisterMockedHttpURLLoad("move_caret.html"); -@@ -6846,7 +6846,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc +@@ -6848,7 +6848,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) { RunTest("composited_selection_bounds_large_selection_noscroll.html"); } diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc index f0fcaf8ed7ec..41882b2dac73 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2023-01-11 09:17:16 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2023-02-08 09:03:45 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -113,7 +113,7 @@ namespace blink { +@@ -114,7 +114,7 @@ namespace blink { namespace { 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 f45e5c4dcc2b..8e4808535174 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-01-11 09:17:16 UTC +--- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2023-02-08 09:03:45 UTC +++ third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc -@@ -114,7 +114,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount +@@ -169,7 +169,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 a97997558415..64b4ccc704e6 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-01-11 09:17:16 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2023-02-08 09:03:45 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6155,7 +6155,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6161,7 +6161,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 new file mode 100644 index 000000000000..09ca67ab34b5 --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc @@ -0,0 +1,11 @@ +--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2023-02-08 09:03:45 UTC ++++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc +@@ -699,7 +699,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( + // TODO(crbug.com/1309194): GPU-GPU copy on linux platform requires interop + // supported. According to the bug, this change will be a long time task. + // So disable GPU-GPU copy path on linux platform. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + unaccelerated_image = image->MakeUnaccelerated(); + image = unaccelerated_image.get(); + #endif // BUILDFLAG(IS_LINUX) 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 723690079454..f42348ad4045 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-01-11 09:17:16 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -1898,7 +1898,7 @@ static_library("test_support") { +@@ -1917,7 +1917,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 3b8605667077..0dcfbc15fb60 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 2022-11-30 08:12:58 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2023-02-08 09:03:45 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 -@@ -139,7 +139,7 @@ FontCache::~FontCache() { +@@ -118,7 +118,7 @@ FontCache::~FontCache() = default; FontPlatformData* FontCache::SystemFontPlatformData( const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc index 3f922ca56ce5..3e40fa2407ad 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2022-08-31 12:19:35 UTC +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2023-02-08 09:03:45 UTC +++ third_party/blink/renderer/platform/fonts/font_description.cc @@ -39,7 +39,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -270,7 +270,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -274,7 +274,7 @@ FontCacheKey FontDescription::CacheKey( static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc index 3011e88ce769..a0c76030a290 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig 2022-11-30 08:12:58 UTC +--- third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig 2023-02-08 09:03:45 UTC +++ third_party/blink/renderer/platform/fonts/font_platform_data.cc @@ -48,7 +48,7 @@ namespace blink { @@ -9,7 +9,7 @@ // Getting the system font render style takes a significant amount of time on // Linux because looking up fonts using fontconfig can be very slow. We fetch // the render style for each font family and text size, while it's very -@@ -123,7 +123,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t +@@ -127,7 +127,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t style_ = WebFontRenderStyle::GetDefault(); #if !BUILDFLAG(IS_WIN) WebFontRenderStyle system_style; diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc index 25cdece52e8b..e92d6d2f592f 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2022-10-24 13:33:33 UTC +--- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2023-02-08 09:03:45 UTC +++ third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc -@@ -174,12 +174,12 @@ SupportedFormats GetSupportedFormatsInternal( +@@ -193,12 +193,12 @@ SupportedFormats GetSupportedFormatsInternal( supported_formats.scalability_modes.push_back(profile.scalability_modes); supported_formats.sdp_formats.push_back(std::move(*format)); @@ -8,7 +8,7 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #if BUILDFLAG(IS_WIN) const bool kShouldAddH264Cbp = - media::IsMediaFoundationH264CbpEncodingEnabled() && + base::FeatureList::IsEnabled(kMediaFoundationH264CbpEncoding) && profile.profile == media::VideoCodecProfile::H264PROFILE_BASELINE; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 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 e6c2af52defa..4dac8d1032ea 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-01-11 09:17:16 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-02-08 09:03:45 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1255,7 +1255,7 @@ +@@ -1258,7 +1258,7 @@ depends_on: ["FileSystemAccessLocal"], status: {"Android": "test", "default": "stable"}, origin_trial_feature_name: "FileHandling", @@ -9,7 +9,7 @@ base_feature: "FileHandlingAPI", }, { -@@ -2802,7 +2802,7 @@ +@@ -2867,7 +2867,7 @@ { name: "UnrestrictedSharedArrayBuffer", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -18,7 +18,7 @@ }, { name: "URLPatternCompareComponent", -@@ -2822,7 +2822,7 @@ +@@ -2887,7 +2887,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. @@ -27,7 +27,7 @@ base_feature: "ReduceUserAgent", }, { -@@ -2984,12 +2984,12 @@ +@@ -3049,12 +3049,12 @@ name: "WebAppUrlHandling", status: "experimental", origin_trial_feature_name: "WebAppUrlHandling", diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc index 12cba2eaeffb..3e5fc31ebc56 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2022-03-25 21:59:56 UTC +--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2023-02-08 09:03:45 UTC +++ third_party/blink/renderer/platform/wtf/stack_util.cc @@ -18,6 +18,11 @@ extern "C" void* __libc_stack_end; // NOLINT @@ -18,7 +18,7 @@ return 512 * 1024; +#elif BUILDFLAG(IS_OPENBSD) + return 512 * 1024; - #elif BUILDFLAG(IS_MAC) + #elif BUILDFLAG(IS_APPLE) // pthread_get_stacksize_np() returns too low a value for the main thread on // OSX 10.9, @@ -147,6 +154,13 @@ void* GetStackStart() { diff --git a/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni b/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni index 46fe2b5a0632..2c64af9355bc 100644 --- a/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni +++ b/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni @@ -1,13 +1,13 @@ ---- third_party/boringssl/BUILD.generated.gni.orig 2022-07-22 17:30:31 UTC +--- third_party/boringssl/BUILD.generated.gni.orig 2023-02-08 09:03:45 UTC +++ third_party/boringssl/BUILD.generated.gni -@@ -78,6 +78,7 @@ crypto_sources = [ - "src/crypto/cpu_aarch64_apple.c", +@@ -77,6 +77,7 @@ crypto_sources = [ + "src/crypto/cpu_aarch64_freebsd.c", "src/crypto/cpu_aarch64_fuchsia.c", "src/crypto/cpu_aarch64_linux.c", + "src/crypto/cpu_aarch64_openbsd.c", "src/crypto/cpu_aarch64_win.c", "src/crypto/cpu_arm.c", - "src/crypto/cpu_arm_linux.c", + "src/crypto/cpu_arm_freebsd.c", @@ -184,6 +185,7 @@ crypto_sources = [ "src/crypto/rand_extra/deterministic.c", "src/crypto/rand_extra/forkunsafe.c", diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl new file mode 100644 index 000000000000..37888c78b335 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl @@ -0,0 +1,18 @@ +--- third_party/boringssl/src/crypto/chacha/asm/chacha-x86_64.pl.orig 2023-02-08 09:03:45 UTC ++++ third_party/boringssl/src/crypto/chacha/asm/chacha-x86_64.pl +@@ -78,6 +78,7 @@ $code.=<<___; + + .extern OPENSSL_ia32cap_P + ++.rodata + .align 64 + .Lzero: + .long 0,0,0,0 +@@ -107,6 +108,7 @@ $code.=<<___; + .Lsixteen: + .long 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16 + .asciz "ChaCha20 for x86_64, CRYPTOGAMS by <appro\@openssl.org>" ++.previous + ___ + + sub AUTOLOAD() # thunk [simplified] 32-bit style perlasm diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl new file mode 100644 index 000000000000..f01b0e2efcad --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl @@ -0,0 +1,19 @@ +--- third_party/boringssl/src/crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl.orig 2023-02-08 09:03:45 UTC ++++ third_party/boringssl/src/crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl +@@ -32,7 +32,7 @@ open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\""; + *STDOUT=*OUT; + + $code.=<<___; +-.data ++.rodata + + .align 16 + one: +@@ -66,6 +66,7 @@ con3: + .byte -1,-1,-1,-1,-1,-1,-1,-1,4,5,6,7,4,5,6,7 + and_mask: + .long 0,0xffffffff, 0xffffffff, 0xffffffff ++.previous + ___ + + $code.=<<___; diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl new file mode 100644 index 000000000000..3a33d4acee04 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl @@ -0,0 +1,18 @@ +--- third_party/boringssl/src/crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl.orig 2023-02-08 09:03:45 UTC ++++ third_party/boringssl/src/crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl +@@ -42,6 +42,7 @@ $code.=<<___; + + chacha20_poly1305_constants: + ++.rodata + .align 64 + .Lchacha20_consts: + .byte 'e','x','p','a','n','d',' ','3','2','-','b','y','t','e',' ','k' +@@ -79,6 +80,7 @@ chacha20_poly1305_constants: + .byte 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00 + .byte 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00 + .byte 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff ++.previous + ___ + + my ($oup,$inp,$inl,$adp,$keyp,$itr1,$itr2,$adl)=("%rdi","%rsi","%rbx","%rcx","%r9","%rcx","%r8","%r8"); 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 new file mode 100644 index 000000000000..7e1eb35f8e46 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl @@ -0,0 +1,18 @@ +--- third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl.orig 2023-02-08 09:03:45 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl +@@ -4727,6 +4727,7 @@ ___ + } + + $code.=<<___; ++.rodata + .align 64 + .Lbswap_mask: + .byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0 +@@ -4749,6 +4750,7 @@ $code.=<<___; + + .asciz "AES for Intel AES-NI, CRYPTOGAMS by <appro\@openssl.org>" + .align 64 ++.previous + ___ + + # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame, diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl new file mode 100644 index 000000000000..fc1c0e9b8d8f --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl @@ -0,0 +1,10 @@ +--- third_party/boringssl/src/crypto/fipsmodule/aes/asm/vpaes-x86_64.pl.orig 2023-02-08 09:03:45 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/aes/asm/vpaes-x86_64.pl +@@ -1288,6 +1288,7 @@ _vpaes_preheat: + ## ## + ######################################################## + .type _vpaes_consts,\@object ++.rodata + .align 64 + _vpaes_consts: + .Lk_inv: # inv, inva diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl new file mode 100644 index 000000000000..6ad70435ad1e --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl @@ -0,0 +1,16 @@ +--- third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont5.pl.orig 2023-02-08 09:03:45 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont5.pl +@@ -3576,11 +3576,13 @@ $code.=<<___; + ___ + } + $code.=<<___; ++.rodata + .align 64 + .Linc: + .long 0,0, 1,1 + .long 2,2, 2,2 + .asciz "Montgomery Multiplication with scatter/gather for x86_64, CRYPTOGAMS by <appro\@openssl.org>" ++.previous + ___ + + # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame, diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl new file mode 100644 index 000000000000..864bc26e89ce --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl @@ -0,0 +1,18 @@ +--- third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl.orig 2023-02-08 09:03:45 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl +@@ -62,6 +62,7 @@ $code.=<<___; + .extern OPENSSL_ia32cap_P + + # The polynomial ++.rodata + .align 64 + .Lpoly: + .quad 0xffffffffffffffff, 0x00000000ffffffff, 0x0000000000000000, 0xffffffff00000001 +@@ -80,6 +81,7 @@ $code.=<<___; + .quad 0xf3b9cac2fc632551, 0xbce6faada7179e84, 0xffffffffffffffff, 0xffffffff00000000 + .LordK: + .quad 0xccd1c8aaee00bc4f ++.previous + ___ + + { diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl new file mode 100644 index 000000000000..7f1f8bd71cc6 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl @@ -0,0 +1,18 @@ +--- third_party/boringssl/src/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl.orig 2023-02-08 09:03:45 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl +@@ -982,6 +982,7 @@ $code.=<<___; + ___ + + $code.=<<___; ++.rodata + .align 64 + .Lbswap_mask: + .byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0 +@@ -995,6 +996,7 @@ $code.=<<___; + .byte 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + .asciz "AES-NI GCM module for x86_64, CRYPTOGAMS by <appro\@openssl.org>" + .align 64 ++.previous + ___ + if ($win64) { + $rec="%rcx"; diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl new file mode 100644 index 000000000000..706eb4260f11 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl @@ -0,0 +1,18 @@ +--- third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl.orig 2023-02-08 09:03:45 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl +@@ -333,6 +333,7 @@ $code .= <<____; + .cfi_endproc + .size gcm_ghash_ssse3,.-gcm_ghash_ssse3 + ++.rodata + .align 16 + # .Lreverse_bytes is a permutation which, if applied with pshufb, reverses the + # bytes in an XMM register. +@@ -341,6 +342,7 @@ $code .= <<____; + # .Llow4_mask is an XMM mask which selects the low four bits of each byte. + .Llow4_mask: + .quad 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f ++.previous + ____ + + if ($win64) { diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl new file mode 100644 index 000000000000..ef5cf6866b4c --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl @@ -0,0 +1,18 @@ +--- third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-x86_64.pl.orig 2023-02-08 09:03:45 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-x86_64.pl +@@ -1275,6 +1275,7 @@ ___ + } + + $code.=<<___; ++.rodata + .align 64 + .Lbswap_mask: + .byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0 +@@ -1286,6 +1287,7 @@ $code.=<<___; + + .asciz "GHASH for x86_64, CRYPTOGAMS by <appro\@openssl.org>" + .align 64 ++.previous + ___ + + if ($win64) { diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86__64.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86__64.pl new file mode 100644 index 000000000000..1ac341d67991 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86__64.pl @@ -0,0 +1,18 @@ +--- third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha1-x86_64.pl.orig 2023-02-08 09:03:45 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha1-x86_64.pl +@@ -1815,6 +1815,7 @@ ___ + } + } + $code.=<<___; ++.rodata + .align 64 + K_XX_XX: + .long 0x5a827999,0x5a827999,0x5a827999,0x5a827999 # K_00_19 +@@ -1833,6 +1834,7 @@ ___ + $code.=<<___; + .asciz "SHA1 block transform for x86_64, CRYPTOGAMS by <appro\@openssl.org>" + .align 64 ++.previous + ___ + + # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame, diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86__64.pl b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86__64.pl new file mode 100644 index 000000000000..28993e17eb18 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86__64.pl @@ -0,0 +1,30 @@ +--- third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha512-x86_64.pl.orig 2023-02-08 09:03:45 UTC ++++ third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha512-x86_64.pl +@@ -404,6 +404,7 @@ ___ + + if ($SZ==4) { + $code.=<<___; ++.rodata + .align 64 + .type $TABLE,\@object + $TABLE: +@@ -447,9 +448,11 @@ $TABLE: + .long 0xffffffff,0xffffffff,0x03020100,0x0b0a0908 + .long 0xffffffff,0xffffffff,0x03020100,0x0b0a0908 + .asciz "SHA256 block transform for x86_64, CRYPTOGAMS by <appro\@openssl.org>" ++.previous + ___ + } else { + $code.=<<___; ++.rodata + .align 64 + .type $TABLE,\@object + $TABLE: +@@ -537,6 +540,7 @@ $TABLE: + .quad 0x0001020304050607,0x08090a0b0c0d0e0f + .quad 0x0001020304050607,0x08090a0b0c0d0e0f + .asciz "SHA512 block transform for x86_64, CRYPTOGAMS by <appro\@openssl.org>" ++.previous + ___ + } + 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 new file mode 100644 index 000000000000..52f9880d98c9 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py @@ -0,0 +1,34 @@ +--- third_party/boringssl/src/util/generate_build_files.py.orig 2023-02-08 09:03:45 UTC ++++ third_party/boringssl/src/util/generate_build_files.py +@@ -863,10 +863,10 @@ def main(platforms): + ] + + # Generate err_data.c +- with open('err_data.c', 'w+') as err_data: +- subprocess.check_call(['go', 'run', 'err_data_generate.go'], +- cwd=os.path.join('src', 'crypto', 'err'), +- stdout=err_data) ++# with open('err_data.c', 'w+') as err_data: ++# subprocess.check_call(['go', 'run', 'err_data_generate.go'], ++# cwd=os.path.join('src', 'crypto', 'err'), ++# stdout=err_data) + crypto_c_files.append('err_data.c') + crypto_c_files.sort() + +@@ -879,11 +879,11 @@ def main(platforms): + crypto_test_files = [] + if EMBED_TEST_DATA: + # Generate crypto_test_data.cc +- with open('crypto_test_data.cc', 'w+') as out: +- subprocess.check_call( +- ['go', 'run', 'util/embed_test_data.go'] + cmake['CRYPTO_TEST_DATA'], +- cwd='src', +- stdout=out) ++# with open('crypto_test_data.cc', 'w+') as out: ++# subprocess.check_call( ++# ['go', 'run', 'util/embed_test_data.go'] + cmake['CRYPTO_TEST_DATA'], ++# cwd='src', ++# stdout=out) + crypto_test_files += ['crypto_test_data.cc'] + + crypto_test_files += FindCFiles(os.path.join('src', 'crypto'), OnlyTests) diff --git a/www/chromium/files/patch-third__party_distributed__point__functions_BUILD.gn b/www/chromium/files/patch-third__party_distributed__point__functions_BUILD.gn new file mode 100644 index 000000000000..f05a3a9018ed --- /dev/null +++ b/www/chromium/files/patch-third__party_distributed__point__functions_BUILD.gn @@ -0,0 +1,12 @@ +--- third_party/distributed_point_functions/BUILD.gn.orig 2023-02-08 09:03:45 UTC ++++ third_party/distributed_point_functions/BUILD.gn +@@ -61,6 +61,9 @@ source_set("distributed_point_functions") { + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + ++ # XXX clang13 crashes with optimizations ++ configs += [ "//build/config/compiler:no_optimize" ] ++ + public_configs = [ ":distributed_point_functions_includes" ] + } + diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm index 38aacd9d0532..0a929c9362df 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm +++ b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm.orig 2022-07-22 17:30:31 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm.orig 2023-02-08 09:03:45 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm -@@ -0,0 +1,722 @@ +@@ -0,0 +1,731 @@ +; Automatically generated by configure - do not modify! +%define ARCH_AARCH64 0 +%define ARCH_ALPHA 0 @@ -44,6 +44,7 @@ +%define HAVE_POWER8 0 +%define HAVE_PPC4XX 0 +%define HAVE_VSX 0 ++%define HAVE_RVV 0 +%define HAVE_AESNI 1 +%define HAVE_AMD3DNOW 1 +%define HAVE_AMD3DNOWEXT 1 @@ -92,6 +93,7 @@ +%define HAVE_POWER8_EXTERNAL 0 +%define HAVE_PPC4XX_EXTERNAL 0 +%define HAVE_VSX_EXTERNAL 0 ++%define HAVE_RVV_EXTERNAL 0 +%define HAVE_AESNI_EXTERNAL 1 +%define HAVE_AMD3DNOW_EXTERNAL 1 +%define HAVE_AMD3DNOWEXT_EXTERNAL 1 @@ -140,6 +142,7 @@ +%define HAVE_POWER8_INLINE 0 +%define HAVE_PPC4XX_INLINE 0 +%define HAVE_VSX_INLINE 0 ++%define HAVE_RVV_INLINE 0 +%define HAVE_AESNI_INLINE 1 +%define HAVE_AMD3DNOW_INLINE 1 +%define HAVE_AMD3DNOWEXT_INLINE 1 @@ -178,6 +181,7 @@ +%define HAVE_FAST_64BIT 1 +%define HAVE_FAST_CLZ 1 +%define HAVE_FAST_CMOV 1 ++%define HAVE_FAST_FLOAT16 0 +%define HAVE_LOCAL_ALIGNED 1 +%define HAVE_SIMD_ALIGN_16 1 +%define HAVE_SIMD_ALIGN_32 1 @@ -281,6 +285,7 @@ +%define HAVE_FCNTL 1 +%define HAVE_GETADDRINFO 0 +%define HAVE_GETAUXVAL 0 ++%define HAVE_GETENV 1 +%define HAVE_GETHRTIME 0 +%define HAVE_GETOPT 1 +%define HAVE_GETMODULEHANDLE 0 @@ -309,6 +314,7 @@ +%define HAVE_NANOSLEEP 1 +%define HAVE_PEEKNAMEDPIPE 0 +%define HAVE_POSIX_MEMALIGN 1 ++%define HAVE_PRCTL 0 +%define HAVE_PTHREAD_CANCEL 1 +%define HAVE_SCHED_GETAFFINITY 0 +%define HAVE_SECITEMIMPORT 0 @@ -354,6 +360,8 @@ +%define HAVE_VFP_ARGS 0 +%define HAVE_XFORM_ASM 0 +%define HAVE_XMM_CLOBBERS 1 ++%define HAVE_DPI_AWARENESS_CONTEXT 0 ++%define HAVE_IDXGIOUTPUT5 0 +%define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +%define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0 +%define HAVE_KCMVIDEOCODECTYPE_VP9 0 @@ -549,6 +557,7 @@ +%define CONFIG_CUDA_SDK 0 +%define CONFIG_LIBNPP 0 +%define CONFIG_LIBMFX 0 ++%define CONFIG_LIBVPL 0 +%define CONFIG_MMAL 0 +%define CONFIG_OMX 0 +%define CONFIG_OPENCL 0 @@ -599,7 +608,7 @@ +%define CONFIG_FAST_UNALIGNED 1 +%define CONFIG_FFT 1 +%define CONFIG_LSP 0 -+%define CONFIG_MDCT 1 ++%define CONFIG_MDCT 0 +%define CONFIG_PIXELUTILS 0 +%define CONFIG_NETWORK 0 +%define CONFIG_RDFT 1 @@ -652,7 +661,6 @@ +%define CONFIG_FAANDCT 0 +%define CONFIG_FAANIDCT 0 +%define CONFIG_FDCTDSP 0 -+%define CONFIG_FLACDSP 1 +%define CONFIG_FMTCONVERT 0 +%define CONFIG_FRAME_THREAD_ENCODER 0 +%define CONFIG_G722DSP 0 @@ -671,7 +679,6 @@ +%define CONFIG_HUFFYUVENCDSP 0 +%define CONFIG_IDCTDSP 0 +%define CONFIG_IIRFILTER 0 -+%define CONFIG_MDCT15 1 +%define CONFIG_INFLATE_WRAPPER 0 +%define CONFIG_INTRAX8 0 +%define CONFIG_ISO_MEDIA 1 @@ -693,6 +700,8 @@ +%define CONFIG_MPEGVIDEO 0 +%define CONFIG_MPEGVIDEODEC 0 +%define CONFIG_MPEGVIDEOENC 0 ++%define CONFIG_MSMPEG4DEC 0 ++%define CONFIG_MSMPEG4ENC 0 +%define CONFIG_MSS34DSP 0 +%define CONFIG_PIXBLOCKDSP 0 +%define CONFIG_QPELDSP 0 diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h index 7e329a6e0610..d481ebbe2171 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h +++ b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h @@ -1,10 +1,10 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h.orig 2022-07-22 17:30:31 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h.orig 2023-02-08 09:03:45 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h -@@ -0,0 +1,739 @@ +@@ -0,0 +1,748 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_H +#define FFMPEG_CONFIG_H -+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/sandersd/src/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" " -- elide long configuration string from binary */ ++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/tguilbert/Code/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --arch=x86_64 --target-os=openbsd --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +#define FFMPEG_LICENSE "LGPL version 2.1 or later" +#define CONFIG_THIS_YEAR 2022 +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -60,6 +60,7 @@ +#define HAVE_POWER8 0 +#define HAVE_PPC4XX 0 +#define HAVE_VSX 0 ++#define HAVE_RVV 0 +#define HAVE_AESNI 1 +#define HAVE_AMD3DNOW 1 +#define HAVE_AMD3DNOWEXT 1 @@ -108,6 +109,7 @@ +#define HAVE_POWER8_EXTERNAL 0 +#define HAVE_PPC4XX_EXTERNAL 0 +#define HAVE_VSX_EXTERNAL 0 ++#define HAVE_RVV_EXTERNAL 0 +#define HAVE_AESNI_EXTERNAL 1 +#define HAVE_AMD3DNOW_EXTERNAL 1 +#define HAVE_AMD3DNOWEXT_EXTERNAL 1 @@ -156,6 +158,7 @@ +#define HAVE_POWER8_INLINE 0 +#define HAVE_PPC4XX_INLINE 0 +#define HAVE_VSX_INLINE 0 ++#define HAVE_RVV_INLINE 0 +#define HAVE_AESNI_INLINE 1 +#define HAVE_AMD3DNOW_INLINE 1 +#define HAVE_AMD3DNOWEXT_INLINE 1 @@ -194,6 +197,7 @@ +#define HAVE_FAST_64BIT 1 +#define HAVE_FAST_CLZ 1 +#define HAVE_FAST_CMOV 1 ++#define HAVE_FAST_FLOAT16 0 +#define HAVE_LOCAL_ALIGNED 1 +#define HAVE_SIMD_ALIGN_16 1 +#define HAVE_SIMD_ALIGN_32 1 @@ -297,6 +301,7 @@ +#define HAVE_FCNTL 1 +#define HAVE_GETADDRINFO 0 +#define HAVE_GETAUXVAL 0 ++#define HAVE_GETENV 1 +#define HAVE_GETHRTIME 0 +#define HAVE_GETOPT 1 +#define HAVE_GETMODULEHANDLE 0 @@ -325,6 +330,7 @@ +#define HAVE_NANOSLEEP 1 +#define HAVE_PEEKNAMEDPIPE 0 +#define HAVE_POSIX_MEMALIGN 1 ++#define HAVE_PRCTL 0 /* #define HAVE_PRCTL 1 -- forced to 0 for Fuchsia */ +#define HAVE_PTHREAD_CANCEL 1 +#define HAVE_SCHED_GETAFFINITY 0 +#define HAVE_SECITEMIMPORT 0 @@ -370,6 +376,8 @@ +#define HAVE_VFP_ARGS 0 +#define HAVE_XFORM_ASM 0 +#define HAVE_XMM_CLOBBERS 1 ++#define HAVE_DPI_AWARENESS_CONTEXT 0 ++#define HAVE_IDXGIOUTPUT5 0 +#define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0 +#define HAVE_KCMVIDEOCODECTYPE_VP9 0 @@ -565,6 +573,7 @@ +#define CONFIG_CUDA_SDK 0 +#define CONFIG_LIBNPP 0 +#define CONFIG_LIBMFX 0 ++#define CONFIG_LIBVPL 0 +#define CONFIG_MMAL 0 +#define CONFIG_OMX 0 +#define CONFIG_OPENCL 0 @@ -615,7 +624,7 @@ +#define CONFIG_FAST_UNALIGNED 1 +#define CONFIG_FFT 1 +#define CONFIG_LSP 0 -+#define CONFIG_MDCT 1 ++#define CONFIG_MDCT 0 +#define CONFIG_PIXELUTILS 0 +#define CONFIG_NETWORK 0 +#define CONFIG_RDFT 1 @@ -668,7 +677,6 @@ +#define CONFIG_FAANDCT 0 +#define CONFIG_FAANIDCT 0 +#define CONFIG_FDCTDSP 0 -+#define CONFIG_FLACDSP 1 +#define CONFIG_FMTCONVERT 0 +#define CONFIG_FRAME_THREAD_ENCODER 0 +#define CONFIG_G722DSP 0 @@ -687,7 +695,6 @@ +#define CONFIG_HUFFYUVENCDSP 0 +#define CONFIG_IDCTDSP 0 +#define CONFIG_IIRFILTER 0 -+#define CONFIG_MDCT15 1 +#define CONFIG_INFLATE_WRAPPER 0 +#define CONFIG_INTRAX8 0 +#define CONFIG_ISO_MEDIA 1 @@ -709,6 +716,8 @@ +#define CONFIG_MPEGVIDEO 0 +#define CONFIG_MPEGVIDEODEC 0 +#define CONFIG_MPEGVIDEOENC 0 ++#define CONFIG_MSMPEG4DEC 0 ++#define CONFIG_MSMPEG4ENC 0 +#define CONFIG_MSS34DSP 0 +#define CONFIG_PIXBLOCKDSP 0 +#define CONFIG_QPELDSP 0 diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config__components.h b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config__components.h index 5530e23d31e4..706b7f04e170 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config__components.h +++ b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config__components.h @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config_components.h.orig 2022-07-22 17:30:31 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config_components.h.orig 2023-02-08 09:03:45 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config_components.h -@@ -0,0 +1,2083 @@ +@@ -0,0 +1,2125 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_COMPONENTS_H +#define FFMPEG_CONFIG_COMPONENTS_H @@ -11,6 +11,7 @@ +#define CONFIG_CHOMP_BSF 0 +#define CONFIG_DUMP_EXTRADATA_BSF 0 +#define CONFIG_DCA_CORE_BSF 0 ++#define CONFIG_DTS2PTS_BSF 0 +#define CONFIG_DV_ERROR_MARKER_BSF 0 +#define CONFIG_EAC3_CORE_BSF 0 +#define CONFIG_EXTRACT_EXTRADATA_BSF 0 @@ -165,6 +166,7 @@ +#define CONFIG_M101_DECODER 0 +#define CONFIG_MAGICYUV_DECODER 0 +#define CONFIG_MDEC_DECODER 0 ++#define CONFIG_MEDIA100_DECODER 0 +#define CONFIG_MIMIC_DECODER 0 +#define CONFIG_MJPEG_DECODER 0 +#define CONFIG_MJPEGB_DECODER 0 @@ -214,6 +216,7 @@ +#define CONFIG_PGM_DECODER 0 +#define CONFIG_PGMYUV_DECODER 0 +#define CONFIG_PGX_DECODER 0 ++#define CONFIG_PHM_DECODER 0 +#define CONFIG_PHOTOCD_DECODER 0 +#define CONFIG_PICTOR_DECODER 0 +#define CONFIG_PIXLET_DECODER 0 @@ -224,6 +227,7 @@ +#define CONFIG_PSD_DECODER 0 +#define CONFIG_PTX_DECODER 0 +#define CONFIG_QDRAW_DECODER 0 ++#define CONFIG_QOI_DECODER 0 +#define CONFIG_QPEG_DECODER 0 +#define CONFIG_QTRLE_DECODER 0 +#define CONFIG_R10K_DECODER 0 @@ -305,6 +309,8 @@ +#define CONFIG_VP9_RKMPP_DECODER 0 +#define CONFIG_VP9_V4L2M2M_DECODER 0 +#define CONFIG_VQA_DECODER 0 ++#define CONFIG_VQC_DECODER 0 ++#define CONFIG_WBMP_DECODER 0 +#define CONFIG_WEBP_DECODER 0 +#define CONFIG_WCMV_DECODER 0 +#define CONFIG_WRAPPED_AVFRAME_DECODER 0 @@ -339,6 +345,7 @@ +#define CONFIG_ALS_DECODER 0 +#define CONFIG_AMRNB_DECODER 0 +#define CONFIG_AMRWB_DECODER 0 ++#define CONFIG_APAC_DECODER 0 +#define CONFIG_APE_DECODER 0 +#define CONFIG_APTX_DECODER 0 +#define CONFIG_APTX_HD_DECODER 0 @@ -351,6 +358,7 @@ +#define CONFIG_BINKAUDIO_DCT_DECODER 0 +#define CONFIG_BINKAUDIO_RDFT_DECODER 0 +#define CONFIG_BMV_AUDIO_DECODER 0 ++#define CONFIG_BONK_DECODER 0 +#define CONFIG_COOK_DECODER 0 +#define CONFIG_DCA_DECODER 0 +#define CONFIG_DFPWM_DECODER 0 @@ -367,12 +375,14 @@ +#define CONFIG_FASTAUDIO_DECODER 0 +#define CONFIG_FFWAVESYNTH_DECODER 0 +#define CONFIG_FLAC_DECODER 1 ++#define CONFIG_FTR_DECODER 0 +#define CONFIG_G723_1_DECODER 0 +#define CONFIG_G729_DECODER 0 +#define CONFIG_GSM_DECODER 0 +#define CONFIG_GSM_MS_DECODER 0 +#define CONFIG_HCA_DECODER 0 +#define CONFIG_HCOM_DECODER 0 ++#define CONFIG_HDR_DECODER 0 +#define CONFIG_IAC_DECODER 0 +#define CONFIG_ILBC_DECODER 0 +#define CONFIG_IMC_DECODER 0 @@ -380,6 +390,7 @@ +#define CONFIG_MACE3_DECODER 0 +#define CONFIG_MACE6_DECODER 0 +#define CONFIG_METASOUND_DECODER 0 ++#define CONFIG_MISC4_DECODER 0 +#define CONFIG_MLP_DECODER 0 +#define CONFIG_MP1_DECODER 0 +#define CONFIG_MP1FLOAT_DECODER 0 @@ -631,6 +642,7 @@ +#define CONFIG_H261_ENCODER 0 +#define CONFIG_H263_ENCODER 0 +#define CONFIG_H263P_ENCODER 0 ++#define CONFIG_H264_MEDIACODEC_ENCODER 0 +#define CONFIG_HAP_ENCODER 0 +#define CONFIG_HUFFYUV_ENCODER 0 +#define CONFIG_JPEG2000_ENCODER 0 @@ -650,11 +662,13 @@ +#define CONFIG_PFM_ENCODER 0 +#define CONFIG_PGM_ENCODER 0 +#define CONFIG_PGMYUV_ENCODER 0 ++#define CONFIG_PHM_ENCODER 0 +#define CONFIG_PNG_ENCODER 0 +#define CONFIG_PPM_ENCODER 0 +#define CONFIG_PRORES_ENCODER 0 +#define CONFIG_PRORES_AW_ENCODER 0 +#define CONFIG_PRORES_KS_ENCODER 0 ++#define CONFIG_QOI_ENCODER 0 +#define CONFIG_QTRLE_ENCODER 0 +#define CONFIG_R10K_ENCODER 0 +#define CONFIG_R210_ENCODER 0 @@ -679,6 +693,7 @@ +#define CONFIG_V410_ENCODER 0 +#define CONFIG_VBN_ENCODER 0 +#define CONFIG_VC2_ENCODER 0 ++#define CONFIG_WBMP_ENCODER 0 +#define CONFIG_WRAPPED_AVFRAME_ENCODER 0 +#define CONFIG_WMV1_ENCODER 0 +#define CONFIG_WMV2_ENCODER 0 @@ -700,6 +715,7 @@ +#define CONFIG_EAC3_ENCODER 0 +#define CONFIG_FLAC_ENCODER 0 +#define CONFIG_G723_1_ENCODER 0 ++#define CONFIG_HDR_ENCODER 0 +#define CONFIG_MLP_ENCODER 0 +#define CONFIG_MP2_ENCODER 0 +#define CONFIG_MP2FIXED_ENCODER 0 @@ -811,6 +827,8 @@ +#define CONFIG_AAC_MF_ENCODER 0 +#define CONFIG_AC3_MF_ENCODER 0 +#define CONFIG_H263_V4L2M2M_ENCODER 0 ++#define CONFIG_AV1_NVENC_ENCODER 0 ++#define CONFIG_AV1_QSV_ENCODER 0 +#define CONFIG_LIBOPENH264_ENCODER 0 +#define CONFIG_H264_AMF_ENCODER 0 +#define CONFIG_H264_MF_ENCODER 0 @@ -821,6 +839,7 @@ +#define CONFIG_H264_VAAPI_ENCODER 0 +#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0 +#define CONFIG_HEVC_AMF_ENCODER 0 ++#define CONFIG_HEVC_MEDIACODEC_ENCODER 0 +#define CONFIG_HEVC_MF_ENCODER 0 +#define CONFIG_HEVC_NVENC_ENCODER 0 +#define CONFIG_HEVC_QSV_ENCODER 0 @@ -845,6 +864,7 @@ +#define CONFIG_AV1_DXVA2_HWACCEL 0 +#define CONFIG_AV1_NVDEC_HWACCEL 0 +#define CONFIG_AV1_VAAPI_HWACCEL 0 ++#define CONFIG_AV1_VDPAU_HWACCEL 0 +#define CONFIG_H263_VAAPI_HWACCEL 0 +#define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0 +#define CONFIG_H264_D3D11VA_HWACCEL 0 @@ -921,6 +941,7 @@ +#define CONFIG_DVDSUB_PARSER 0 +#define CONFIG_DVD_NAV_PARSER 0 +#define CONFIG_FLAC_PARSER 1 ++#define CONFIG_FTR_PARSER 0 +#define CONFIG_G723_1_PARSER 0 +#define CONFIG_G729_PARSER 0 +#define CONFIG_GIF_PARSER 0 @@ -929,8 +950,10 @@ +#define CONFIG_H263_PARSER 0 +#define CONFIG_H264_PARSER 1 +#define CONFIG_HEVC_PARSER 0 ++#define CONFIG_HDR_PARSER 0 +#define CONFIG_IPU_PARSER 0 +#define CONFIG_JPEG2000_PARSER 0 ++#define CONFIG_MISC4_PARSER 0 +#define CONFIG_MJPEG_PARSER 0 +#define CONFIG_MLP_PARSER 0 +#define CONFIG_MPEG4VIDEO_PARSER 0 @@ -939,6 +962,7 @@ +#define CONFIG_OPUS_PARSER 1 +#define CONFIG_PNG_PARSER 0 +#define CONFIG_PNM_PARSER 0 ++#define CONFIG_QOI_PARSER 0 +#define CONFIG_RV30_PARSER 0 +#define CONFIG_RV40_PARSER 0 +#define CONFIG_SBC_PARSER 0 @@ -952,6 +976,7 @@ +#define CONFIG_WEBP_PARSER 0 +#define CONFIG_XBM_PARSER 0 +#define CONFIG_XMA_PARSER 0 ++#define CONFIG_XWD_PARSER 0 +#define CONFIG_ALSA_INDEV 0 +#define CONFIG_ANDROID_CAMERA_INDEV 0 +#define CONFIG_AVFOUNDATION_INDEV 0 @@ -1113,9 +1138,11 @@ +#define CONFIG_STEREOWIDEN_FILTER 0 +#define CONFIG_SUPEREQUALIZER_FILTER 0 +#define CONFIG_SURROUND_FILTER 0 ++#define CONFIG_TILTSHELF_FILTER 0 +#define CONFIG_TREBLE_FILTER 0 +#define CONFIG_TREMOLO_FILTER 0 +#define CONFIG_VIBRATO_FILTER 0 ++#define CONFIG_VIRTUALBASS_FILTER 0 +#define CONFIG_VOLUME_FILTER 0 +#define CONFIG_VOLUMEDETECT_FILTER 0 +#define CONFIG_AEVALSRC_FILTER 0 @@ -1136,14 +1163,17 @@ +#define CONFIG_AVGBLUR_FILTER 0 +#define CONFIG_AVGBLUR_OPENCL_FILTER 0 +#define CONFIG_AVGBLUR_VULKAN_FILTER 0 ++#define CONFIG_BACKGROUNDKEY_FILTER 0 +#define CONFIG_BBOX_FILTER 0 +#define CONFIG_BENCH_FILTER 0 +#define CONFIG_BILATERAL_FILTER 0 ++#define CONFIG_BILATERAL_CUDA_FILTER 0 +#define CONFIG_BITPLANENOISE_FILTER 0 +#define CONFIG_BLACKDETECT_FILTER 0 +#define CONFIG_BLACKFRAME_FILTER 0 +#define CONFIG_BLEND_FILTER 0 +#define CONFIG_BLEND_VULKAN_FILTER 0 ++#define CONFIG_BLOCKDETECT_FILTER 0 +#define CONFIG_BLURDETECT_FILTER 0 +#define CONFIG_BM3D_FILTER 0 +#define CONFIG_BOXBLUR_FILTER 0 @@ -1153,6 +1183,7 @@ +#define CONFIG_CHROMABER_VULKAN_FILTER 0 +#define CONFIG_CHROMAHOLD_FILTER 0 +#define CONFIG_CHROMAKEY_FILTER 0 ++#define CONFIG_CHROMAKEY_CUDA_FILTER 0 +#define CONFIG_CHROMANR_FILTER 0 +#define CONFIG_CHROMASHIFT_FILTER 0 +#define CONFIG_CIESCOPE_FILTER 0 @@ -1169,6 +1200,7 @@ +#define CONFIG_COLORMAP_FILTER 0 +#define CONFIG_COLORMATRIX_FILTER 0 +#define CONFIG_COLORSPACE_FILTER 0 ++#define CONFIG_COLORSPACE_CUDA_FILTER 0 +#define CONFIG_COLORTEMPERATURE_FILTER 0 +#define CONFIG_CONVOLUTION_FILTER 0 +#define CONFIG_CONVOLUTION_OPENCL_FILTER 0 @@ -1357,6 +1389,7 @@ +#define CONFIG_READVITC_FILTER 0 +#define CONFIG_REALTIME_FILTER 0 +#define CONFIG_REMAP_FILTER 0 ++#define CONFIG_REMAP_OPENCL_FILTER 0 +#define CONFIG_REMOVEGRAIN_FILTER 0 +#define CONFIG_REMOVELOGO_FILTER 0 +#define CONFIG_REPEATFIELDS_FILTER 0 @@ -1479,6 +1512,7 @@ +#define CONFIG_COLORCHART_FILTER 0 +#define CONFIG_COLORSPECTRUM_FILTER 0 +#define CONFIG_COREIMAGESRC_FILTER 0 ++#define CONFIG_DDAGRAB_FILTER 0 +#define CONFIG_FREI0R_SRC_FILTER 0 +#define CONFIG_GRADIENTS_FILTER 0 +#define CONFIG_HALDCLUTSRC_FILTER 0 @@ -1497,6 +1531,7 @@ +#define CONFIG_TESTSRC2_FILTER 0 +#define CONFIG_YUVTESTSRC_FILTER 0 +#define CONFIG_NULLSINK_FILTER 0 ++#define CONFIG_A3DSCOPE_FILTER 0 +#define CONFIG_ABITSCOPE_FILTER 0 +#define CONFIG_ADRAWGRAPH_FILTER 0 +#define CONFIG_AGRAPHMONITOR_FILTER 0 @@ -1538,6 +1573,7 @@ +#define CONFIG_AMRNB_DEMUXER 0 +#define CONFIG_AMRWB_DEMUXER 0 +#define CONFIG_ANM_DEMUXER 0 ++#define CONFIG_APAC_DEMUXER 0 +#define CONFIG_APC_DEMUXER 0 +#define CONFIG_APE_DEMUXER 0 +#define CONFIG_APM_DEMUXER 0 @@ -1571,6 +1607,7 @@ +#define CONFIG_BFSTM_DEMUXER 0 +#define CONFIG_BRSTM_DEMUXER 0 +#define CONFIG_BOA_DEMUXER 0 ++#define CONFIG_BONK_DEMUXER 0 +#define CONFIG_C93_DEMUXER 0 +#define CONFIG_CAF_DEMUXER 0 +#define CONFIG_CAVSVIDEO_DEMUXER 0 @@ -1655,6 +1692,7 @@ +#define CONFIG_JV_DEMUXER 0 +#define CONFIG_KUX_DEMUXER 0 +#define CONFIG_KVAG_DEMUXER 0 ++#define CONFIG_LAF_DEMUXER 0 +#define CONFIG_LMLM4_DEMUXER 0 +#define CONFIG_LOAS_DEMUXER 0 +#define CONFIG_LUODAT_DEMUXER 0 @@ -1827,6 +1865,7 @@ +#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_HDR_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0 @@ -1834,15 +1873,18 @@ +#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PFM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PGX_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PHM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_PSD_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_QOI_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_SVG_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0 diff --git a/www/chromium/files/patch-third__party_libsync_src_sync.c b/www/chromium/files/patch-third__party_libsync_src_sync.c index 4588cd02c8e1..728cfeeea4fa 100644 --- a/www/chromium/files/patch-third__party_libsync_src_sync.c +++ b/www/chromium/files/patch-third__party_libsync_src_sync.c @@ -1,18 +1,16 @@ ---- third_party/libsync/src/sync.c.orig 2023-01-11 09:17:16 UTC +--- third_party/libsync/src/sync.c.orig 2023-02-08 09:03:45 UTC +++ third_party/libsync/src/sync.c -@@ -17,7 +17,11 @@ +@@ -17,7 +17,9 @@ */ #include <fcntl.h> -+#if defined(__OpenBSD__) -+#include <stdlib.h> -+#else ++#if !defined(__OpenBSD__) #include <malloc.h> +#endif #include <stdint.h> #include <string.h> #include <errno.h> -@@ -29,6 +33,12 @@ +@@ -29,6 +31,12 @@ #include <sync/sync.h> diff --git a/www/chromium/files/patch-third__party_pdfium_pdfium.gni b/www/chromium/files/patch-third__party_pdfium_pdfium.gni index ca7d5fe38a01..23c572f45128 100644 --- a/www/chromium/files/patch-third__party_pdfium_pdfium.gni +++ b/www/chromium/files/patch-third__party_pdfium_pdfium.gni @@ -1,7 +1,7 @@ ---- third_party/pdfium/pdfium.gni.orig 2023-01-26 06:54:16 UTC +--- third_party/pdfium/pdfium.gni.orig 2023-02-08 09:03:45 UTC +++ third_party/pdfium/pdfium.gni -@@ -37,7 +37,7 @@ declare_args() { - pdf_enable_xfa_tiff = true +@@ -42,7 +42,7 @@ declare_args() { + pdf_use_cxx20 = is_win && is_component_build # Build PDFium with PartitionAlloc as the memory allocator. - pdf_use_partition_alloc = pdf_use_partition_alloc_override diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc index 0b9c1a993dce..7e1e835269c0 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2023-01-11 09:17:16 UTC +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2023-02-08 09:03:45 UTC +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -3039,7 +3039,8 @@ bool TracingServiceImpl::SnapshotClocks( +@@ -3080,7 +3080,8 @@ bool TracingServiceImpl::SnapshotClocks( #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \ !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ 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 fe8a5aad6c53..f59a42ea2055 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 2022-09-14 21:13:04 UTC +--- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2023-02-08 09:03:45 UTC +++ third_party/sqlite/src/amalgamation/sqlite3.c -@@ -42109,7 +42109,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -43286,7 +43286,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 ){ -@@ -42124,6 +42129,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -43301,6 +43306,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB robust_close(0, fd, __LINE__); } } diff --git a/www/chromium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn b/www/chromium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn deleted file mode 100644 index c09dd17137ea..000000000000 --- a/www/chromium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/swiftshader/src/WSI/BUILD.gn.orig 2022-11-30 08:12:58 UTC -+++ third_party/swiftshader/src/WSI/BUILD.gn -@@ -87,7 +87,7 @@ swiftshader_source_set("WSI") { - "../Vulkan:swiftshader_libvulkan_headers", - ] - -- if (is_linux && ozone_platform_wayland && !use_system_libwayland) { -+ if (is_linux && ozone_platform_wayland && !use_system_libwayland && !is_openbsd) { - # Use third-party targets - deps += [ "$wayland_gn_dir:wayland_client" ] - } diff --git a/www/chromium/files/patch-third__party_wayland_BUILD.gn b/www/chromium/files/patch-third__party_wayland_BUILD.gn new file mode 100644 index 000000000000..79de827f9927 --- /dev/null +++ b/www/chromium/files/patch-third__party_wayland_BUILD.gn @@ -0,0 +1,14 @@ +--- third_party/wayland/BUILD.gn.orig 2023-02-08 15:40:14 UTC ++++ third_party/wayland/BUILD.gn +@@ -22,6 +22,11 @@ config("wayland_config") { + "src/src", + ] + ++ if (is_bsd) { ++ include_dirs += [ "/usr/local/include/libepoll-shim" ] ++ libs = [ "epoll-shim" ] ++ } ++ + # Client/Server headers are automatically generated. Though, we still need + # to pass the path where these headers are located. + include_dirs += [ "$root_gen_dir/third_party/wayland/src/protocol" ] diff --git a/www/chromium/files/patch-third__party_wayland_features.gni b/www/chromium/files/patch-third__party_wayland_features.gni deleted file mode 100644 index 8f93889e1ca6..000000000000 --- a/www/chromium/files/patch-third__party_wayland_features.gni +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/wayland/features.gni.orig 2022-11-30 08:12:58 UTC -+++ third_party/wayland/features.gni -@@ -21,12 +21,15 @@ declare_args() { - - declare_args() { - # Path to the wayland-scanner in the sysroot. -- assert(host_os == "linux") - if (use_system_wayland_scanner) { - if (use_sysroot) { - system_wayland_scanner_path = "$sysroot/usr/bin/wayland-scanner" - } else { -- system_wayland_scanner_path = "/usr/bin/wayland-scanner" -+ if (is_bsd) { -+ system_wayland_scanner_path = "/usr/local/bin/wayland-scanner" -+ } else { -+ system_wayland_scanner_path = "/usr/bin/wayland-scanner" -+ } - } - } - } diff --git a/www/chromium/files/patch-third__party_wayland_include_config.h b/www/chromium/files/patch-third__party_wayland_include_config.h new file mode 100644 index 000000000000..2dc3c949e7b5 --- /dev/null +++ b/www/chromium/files/patch-third__party_wayland_include_config.h @@ -0,0 +1,14 @@ +--- third_party/wayland/include/config.h.orig 2023-02-08 15:40:14 UTC ++++ third_party/wayland/include/config.h +@@ -25,7 +25,11 @@ + + #undef HAVE_SYS_PROCCTL_H + ++#if defined(__FreeBSD__) ++#define HAVE_SYS_UCRED_H ++#else + #undef HAVE_SYS_UCRED_H ++#endif + + #define HAVE_XUCRED_CR_PID 0 + diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn index 04d57885ba87..6819fef2d988 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-01-11 09:17:16 UTC +--- third_party/webrtc/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ third_party/webrtc/BUILD.gn -@@ -208,6 +208,9 @@ config("common_inherited_config") { +@@ -209,6 +209,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/chromium/files/patch-third__party_webrtc__overrides_metronome__source.h b/www/chromium/files/patch-third__party_webrtc__overrides_metronome__source.h deleted file mode 100644 index c3f64f834db0..000000000000 --- a/www/chromium/files/patch-third__party_webrtc__overrides_metronome__source.h +++ /dev/null @@ -1,10 +0,0 @@ ---- third_party/webrtc_overrides/metronome_source.h.orig 2023-01-11 09:17:16 UTC -+++ third_party/webrtc_overrides/metronome_source.h -@@ -7,6 +7,7 @@ - - #include <atomic> - #include <set> -+#include <vector> - - #include "base/callback.h" - #include "base/memory/ref_counted.h" diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn index af76a4ab3dd2..f67f8721b000 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/BUILD.gn.orig 2023-01-11 09:17:16 UTC +--- third_party/webrtc/rtc_base/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ third_party/webrtc/rtc_base/BUILD.gn -@@ -1245,7 +1245,7 @@ rtc_library("rtc_base") { +@@ -1248,7 +1248,7 @@ rtc_library("rtc_base") { sources += [ "mac_ifaddrs_converter.cc" ] } diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h index 34f01f741435..54fabfc03f97 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/byte_order.h.orig 2022-02-07 13:39:41 UTC +--- third_party/webrtc/rtc_base/byte_order.h.orig 2023-02-08 09:03:45 UTC +++ third_party/webrtc/rtc_base/byte_order.h -@@ -88,6 +88,8 @@ +@@ -90,6 +90,8 @@ #error WEBRTC_ARCH_BIG_ENDIAN or WEBRTC_ARCH_LITTLE_ENDIAN must be defined. #endif // defined(WEBRTC_ARCH_LITTLE_ENDIAN) diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc index b3979c0e1d97..a80f8a978283 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/network.cc.orig 2022-11-30 08:12:58 UTC +--- third_party/webrtc/rtc_base/network.cc.orig 2023-02-08 09:03:45 UTC +++ third_party/webrtc/rtc_base/network.cc -@@ -286,7 +286,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n +@@ -288,7 +288,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n } #endif diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc index a8824341be26..77f9e44af9fb 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2022-02-07 13:39:41 UTC +--- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2023-02-08 09:03:45 UTC +++ third_party/webrtc/rtc_base/platform_thread_types.cc @@ -11,7 +11,9 @@ #include "rtc_base/platform_thread_types.h" @@ -10,19 +10,16 @@ #include <sys/syscall.h> #endif -@@ -37,8 +39,10 @@ PlatformThreadId CurrentThreadId() { +@@ -44,6 +46,8 @@ PlatformThreadId CurrentThreadId() { return gettid(); #elif defined(WEBRTC_FUCHSIA) return zx_thread_self(); --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) - return syscall(__NR_gettid); +#elif defined(WEBRTC_BSD) + return reinterpret_cast<uint64_t>(pthread_self()); + #elif defined(WEBRTC_LINUX) + return syscall(__NR_gettid); #elif defined(__EMSCRIPTEN__) - return static_cast<PlatformThreadId>(pthread_self()); - #else -@@ -67,6 +71,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons +@@ -74,6 +78,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons } void SetCurrentThreadName(const char* name) { @@ -30,10 +27,10 @@ #if defined(WEBRTC_WIN) // The SetThreadDescription API works even if no debugger is attached. // The names set with this API also show up in ETW traces. Very handy. -@@ -109,6 +114,7 @@ void SetCurrentThreadName(const char* name) { - prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name)); // NOLINT - #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS) - pthread_setname_np(name); +@@ -120,6 +125,7 @@ void SetCurrentThreadName(const char* name) { + zx_status_t status = zx_object_set_property(zx_thread_self(), ZX_PROP_NAME, + name, strlen(name)); + RTC_DCHECK_EQ(status, ZX_OK); +#endif #endif } diff --git a/www/chromium/files/patch-ui_aura_screen__ozone.cc b/www/chromium/files/patch-ui_aura_screen__ozone.cc index 681854e1e5c0..3f3ea31232c0 100644 --- a/www/chromium/files/patch-ui_aura_screen__ozone.cc +++ b/www/chromium/files/patch-ui_aura_screen__ozone.cc @@ -1,6 +1,6 @@ ---- ui/aura/screen_ozone.cc.orig 2022-08-31 12:19:35 UTC +--- ui/aura/screen_ozone.cc.orig 2023-02-08 09:03:45 UTC +++ ui/aura/screen_ozone.cc -@@ -109,7 +109,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons +@@ -110,7 +110,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons return platform_screen_->GetPrimaryDisplay(); } diff --git a/www/chromium/files/patch-ui_aura_screen__ozone.h b/www/chromium/files/patch-ui_aura_screen__ozone.h index 3785cc6d1c0b..f310aa7a83d9 100644 --- a/www/chromium/files/patch-ui_aura_screen__ozone.h +++ b/www/chromium/files/patch-ui_aura_screen__ozone.h @@ -1,4 +1,4 @@ ---- ui/aura/screen_ozone.h.orig 2022-10-24 13:33:33 UTC +--- ui/aura/screen_ozone.h.orig 2023-02-08 09:03:45 UTC +++ ui/aura/screen_ozone.h @@ -46,7 +46,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen display::Display GetDisplayMatching( @@ -9,7 +9,7 @@ std::unique_ptr<display::Screen::ScreenSaverSuspender> SuspendScreenSaver() override; #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -@@ -71,7 +71,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen +@@ -73,7 +73,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen ui::PlatformScreen* platform_screen() { return platform_screen_.get(); } private: diff --git a/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h index 9232742bbece..b89565de3cda 100644 --- a/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h +++ b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h @@ -1,9 +1,9 @@ ---- ui/base/clipboard/clipboard_constants.h.orig 2022-03-25 21:59:56 UTC +--- ui/base/clipboard/clipboard_constants.h.orig 2023-02-08 09:03:45 UTC +++ ui/base/clipboard/clipboard_constants.h -@@ -46,7 +46,7 @@ extern const char kMimeTypeDataTransferEndpoint[]; - #endif // BUILDFLAG(IS_CHROMEOS) +@@ -47,7 +47,7 @@ extern const char kMimeTypeDataTransferEndpoint[]; + + // ----- LINUX & CHROMEOS & FUCHSIA MIME TYPES ----- - // Linux-specific MIME type constants (also used in Fuchsia). -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc index 62f3afed5250..16b72fb4f7a8 100644 --- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- ui/base/resource/resource_bundle.cc.orig 2022-07-22 17:30:31 UTC +--- ui/base/resource/resource_bundle.cc.orig 2023-02-08 09:03:45 UTC +++ ui/base/resource/resource_bundle.cc -@@ -884,7 +884,7 @@ void ResourceBundle::ReloadFonts() { +@@ -885,7 +885,7 @@ void ResourceBundle::ReloadFonts() { } ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const { 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 fedabb5b9706..1635573ef0f0 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-01-11 09:17:16 UTC +--- ui/base/ui_base_features.cc.orig 2023-02-08 09:03:45 UTC +++ ui/base/ui_base_features.cc @@ -205,7 +205,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -307,7 +307,7 @@ bool IsForcedColorsEnabled() { +@@ -311,7 +311,7 @@ bool IsForcedColorsEnabled() { // milestones. BASE_FEATURE(kEyeDropper, "EyeDropper", diff --git a/www/chromium/files/patch-ui_color_color__id.h b/www/chromium/files/patch-ui_color_color__id.h index 9882f1390761..1349b033e555 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-01-11 09:17:16 UTC +--- ui/color/color_id.h.orig 2023-02-08 09:03:45 UTC +++ ui/color/color_id.h -@@ -364,7 +364,7 @@ +@@ -371,7 +371,7 @@ E_CPONLY(kColorNativeColor6) \ E_CPONLY(kColorNativeBaseColor) \ E_CPONLY(kColorNativeSecondaryColor) diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc index 9e2ea39357f6..2a9b70ab8063 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.cc +++ b/www/chromium/files/patch-ui_compositor_compositor.cc @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.cc.orig 2023-01-11 09:17:16 UTC +--- ui/compositor/compositor.cc.orig 2023-02-08 09:03:45 UTC +++ ui/compositor/compositor.cc -@@ -864,7 +864,7 @@ void Compositor::OnResume() { +@@ -868,7 +868,7 @@ void Compositor::OnResume() { // 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_compositor_compositor.h b/www/chromium/files/patch-ui_compositor_compositor.h index a71821b03b68..a8be07b91953 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.h +++ b/www/chromium/files/patch-ui_compositor_compositor.h @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.h.orig 2023-01-11 09:17:16 UTC +--- ui/compositor/compositor.h.orig 2023-02-08 09:03:45 UTC +++ ui/compositor/compositor.h -@@ -430,7 +430,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe +@@ -437,7 +437,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe // 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_display_screen.h b/www/chromium/files/patch-ui_display_screen.h index 6595f82a28a4..228fcbdb4dbd 100644 --- a/www/chromium/files/patch-ui_display_screen.h +++ b/www/chromium/files/patch-ui_display_screen.h @@ -1,6 +1,6 @@ ---- ui/display/screen.h.orig 2022-10-24 13:33:33 UTC +--- ui/display/screen.h.orig 2023-02-08 09:03:45 UTC +++ ui/display/screen.h -@@ -130,7 +130,7 @@ class DISPLAY_EXPORT Screen { +@@ -131,7 +131,7 @@ class DISPLAY_EXPORT Screen { // (both of which may or may not be `nearest_id`). display::ScreenInfos GetScreenInfosNearestDisplay(int64_t nearest_id) const; @@ -9,7 +9,7 @@ // Object which suspends the platform-specific screensaver for the duration of // its existence. class ScreenSaverSuspender { -@@ -220,7 +220,7 @@ class DISPLAY_EXPORT Screen { +@@ -232,7 +232,7 @@ class DISPLAY_EXPORT Screen { int64_t display_id_for_new_windows_; int64_t scoped_display_id_for_new_windows_ = display::kInvalidDisplayId; diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn index 49cb34ceb869..1d94579dd5d0 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-01-11 09:17:16 UTC +--- ui/gl/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ ui/gl/BUILD.gn -@@ -166,8 +166,6 @@ component("gl") { +@@ -160,8 +160,6 @@ component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] } @@ -9,7 +9,7 @@ all_dependent_configs = [ ":gl_config" ] public_configs = [ "//third_party/khronos:khronos_headers" ] -@@ -184,7 +182,6 @@ component("gl") { +@@ -178,7 +176,6 @@ component("gl") { ] public_deps = [ "//base", @@ -17,7 +17,7 @@ "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -419,7 +416,6 @@ component("gl") { +@@ -390,7 +387,6 @@ component("gl") { data_deps += [ "//third_party/angle:libEGL", "//third_party/angle:libGLESv2", @@ -25,11 +25,11 @@ ] if (enable_swiftshader) { data_deps += [ -@@ -639,7 +635,6 @@ test("gl_unittests") { +@@ -607,7 +603,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", - "//third_party/mesa_headers", ] - # TODO(https://crbug.com/789065): this must be moved to Ozone. + if (is_win) { diff --git a/www/chromium/files/patch-ui_gl_generate__bindings.py b/www/chromium/files/patch-ui_gl_generate__bindings.py deleted file mode 100644 index 947d99704375..000000000000 --- a/www/chromium/files/patch-ui_gl_generate__bindings.py +++ /dev/null @@ -1,12 +0,0 @@ ---- ui/gl/generate_bindings.py.orig 2023-01-11 09:17:16 UTC -+++ ui/gl/generate_bindings.py -@@ -2971,6 +2971,9 @@ GLX_FUNCTIONS = [ - 'arguments': - 'Display* dpy, GLXDrawable drawable, int32_t* numerator, ' - 'int32_t* denominator' }, -+{ 'return_type': '__GLXextFuncPtr', -+ 'names': ['glXGetProcAddressARB'], -+ 'arguments': 'const GLubyte* procName', }, - { 'return_type': 'void', - 'names': ['glXGetSelectedEvent'], - 'arguments': 'Display* dpy, GLXDrawable drawable, unsigned long* mask', }, diff --git a/www/chromium/files/patch-ui_gl_gl__bindings.h b/www/chromium/files/patch-ui_gl_gl__bindings.h new file mode 100644 index 000000000000..bb096d6d263a --- /dev/null +++ b/www/chromium/files/patch-ui_gl_gl__bindings.h @@ -0,0 +1,11 @@ +--- ui/gl/gl_bindings.h.orig 2023-02-08 09:03:45 UTC ++++ ui/gl/gl_bindings.h +@@ -37,7 +37,7 @@ + #include <GL/wglext.h> + #elif BUILDFLAG(IS_APPLE) + #include <OpenGL/OpenGL.h> +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + using Display = struct _XDisplay; + using Bool = int; + using Status = int; diff --git a/www/chromium/files/patch-ui_gl_gl__bindings__api__autogen__glx.h b/www/chromium/files/patch-ui_gl_gl__bindings__api__autogen__glx.h deleted file mode 100644 index 94b80fa852b9..000000000000 --- a/www/chromium/files/patch-ui_gl_gl__bindings__api__autogen__glx.h +++ /dev/null @@ -1,10 +0,0 @@ ---- ui/gl/gl_bindings_api_autogen_glx.h.orig 2021-04-14 18:41:39 UTC -+++ ui/gl/gl_bindings_api_autogen_glx.h -@@ -88,6 +88,7 @@ bool glXGetMscRateOMLFn(Display* dpy, - GLXDrawable drawable, - int32_t* numerator, - int32_t* denominator) override; -+__GLXextFuncPtr glXGetProcAddressARBFn(const GLubyte* procName) override; - void glXGetSelectedEventFn(Display* dpy, - GLXDrawable drawable, - unsigned long* mask) override; diff --git a/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.cc b/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.cc deleted file mode 100644 index 6d3ae1073346..000000000000 --- a/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.cc +++ /dev/null @@ -1,61 +0,0 @@ ---- ui/gl/gl_bindings_autogen_glx.cc.orig 2022-02-07 13:39:41 UTC -+++ ui/gl/gl_bindings_autogen_glx.cc -@@ -115,6 +115,8 @@ void DriverGLX::InitializeExtensionBindings() { - - ext.b_GLX_ARB_create_context = - gfx::HasExtension(extensions, "GLX_ARB_create_context"); -+ ext.b_GLX_ARB_get_proc_address = -+ gfx::HasExtension(extensions, "GLX_ARB_get_proc_address"); - ext.b_GLX_EXT_swap_control = - gfx::HasExtension(extensions, "GLX_EXT_swap_control"); - ext.b_GLX_EXT_texture_from_pixmap = -@@ -156,6 +158,11 @@ void DriverGLX::InitializeExtensionBindings() { - GetGLProcAddress("glXGetMscRateOML")); - } - -+ if (ext.b_GLX_ARB_get_proc_address) { -+ fn.glXGetProcAddressARBFn = reinterpret_cast<glXGetProcAddressARBProc>( -+ GetGLProcAddress("glXGetProcAddressARB")); -+ } -+ - if (ext.b_GLX_OML_sync_control) { - fn.glXGetSyncValuesOMLFn = reinterpret_cast<glXGetSyncValuesOMLProc>( - GetGLProcAddress("glXGetSyncValuesOML")); -@@ -346,6 +353,10 @@ bool GLXApiBase::glXGetMscRateOMLFn(Display* dpy, - return driver_->fn.glXGetMscRateOMLFn(dpy, drawable, numerator, denominator); - } - -+__GLXextFuncPtr GLXApiBase::glXGetProcAddressARBFn(const GLubyte* procName) { -+ return driver_->fn.glXGetProcAddressARBFn(procName); -+} -+ - void GLXApiBase::glXGetSelectedEventFn(Display* dpy, - GLXDrawable drawable, - unsigned long* mask) { -@@ -648,6 +659,11 @@ bool TraceGLXApi::glXGetMscRateOMLFn(Display* dpy, - return glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator); - } - -+__GLXextFuncPtr TraceGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) { -+ TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLXAPI::glXGetProcAddressARB") -+ return glx_api_->glXGetProcAddressARBFn(procName); -+} -+ - void TraceGLXApi::glXGetSelectedEventFn(Display* dpy, - GLXDrawable drawable, - unsigned long* mask) { -@@ -1069,6 +1085,14 @@ bool LogGLXApi::glXGetMscRateOMLFn(Display* dpy, - << static_cast<const void*>(denominator) << ")"); - bool result = - glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator); -+ GL_SERVICE_LOG("GL_RESULT: " << result); -+ return result; -+} -+ -+__GLXextFuncPtr LogGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) { -+ GL_SERVICE_LOG("glXGetProcAddressARB" -+ << "(" << static_cast<const void*>(procName) << ")"); -+ __GLXextFuncPtr result = glx_api_->glXGetProcAddressARBFn(procName); - GL_SERVICE_LOG("GL_RESULT: " << result); - return result; - } diff --git a/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.h b/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.h deleted file mode 100644 index 5056950b8b34..000000000000 --- a/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.h +++ /dev/null @@ -1,43 +0,0 @@ ---- ui/gl/gl_bindings_autogen_glx.h.orig 2021-04-14 18:41:39 UTC -+++ ui/gl/gl_bindings_autogen_glx.h -@@ -104,6 +104,8 @@ typedef bool(GL_BINDING_CALL* glXGetMscRateOMLProc)(Di - GLXDrawable drawable, - int32_t* numerator, - int32_t* denominator); -+typedef __GLXextFuncPtr(GL_BINDING_CALL* glXGetProcAddressARBProc)( -+ const GLubyte* procName); - typedef void(GL_BINDING_CALL* glXGetSelectedEventProc)(Display* dpy, - GLXDrawable drawable, - unsigned long* mask); -@@ -166,6 +168,7 @@ typedef void(GL_BINDING_CALL* glXWaitXProc)(void); - - struct ExtensionsGLX { - bool b_GLX_ARB_create_context; -+ bool b_GLX_ARB_get_proc_address; - bool b_GLX_EXT_swap_control; - bool b_GLX_EXT_texture_from_pixmap; - bool b_GLX_MESA_copy_sub_buffer; -@@ -203,6 +206,7 @@ struct ProcsGLX { - glXGetFBConfigFromVisualSGIXProc glXGetFBConfigFromVisualSGIXFn; - glXGetFBConfigsProc glXGetFBConfigsFn; - glXGetMscRateOMLProc glXGetMscRateOMLFn; -+ glXGetProcAddressARBProc glXGetProcAddressARBFn; - glXGetSelectedEventProc glXGetSelectedEventFn; - glXGetSyncValuesOMLProc glXGetSyncValuesOMLFn; - glXGetVisualFromFBConfigProc glXGetVisualFromFBConfigFn; -@@ -310,6 +314,7 @@ class GL_EXPORT GLXApi { - GLXDrawable drawable, - int32_t* numerator, - int32_t* denominator) = 0; -+ virtual __GLXextFuncPtr glXGetProcAddressARBFn(const GLubyte* procName) = 0; - virtual void glXGetSelectedEventFn(Display* dpy, - GLXDrawable drawable, - unsigned long* mask) = 0; -@@ -394,6 +399,7 @@ class GL_EXPORT GLXApi { - ::gl::g_current_glx_context->glXGetFBConfigFromVisualSGIXFn - #define glXGetFBConfigs ::gl::g_current_glx_context->glXGetFBConfigsFn - #define glXGetMscRateOML ::gl::g_current_glx_context->glXGetMscRateOMLFn -+#define glXGetProcAddressARB ::gl::g_current_glx_context->glXGetProcAddressARBFn - #define glXGetSelectedEvent ::gl::g_current_glx_context->glXGetSelectedEventFn - #define glXGetSyncValuesOML ::gl::g_current_glx_context->glXGetSyncValuesOMLFn - #define glXGetVisualFromFBConfig \ diff --git a/www/chromium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc b/www/chromium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc deleted file mode 100644 index 6e462c3487b3..000000000000 --- a/www/chromium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/gl/gl_image_glx_native_pixmap.cc.orig 2022-08-31 12:19:35 UTC -+++ ui/gl/gl_image_glx_native_pixmap.cc -@@ -12,6 +12,8 @@ - #include "ui/gl/buffer_format_utils.h" - #include "ui/gl/glx_util.h" - -+#include <unistd.h> -+ - namespace gl { - - GLImageGLXNativePixmap::GLImageGLXNativePixmap(const gfx::Size& size, diff --git a/www/chromium/files/patch-ui_native__theme_native__theme__base.cc b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc index f07230222c98..2c162b667208 100644 --- a/www/chromium/files/patch-ui_native__theme_native__theme__base.cc +++ b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme_base.cc.orig 2023-01-11 09:17:16 UTC +--- ui/native_theme/native_theme_base.cc.orig 2023-02-08 09:03:45 UTC +++ ui/native_theme/native_theme_base.cc -@@ -272,7 +272,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -273,7 +273,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, break; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 new file mode 100644 index 000000000000..d7f1a38b1768 --- /dev/null +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc @@ -0,0 +1,29 @@ +--- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2023-02-08 09:03:45 UTC ++++ ui/ozone/platform/wayland/ozone_platform_wayland.cc +@@ -68,7 +68,7 @@ + #include "ui/ozone/platform/wayland/host/wayland_cursor_factory.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/ozone/platform/wayland/host/linux_ui_delegate_wayland.h" + #endif + +@@ -243,7 +243,7 @@ class OzonePlatformWayland : public OzonePlatform, + + supported_buffer_formats_ = + connection_->buffer_manager_host()->GetSupportedBufferFormats(); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + linux_ui_delegate_ = + std::make_unique<LinuxUiDelegateWayland>(connection_.get()); + #endif +@@ -446,7 +446,7 @@ class OzonePlatformWayland : public OzonePlatform, + DrmRenderNodePathFinder path_finder_; + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::unique_ptr<LinuxUiDelegateWayland> linux_ui_delegate_; + #endif + }; diff --git a/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h b/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h index 51f29a02bf8e..f34d41512f02 100644 --- a/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h +++ b/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h @@ -1,6 +1,6 @@ ---- ui/platform_window/platform_window_delegate.h.orig 2022-11-30 08:12:58 UTC +--- ui/platform_window/platform_window_delegate.h.orig 2023-02-08 09:03:45 UTC +++ ui/platform_window/platform_window_delegate.h -@@ -96,7 +96,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow +@@ -103,7 +103,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow virtual void OnWindowStateChanged(PlatformWindowState old_state, PlatformWindowState new_state) = 0; 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 0448e4878ef0..e1df29922b1d 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-01-11 09:17:16 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2023-02-08 09:03:45 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -71,7 +71,7 @@ +@@ -72,7 +72,7 @@ #include "base/win/win_util.h" #endif diff --git a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc index bb652f09ee10..d038084fa408 100644 --- a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc +++ b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc @@ -1,6 +1,6 @@ ---- ui/views/corewm/tooltip_aura.cc.orig 2022-11-30 08:12:58 UTC +--- ui/views/corewm/tooltip_aura.cc.orig 2023-02-08 09:03:45 UTC +++ ui/views/corewm/tooltip_aura.cc -@@ -53,7 +53,7 @@ constexpr int kVerticalPaddingBottom = 5; +@@ -50,7 +50,7 @@ constexpr int kVerticalPaddingBottom = 5; bool CanUseTranslucentTooltipWidget() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_views_style_platform__style.cc b/www/chromium/files/patch-ui_views_style_platform__style.cc index ce5ffd6736db..db03138f62ba 100644 --- a/www/chromium/files/patch-ui_views_style_platform__style.cc +++ b/www/chromium/files/patch-ui_views_style_platform__style.cc @@ -1,4 +1,4 @@ ---- ui/views/style/platform_style.cc.orig 2022-08-31 12:19:35 UTC +--- ui/views/style/platform_style.cc.orig 2023-02-08 09:03:45 UTC +++ ui/views/style/platform_style.cc @@ -17,7 +17,7 @@ #include "ui/views/controls/focusable_border.h" @@ -9,16 +9,16 @@ #include "ui/views/controls/scrollbar/overlay_scroll_bar.h" #endif -@@ -52,7 +52,7 @@ const View::FocusBehavior PlatformStyle::kDefaultFocus +@@ -50,7 +50,7 @@ const View::FocusBehavior PlatformStyle::kDefaultFocus + // Linux clips bubble windows that extend outside their parent window + // bounds. const bool PlatformStyle::kAdjustBubbleIfOffscreen = - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) false; #else true; -@@ -60,7 +60,7 @@ const bool PlatformStyle::kAdjustBubbleIfOffscreen = +@@ -58,7 +58,7 @@ const bool PlatformStyle::kAdjustBubbleIfOffscreen = // static std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) { 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 0e0788058cae..c697cbef6041 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-01-11 09:17:16 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2023-02-08 09:03:45 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -41,7 +41,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 -@@ -257,7 +257,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget: +@@ -259,7 +259,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; -@@ -329,7 +329,7 @@ std::unique_ptr<aura::client::DragDropClient> +@@ -331,7 +331,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); -@@ -1018,7 +1018,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis +@@ -1019,7 +1019,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index 748b90a114d3..72689d6facd5 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-01-11 09:17:16 UTC +--- v8/BUILD.gn.orig 2023-02-08 09:03:45 UTC +++ v8/BUILD.gn -@@ -1242,6 +1242,14 @@ config("toolchain") { +@@ -1278,6 +1278,14 @@ config("toolchain") { } else if (target_os == "win") { defines += [ "V8_HAVE_TARGET_OS" ] defines += [ "V8_TARGET_OS_WIN" ] @@ -15,7 +15,7 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -5500,7 +5508,7 @@ v8_component("v8_libbase") { +@@ -5602,7 +5610,7 @@ v8_component("v8_libbase") { } } @@ -24,7 +24,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -5511,6 +5519,18 @@ v8_component("v8_libbase") { +@@ -5613,6 +5621,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc index 8707b36c8944..fda40026b4af 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-01-11 09:17:16 UTC +--- v8/src/api/api.cc.orig 2023-02-08 09:03:45 UTC +++ v8/src/api/api.cc @@ -141,7 +141,7 @@ #include "src/wasm/wasm-serialization.h" @@ -9,7 +9,7 @@ #include <signal.h> #if V8_ENABLE_WEBASSEMBLY -@@ -6210,7 +6210,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6337,7 +6337,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/chromium/files/patch-v8_src_base_platform_memory.h b/www/chromium/files/patch-v8_src_base_platform_memory.h index 2cd77311c2f3..bdc9629bc45b 100644 --- a/www/chromium/files/patch-v8_src_base_platform_memory.h +++ b/www/chromium/files/patch-v8_src_base_platform_memory.h @@ -1,16 +1,16 @@ ---- v8/src/base/platform/memory.h.orig 2022-10-24 13:33:33 UTC +--- v8/src/base/platform/memory.h.orig 2023-02-08 09:03:45 UTC +++ v8/src/base/platform/memory.h @@ -19,11 +19,11 @@ #if V8_OS_DARWIN #include <malloc/malloc.h> -#else // !V8_OS_DARWIN -+#elif !V8_OS_BSD // !V8_OS_DARWIN ++#elif !V8_OS_BSD #include <malloc.h> #endif // !V8_OS_DARWIN --#if (V8_OS_POSIX && !V8_OS_AIX) || V8_OS_WIN -+#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_BSD) || V8_OS_WIN +-#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS) || V8_OS_WIN ++#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS && !V8_OS_BSD) || V8_OS_WIN #define V8_HAS_MALLOC_USABLE_SIZE 1 - #endif // (V8_OS_POSIX && !V8_OS_AIX) || V8_OS_WIN + #endif // (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS) || V8_OS_WIN diff --git a/www/chromium/files/patch-v8_src_execution_isolate.cc b/www/chromium/files/patch-v8_src_execution_isolate.cc new file mode 100644 index 000000000000..27b5d1398070 --- /dev/null +++ b/www/chromium/files/patch-v8_src_execution_isolate.cc @@ -0,0 +1,25 @@ +--- v8/src/execution/isolate.cc.orig 2023-02-08 09:03:45 UTC ++++ v8/src/execution/isolate.cc +@@ -146,6 +146,10 @@ + #include "src/execution/simulator-base.h" + #endif + ++#if defined(V8_OS_OPENBSD) ++#include <sys/mman.h> ++#endif ++ + 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_[]; +@@ -3936,6 +3940,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { + uint32_t code_size = DefaultEmbeddedBlobCodeSize(); + const uint8_t* data = DefaultEmbeddedBlobData(); + uint32_t data_size = DefaultEmbeddedBlobDataSize(); ++ ++#if defined(V8_OS_OPENBSD) ++ mprotect(reinterpret_cast<void *>(const_cast<uint8_t *>(code)), ++ code_size, PROT_READ | PROT_EXEC); ++#endif + + if (StickyEmbeddedBlobCode() != nullptr) { + base::MutexGuard guard(current_embedded_blob_refcount_mutex_.Pointer()); diff --git a/www/chromium/files/patch-v8_src_flags_flags.cc b/www/chromium/files/patch-v8_src_flags_flags.cc deleted file mode 100644 index a2f284ca35d3..000000000000 --- a/www/chromium/files/patch-v8_src_flags_flags.cc +++ /dev/null @@ -1,26 +0,0 @@ ---- v8/src/flags/flags.cc.orig 2023-01-11 09:17:16 UTC -+++ v8/src/flags/flags.cc -@@ -31,7 +31,12 @@ - namespace v8::internal { - - // Define {v8_flags}, declared in flags.h. -+#if V8_OS_OPENBSD -+#include <sys/mman.h> -+FlagValues v8_flags __attribute__((section(".openbsd.mutable"))); -+#else - FlagValues v8_flags; -+#endif - - // {v8_flags} needs to be aligned to a memory page, and the size needs to be a - // multiple of a page size. This is required for memory-protection of the memory -@@ -787,6 +792,10 @@ void FlagList::FreezeFlags() { - // Note that for string flags we only protect the pointer itself, but not the - // string storage. TODO(12887): Fix this. - base::OS::SetDataReadOnly(&v8_flags, sizeof(v8_flags)); -+#if V8_OS_OPENBSD -+ if (mimmutable(&v8_flags, sizeof(v8_flags)) == -1) -+ FATAL("unable to set immutability of v8_flags"); -+#endif - } - - // static diff --git a/www/chromium/files/patch-v8_src_sandbox_sandbox.cc b/www/chromium/files/patch-v8_src_sandbox_sandbox.cc index a280d073c0d3..860e5afb8cd8 100644 --- a/www/chromium/files/patch-v8_src_sandbox_sandbox.cc +++ b/www/chromium/files/patch-v8_src_sandbox_sandbox.cc @@ -1,6 +1,6 @@ ---- v8/src/sandbox/sandbox.cc.orig 2022-09-24 10:57:32 UTC +--- v8/src/sandbox/sandbox.cc.orig 2023-02-08 09:03:45 UTC +++ v8/src/sandbox/sandbox.cc -@@ -49,7 +49,7 @@ static Address DetermineAddressSpaceLimit() { +@@ -46,7 +46,7 @@ static Address DetermineAddressSpaceLimit() { } #endif // V8_TARGET_ARCH_X64 diff --git a/www/chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc b/www/chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc new file mode 100644 index 000000000000..4797c990b431 --- /dev/null +++ b/www/chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc @@ -0,0 +1,11 @@ +--- v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc.orig 2023-02-08 09:03:45 UTC ++++ v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc +@@ -142,6 +142,8 @@ EmbeddedTargetOs ToEmbeddedTargetOs(const char* s) { + return EmbeddedTargetOs::kWin; + } else if (string == "starboard") { + return EmbeddedTargetOs::kStarboard; ++ } else if (string == "openbsd") { ++ return EmbeddedTargetOs::kOpenBSD; + } else { + return EmbeddedTargetOs::kGeneric; + } diff --git a/www/chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h b/www/chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h new file mode 100644 index 000000000000..ca28e2aa9551 --- /dev/null +++ b/www/chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h @@ -0,0 +1,10 @@ +--- v8/src/snapshot/embedded/platform-embedded-file-writer-base.h.orig 2023-02-08 09:03:45 UTC ++++ v8/src/snapshot/embedded/platform-embedded-file-writer-base.h +@@ -31,6 +31,7 @@ enum class EmbeddedTargetOs { + kMac, + kWin, + kStarboard, ++ kOpenBSD, + kGeneric, // Everything not covered above falls in here. + }; + 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 new file mode 100644 index 000000000000..883f9c247076 --- /dev/null +++ b/www/chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc @@ -0,0 +1,40 @@ +--- v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc.orig 2023-02-08 09:03:45 UTC ++++ v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc +@@ -9,6 +9,10 @@ + + #include "src/objects/code.h" + ++#if V8_OS_OPENBSD ++#include <sys/param.h> ++#endif ++ + namespace v8 { + namespace internal { + +@@ -35,6 +39,8 @@ const char* DirectiveAsString(DataDirective directive) + void PlatformEmbeddedFileWriterGeneric::SectionText() { + if (target_os_ == EmbeddedTargetOs::kChromeOS) { + fprintf(fp_, ".section .text.hot.embedded\n"); ++ } else if (target_os_ == EmbeddedTargetOs::kOpenBSD) { ++ fprintf(fp_, ".section .openbsd.mutable,\"a\"\n"); + } else { + fprintf(fp_, ".section .text\n"); + } +@@ -66,6 +72,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 ++ 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 + (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 ++ fprintf(fp_, ".balign %d\n", PAGE_SIZE); + #endif + } + 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 92c54638eb9b..f80507d8ded0 100644 --- a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc +++ b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc @@ -1,4 +1,4 @@ ---- weblayer/browser/content_browser_client_impl.cc.orig 2023-01-11 09:17:16 UTC +--- weblayer/browser/content_browser_client_impl.cc.orig 2023-02-08 09:03:45 UTC +++ weblayer/browser/content_browser_client_impl.cc @@ -155,7 +155,7 @@ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is @@ -9,7 +9,7 @@ #include "content/public/common/content_descriptors.h" #endif -@@ -1004,7 +1004,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe +@@ -1006,7 +1006,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) || \ |