diff options
| author | Robert Nagy <robert@openbsd.org> | 2022-12-02 18:12:11 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2022-12-03 10:35:02 +0000 |
| commit | fa51d48be7f6c709ee7be36d0764fa318a840bdb (patch) | |
| tree | c2e05efa3981cfb6928cc1abda15a9429b7151d9 /www/ungoogled-chromium/files | |
| parent | 27ca116ba8283c5aebf6024b9db878a84fb2fe7a (diff) | |
| download | ports-fa51d48be7f6c709ee7be36d0764fa318a840bdb.tar.gz ports-fa51d48be7f6c709ee7be36d0764fa318a840bdb.zip | |
www/ungoogled-chromium: update to 108.0.5359.71
Diffstat (limited to 'www/ungoogled-chromium/files')
316 files changed, 1647 insertions, 1721 deletions
diff --git a/www/ungoogled-chromium/files/patch-BUILD.gn b/www/ungoogled-chromium/files/patch-BUILD.gn index fbab6f7809b7..fe64eebc767f 100644 --- a/www/ungoogled-chromium/files/patch-BUILD.gn +++ b/www/ungoogled-chromium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ BUILD.gn @@ -59,7 +59,7 @@ declare_args() { root_extra_deps = [] @@ -17,7 +17,7 @@ "//net:net_unittests", "//sandbox:sandbox_unittests", "//services:services_unittests", -@@ -447,7 +446,7 @@ group("gn_all") { +@@ -430,7 +429,7 @@ group("gn_all") { ] } @@ -26,7 +26,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -640,6 +639,15 @@ group("gn_all") { +@@ -624,6 +623,15 @@ group("gn_all") { deps += [ "//gpu/tools/compositor_model_bench" ] } @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:crash_inspector", -@@ -688,7 +696,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) { +@@ -1099,7 +1107,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") { -@@ -1210,7 +1218,7 @@ if (!is_ios) { +@@ -1194,7 +1202,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)" ] } -@@ -1219,7 +1227,7 @@ if (!is_ios) { +@@ -1203,7 +1211,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") { +@@ -1647,7 +1655,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/www/ungoogled-chromium/files/patch-base_BUILD.gn b/www/ungoogled-chromium/files/patch-base_BUILD.gn index c8aca0266eef..4ab7b7c1c632 100644 --- a/www/ungoogled-chromium/files/patch-base_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- base/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ base/BUILD.gn -@@ -162,7 +162,7 @@ buildflag_header("ios_cronet_buildflags") { +@@ -163,7 +163,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" -@@ -1035,7 +1035,7 @@ mixed_component("base") { +@@ -1048,7 +1048,7 @@ mixed_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", -@@ -1046,6 +1046,14 @@ mixed_component("base") { +@@ -1059,6 +1059,14 @@ mixed_component("base") { "profiler/thread_delegate_posix.h", ] } @@ -33,7 +33,7 @@ } if (is_win) { -@@ -1557,11 +1565,23 @@ mixed_component("base") { +@@ -1559,11 +1567,23 @@ mixed_component("base") { # Needed for <atomic> if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -58,7 +58,7 @@ if (use_allocator_shim) { sources += [ "allocator/partition_allocator/shim/allocator_shim.cc", -@@ -1589,7 +1609,7 @@ mixed_component("base") { +@@ -1591,7 +1611,7 @@ mixed_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", -@@ -1643,7 +1663,7 @@ mixed_component("base") { +@@ -1645,7 +1665,7 @@ mixed_component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -76,7 +76,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2216,6 +2236,42 @@ mixed_component("base") { +@@ -2218,6 +2238,42 @@ mixed_component("base") { } } @@ -119,7 +119,7 @@ # iOS if (is_ios) { sources -= [ -@@ -2313,7 +2369,7 @@ mixed_component("base") { +@@ -2315,7 +2371,7 @@ mixed_component("base") { } if (dep_libevent) { @@ -128,7 +128,7 @@ } if (use_libevent) { -@@ -3565,7 +3621,7 @@ test("base_unittests") { +@@ -3583,7 +3639,7 @@ test("base_unittests") { } } @@ -137,7 +137,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3613,7 +3669,7 @@ test("base_unittests") { +@@ -3629,7 +3685,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -146,7 +146,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3624,7 +3680,7 @@ test("base_unittests") { +@@ -3640,7 +3696,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -155,7 +155,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3812,7 +3868,7 @@ test("base_unittests") { +@@ -3832,7 +3888,7 @@ test("base_unittests") { } } diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator.h index 49d3070a84cd..5f009ecca999 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/page_allocator.h.orig 2022-10-01 07:40:07 UTC +--- base/allocator/partition_allocator/page_allocator.h.orig 2022-12-02 17:56:32 UTC +++ base/allocator/partition_allocator/page_allocator.h -@@ -206,7 +206,7 @@ void DecommitAndZeroSystemPages(void* address, size_t +@@ -231,7 +231,7 @@ void DecommitAndZeroSystemPages(void* address, size_t // recommitted. Do not assume that this will not change over time. constexpr PA_COMPONENT_EXPORT( PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() { diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h index 7178749831fe..160c435cb4ac 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-10-01 07:40:07 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-12-02 17:56:32 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -347,8 +347,12 @@ bool TryRecommitSystemPagesInternal( +@@ -356,8 +356,12 @@ bool TryRecommitSystemPagesInternal( void DiscardSystemPagesInternal(uintptr_t address, size_t length) { void* ptr = reinterpret_cast<void*>(address); diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc index b415ff48e785..fe8048041b09 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc @@ -1,7 +1,7 @@ ---- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-10-29 17:50:56 UTC +--- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-12-02 17:56:32 UTC +++ base/allocator/partition_allocator/partition_address_space.cc -@@ -261,7 +261,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT - setup_.configurable_pool_ = 0; +@@ -294,7 +294,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT + setup_.configurable_pool_base_mask_ = 0; } -#if BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h index 60f99b3e1e75..38357939ba8e 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-10-29 17:50:56 UTC +--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-12-02 17:56:32 UTC +++ base/allocator/partition_allocator/partition_alloc_constants.h @@ -91,7 +91,7 @@ PartitionPageShift() { return 18; // 256 KiB @@ -9,9 +9,9 @@ PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t PartitionPageShift() { return PageAllocationGranularityShift() + 2; -@@ -272,7 +272,7 @@ constexpr size_t kNumPools = 3; +@@ -270,7 +270,7 @@ constexpr size_t kNumPools = 3; // Special-case Android and iOS, which incur test failures with larger - // GigaCage. Regardless, allocating >8GiB with malloc() on these platforms is + // 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) diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__page.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__page.h index bed1b712bcea..15eddbef8307 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__page.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__page.h @@ -1,6 +1,13 @@ ---- base/allocator/partition_allocator/partition_page.h.orig 2022-11-06 16:08:29 UTC +--- base/allocator/partition_allocator/partition_page.h.orig 2022-12-02 17:56:32 UTC +++ base/allocator/partition_allocator/partition_page.h -@@ -144,7 +144,7 @@ struct SlotSpanMetadata { +@@ -138,13 +138,13 @@ struct SlotSpanMetadata { + PartitionBucket<thread_safe>* const bucket = nullptr; + + // CHECK()ed in AllocNewSlotSpan(). +-#if defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE) ++#if (defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE)) + // System page size is not a constant on Apple OSes, but is either 4 or 16kiB + // (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And // PartitionPageSize() is 4 times the OS page size. static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 14) / kSmallestBucket; diff --git a/www/ungoogled-chromium/files/patch-base_cpu.h b/www/ungoogled-chromium/files/patch-base_cpu.h index 75f3fbb02cd2..3381e109834b 100644 --- a/www/ungoogled-chromium/files/patch-base_cpu.h +++ b/www/ungoogled-chromium/files/patch-base_cpu.h @@ -1,6 +1,6 @@ ---- base/cpu.h.orig 2022-10-01 07:40:07 UTC +--- base/cpu.h.orig 2022-12-02 17:56:32 UTC +++ base/cpu.h -@@ -108,7 +108,7 @@ class BASE_EXPORT CPU final { +@@ -115,7 +115,7 @@ class BASE_EXPORT CPU final { const std::string& cpu_brand() const { return cpu_brand_; } #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc b/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc index c8566ea0cc20..602edeaabf1e 100644 --- a/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc +++ b/www/ungoogled-chromium/files/patch-base_i18n_icu__util.cc @@ -1,6 +1,6 @@ ---- base/i18n/icu_util.cc.orig 2022-10-29 17:50:56 UTC +--- base/i18n/icu_util.cc.orig 2022-12-02 17:56:32 UTC +++ base/i18n/icu_util.cc -@@ -53,7 +53,7 @@ +@@ -52,7 +52,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 -@@ -344,7 +344,7 @@ void InitializeIcuTimeZone() { +@@ -343,7 +343,7 @@ void InitializeIcuTimeZone() { FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); diff --git a/www/ungoogled-chromium/files/patch-base_memory_discardable__memory.cc b/www/ungoogled-chromium/files/patch-base_memory_discardable__memory.cc index 5ab46fa58774..b3b2a5143c0c 100644 --- a/www/ungoogled-chromium/files/patch-base_memory_discardable__memory.cc +++ b/www/ungoogled-chromium/files/patch-base_memory_discardable__memory.cc @@ -1,15 +1,15 @@ ---- base/memory/discardable_memory.cc.orig 2022-10-01 07:40:07 UTC +--- base/memory/discardable_memory.cc.orig 2022-12-02 17:56:32 UTC +++ base/memory/discardable_memory.cc -@@ -25,7 +25,7 @@ const base::Feature kMadvFreeDiscardableMemory{ - "MadvFreeDiscardableMemory", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -26,7 +26,7 @@ BASE_FEATURE(kMadvFreeDiscardableMemory, + base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_POSIX) -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const base::Feature kDiscardableMemoryBackingTrial{ - "DiscardableMemoryBackingTrial", base::FEATURE_DISABLED_BY_DEFAULT}; - -@@ -50,7 +50,7 @@ const base::FeatureParam<DiscardableMemoryTrialGroup> + BASE_FEATURE(kDiscardableMemoryBackingTrial, + "DiscardableMemoryBackingTrial", + base::FEATURE_DISABLED_BY_DEFAULT); +@@ -52,7 +52,7 @@ const base::FeatureParam<DiscardableMemoryTrialGroup> namespace { @@ -18,7 +18,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { DiscardableMemoryTrialGroup trial_group = -@@ -69,7 +69,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { +@@ -71,7 +71,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { } // namespace @@ -27,7 +27,7 @@ // Probe capabilities of this device to determine whether we should participate // in the discardable memory backing trial. -@@ -99,7 +99,7 @@ DiscardableMemory::DiscardableMemory() = default; +@@ -101,7 +101,7 @@ DiscardableMemory::DiscardableMemory() = default; DiscardableMemory::~DiscardableMemory() = default; DiscardableMemoryBacking GetDiscardableMemoryBacking() { diff --git a/www/ungoogled-chromium/files/patch-base_process_process__metrics.h b/www/ungoogled-chromium/files/patch-base_process_process__metrics.h index 11ce2d0f7551..11c0fa95a9d8 100644 --- a/www/ungoogled-chromium/files/patch-base_process_process__metrics.h +++ b/www/ungoogled-chromium/files/patch-base_process_process__metrics.h @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2022-10-29 17:50:56 UTC +--- base/process/process_metrics.h.orig 2022-12-02 17:56:32 UTC +++ base/process/process_metrics.h @@ -36,7 +36,7 @@ #endif @@ -118,7 +118,7 @@ // Parse the data found in /proc/<pid>/stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. -@@ -621,7 +619,7 @@ class BASE_EXPORT SystemMetrics { +@@ -622,7 +620,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; diff --git a/www/ungoogled-chromium/files/patch-base_rand__util.h b/www/ungoogled-chromium/files/patch-base_rand__util.h index d592b86591a8..dea2d8dc4e36 100644 --- a/www/ungoogled-chromium/files/patch-base_rand__util.h +++ b/www/ungoogled-chromium/files/patch-base_rand__util.h @@ -1,6 +1,6 @@ ---- base/rand_util.h.orig 2022-10-29 17:50:56 UTC +--- base/rand_util.h.orig 2022-12-02 17:56:32 UTC +++ base/rand_util.h -@@ -89,7 +89,7 @@ void RandomShuffle(Itr first, Itr last) { +@@ -117,7 +117,7 @@ void RandomShuffle(Itr first, Itr last) { std::shuffle(first, last, RandomBitGenerator()); } diff --git a/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc b/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc index 42572f8e0a6d..30f57169df85 100644 --- a/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc @@ -1,4 +1,4 @@ ---- base/rand_util_posix.cc.orig 2022-10-29 17:50:56 UTC +--- base/rand_util_posix.cc.orig 2022-12-02 17:56:32 UTC +++ base/rand_util_posix.cc @@ -22,7 +22,7 @@ #include "base/time/time.h" @@ -30,15 +30,15 @@ // TODO(pasko): Unify reading kernel version numbers in: // mojo/core/channel_linux.cc // chrome/browser/android/seccomp_support_detector.cc -@@ -172,6 +174,7 @@ bool UseBoringSSLForRandBytes() { - } // namespace internal +@@ -176,6 +178,7 @@ bool UseBoringSSLForRandBytes() { + namespace { - void RandBytes(void* output, size_t output_length) { + void RandBytes(void* output, size_t output_length, bool avoid_allocation) { +#if !BUILDFLAG(IS_BSD) #if !BUILDFLAG(IS_NACL) // The BoringSSL experiment takes priority over everything else. - if (internal::UseBoringSSLForRandBytes()) { -@@ -210,11 +213,16 @@ void RandBytes(void* output, size_t output_length) { + if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) { +@@ -214,6 +217,9 @@ void RandBytes(void* output, size_t output_length, boo const bool success = ReadFromFD(urandom_fd, static_cast<char*>(output), output_length); CHECK(success); @@ -47,6 +47,11 @@ +#endif } + } // namespace +@@ -233,9 +239,11 @@ void RandBytes(void* output, size_t output_length) { + RandBytes(output, output_length, /*avoid_allocation=*/false); + } + +#if !BUILDFLAG(IS_BSD) int GetUrandomFD() { static NoDestructor<URandomFd> urandom_fd; diff --git a/www/ungoogled-chromium/files/patch-base_strings_safe__sprintf__unittest.cc b/www/ungoogled-chromium/files/patch-base_strings_safe__sprintf__unittest.cc index 25eefa3de232..81e742a7d570 100644 --- a/www/ungoogled-chromium/files/patch-base_strings_safe__sprintf__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_strings_safe__sprintf__unittest.cc @@ -1,6 +1,6 @@ ---- base/strings/safe_sprintf_unittest.cc.orig 2022-10-01 07:40:07 UTC +--- base/strings/safe_sprintf_unittest.cc.orig 2022-12-02 17:56:32 UTC +++ base/strings/safe_sprintf_unittest.cc -@@ -732,6 +732,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) { +@@ -740,6 +740,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) { #endif } @@ -8,7 +8,7 @@ TEST(SafeSPrintfTest, EmitNULL) { char buf[40]; #if defined(__GNUC__) -@@ -748,6 +749,7 @@ TEST(SafeSPrintfTest, EmitNULL) { +@@ -756,6 +757,7 @@ TEST(SafeSPrintfTest, EmitNULL) { #pragma GCC diagnostic pop #endif } diff --git a/www/ungoogled-chromium/files/patch-base_system_sys__info.h b/www/ungoogled-chromium/files/patch-base_system_sys__info.h index c0f1f4ab8fb7..3775da000137 100644 --- a/www/ungoogled-chromium/files/patch-base_system_sys__info.h +++ b/www/ungoogled-chromium/files/patch-base_system_sys__info.h @@ -1,15 +1,15 @@ ---- base/system/sys_info.h.orig 2022-10-01 07:40:07 UTC +--- base/system/sys_info.h.orig 2022-12-02 17:56:32 UTC +++ base/system/sys_info.h -@@ -211,6 +211,8 @@ class BASE_EXPORT SysInfo { - // On Desktop this returns true when memory <= 2GB. - static bool IsLowEndDevice(); +@@ -233,6 +233,8 @@ class BASE_EXPORT SysInfo { + static void SetIsCpuSecurityMitigationsEnabled(bool is_enabled); + #endif + static uint64_t MaxSharedMemorySize(); + private: FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); -@@ -221,7 +223,7 @@ class BASE_EXPORT SysInfo { +@@ -243,7 +245,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/ungoogled-chromium/files/patch-base_system_sys__info__posix.cc b/www/ungoogled-chromium/files/patch-base_system_sys__info__posix.cc index 6dd83fe626eb..40bc6475a7e8 100644 --- a/www/ungoogled-chromium/files/patch-base_system_sys__info__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_system_sys__info__posix.cc @@ -1,38 +1,21 @@ ---- base/system/sys_info_posix.cc.orig 2022-10-01 07:40:07 UTC +--- base/system/sys_info_posix.cc.orig 2022-12-02 17:56:32 UTC +++ base/system/sys_info_posix.cc -@@ -37,7 +37,7 @@ +@@ -182,12 +182,12 @@ absl::optional<int> NumberOfPhysicalProcessors() { - namespace { - --#if !BUILDFLAG(IS_OPENBSD) -+#if !BUILDFLAG(IS_BSD) - int NumberOfProcessors() { - // sysconf returns the number of "logical" (not "physical") processors on both - // Mac and Linux. So we get the number of max available "logical" processors. -@@ -77,7 +77,7 @@ int NumberOfProcessors() { - - base::LazyInstance<base::internal::LazySysInfoValue<int, NumberOfProcessors>>:: - Leaky g_lazy_number_of_processors = LAZY_INSTANCE_INITIALIZER; --#endif // !BUILDFLAG(IS_OPENBSD) -+#endif // !BUILDFLAG(IS_BSD) - - uint64_t AmountOfVirtualMemory() { - struct rlimit limit; -@@ -144,11 +144,11 @@ bool GetDiskSpaceInfo(const base::FilePath& path, - - namespace base { + } // namespace internal -#if !BUILDFLAG(IS_OPENBSD) +#if !BUILDFLAG(IS_BSD) int SysInfo::NumberOfProcessors() { - return g_lazy_number_of_processors.Get().value(); + static int number_of_processors = internal::NumberOfProcessors(); + return number_of_processors; } -#endif // !BUILDFLAG(IS_OPENBSD) +#endif // !BUILDFLAG(IS_BSD) // static uint64_t SysInfo::AmountOfVirtualMemory() { -@@ -238,6 +238,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -277,6 +277,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; @@ -41,3 +24,10 @@ } else if (std::string(info.sysname) == "AIX") { arch = "ppc64"; } +@@ -300,4 +302,4 @@ void SysInfo::SetIsCpuSecurityMitigationsEnabled(bool + + #endif // BUILDFLAG(IS_MAC) + +-} // namespace base +\ No newline at end of file ++} // namespace base diff --git a/www/ungoogled-chromium/files/patch-base_system_sys__info__unittest.cc b/www/ungoogled-chromium/files/patch-base_system_sys__info__unittest.cc index 2f28252e1ba3..95cc977693b1 100644 --- a/www/ungoogled-chromium/files/patch-base_system_sys__info__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_system_sys__info__unittest.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_unittest.cc.orig 2022-10-01 07:40:07 UTC +--- base/system/sys_info_unittest.cc.orig 2022-12-02 17:56:32 UTC +++ base/system/sys_info_unittest.cc -@@ -234,12 +234,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) { +@@ -255,12 +255,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/ungoogled-chromium/files/patch-base_threading_platform__thread__linux.cc b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__linux.cc index d7ac0d9a78dd..a837b6d17329 100644 --- a/www/ungoogled-chromium/files/patch-base_threading_platform__thread__linux.cc +++ b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__linux.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_linux.cc.orig 2022-10-01 07:40:07 UTC +--- base/threading/platform_thread_linux.cc.orig 2022-12-02 17:56:32 UTC +++ base/threading/platform_thread_linux.cc @@ -29,7 +29,9 @@ @@ -10,7 +10,7 @@ #include <sys/resource.h> #include <sys/time.h> #include <sys/types.h> -@@ -132,7 +134,7 @@ long sched_setattr(pid_t pid, +@@ -134,7 +136,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"); -@@ -304,7 +306,7 @@ void SetThreadCgroupsForThreadType(PlatformThreadId th +@@ -306,7 +308,7 @@ void SetThreadCgroupsForThreadType(PlatformThreadId th namespace internal { namespace { @@ -28,7 +28,7 @@ const struct sched_param kRealTimePrio = {8}; #endif } // namespace -@@ -330,7 +332,7 @@ const ThreadTypeToNiceValuePair kThreadTypeToNiceValue +@@ -332,7 +334,7 @@ const ThreadTypeToNiceValuePair kThreadTypeToNiceValue }; bool CanSetThreadTypeToRealtimeAudio() { @@ -37,7 +37,7 @@ // A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke // pthread_setschedparam in SetCurrentThreadTypeForPlatform(). struct rlimit rlim; -@@ -342,7 +344,7 @@ bool CanSetThreadTypeToRealtimeAudio() { +@@ -344,7 +346,7 @@ bool CanSetThreadTypeToRealtimeAudio() { bool SetCurrentThreadTypeForPlatform(ThreadType thread_type, MessagePumpType pump_type_hint) { @@ -46,7 +46,7 @@ // For legacy schedtune interface SetThreadCgroupsForThreadType(PlatformThread::CurrentId(), thread_type); -@@ -361,7 +363,7 @@ bool SetCurrentThreadTypeForPlatform(ThreadType thread +@@ -363,7 +365,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, -@@ -380,7 +382,7 @@ GetCurrentThreadPriorityForPlatformForTest() { +@@ -382,7 +384,7 @@ GetCurrentThreadPriorityForPlatformForTest() { void PlatformThread::SetName(const std::string& name) { ThreadIdNameManager::GetInstance()->SetName(name); @@ -64,7 +64,7 @@ // On linux we can get the thread names to show up in the debugger by setting // the process name for the LWP. We don't want to do this for the main // thread because that would rename the process, causing tools like killall -@@ -410,8 +412,10 @@ void PlatformThread::SetThreadType(ProcessId process_i +@@ -412,8 +414,10 @@ void PlatformThread::SetThreadType(ProcessId process_i // priority. CHECK_NE(thread_id, process_id); diff --git a/www/ungoogled-chromium/files/patch-base_threading_platform__thread__posix.cc b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__posix.cc index aaf298d29dab..47507fc0c6de 100644 --- a/www/ungoogled-chromium/files/patch-base_threading_platform__thread__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_threading_platform__thread__posix.cc @@ -1,6 +1,6 @@ ---- base/threading/platform_thread_posix.cc.orig 2022-10-29 17:50:56 UTC +--- base/threading/platform_thread_posix.cc.orig 2022-12-02 17:56:32 UTC +++ base/threading/platform_thread_posix.cc -@@ -77,7 +77,7 @@ void* ThreadFunc(void* params) { +@@ -78,7 +78,7 @@ void* ThreadFunc(void* params) { if (!thread_params->joinable) base::DisallowSingleton(); @@ -9,7 +9,7 @@ #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(STARSCAN) partition_alloc::internal::PCScan::NotifyThreadCreated( partition_alloc::internal::GetStackPointer()); -@@ -374,6 +374,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, +@@ -380,6 +380,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, MessagePumpType pump_type_hint) { #if BUILDFLAG(IS_NACL) NOTIMPLEMENTED(); diff --git a/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn b/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn index c7e0f42885fe..9ab05e4345df 100644 --- a/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2022-11-09 11:19:08 UTC +--- build/config/compiler/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ build/config/compiler/BUILD.gn -@@ -222,13 +222,16 @@ config("default_include_dirs") { +@@ -219,13 +219,16 @@ config("default_include_dirs") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. config("no_unresolved_symbols") { @@ -18,7 +18,7 @@ } # compiler --------------------------------------------------------------------- -@@ -452,6 +455,10 @@ config("compiler") { +@@ -449,6 +452,10 @@ config("compiler") { } } @@ -29,7 +29,7 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_gold) { -@@ -527,7 +534,7 @@ config("compiler") { +@@ -524,7 +531,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -38,7 +38,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] # TODO(hans): Remove this once Clang generates better optimized debug info -@@ -913,7 +920,7 @@ config("compiler_cpu_abi") { +@@ -924,7 +931,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -47,7 +47,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -928,7 +935,7 @@ config("compiler_cpu_abi") { +@@ -939,7 +946,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -56,7 +56,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1256,7 +1263,7 @@ config("compiler_deterministic") { +@@ -1277,7 +1284,7 @@ config("compiler_deterministic") { # different build directory like "out/feature_a" and "out/feature_b" if # we build same files with same compile flag. # Other paths are already given in relative, no need to normalize them. @@ -65,7 +65,7 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1307,7 +1314,7 @@ config("compiler_deterministic") { +@@ -1329,7 +1336,7 @@ config("compiler_deterministic") { } config("clang_revision") { @@ -74,7 +74,7 @@ update_args = [ "--print-revision", "--verify-version=$clang_version", -@@ -1544,7 +1551,7 @@ config("default_warnings") { +@@ -1570,7 +1577,7 @@ config("default_warnings") { "-Wno-ignored-pragma-optimize", ] @@ -83,7 +83,7 @@ cflags += [ # TODO(crbug.com/1343975) Evaluate and possibly enable. "-Wno-deprecated-builtins", -@@ -1727,7 +1734,7 @@ config("no_chromium_code") { +@@ -1749,7 +1756,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] @@ -92,7 +92,7 @@ cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -2249,7 +2256,7 @@ config("afdo_optimize_size") { +@@ -2271,7 +2278,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") { @@ -101,7 +101,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2265,7 +2272,7 @@ config("afdo") { +@@ -2287,7 +2294,7 @@ config("afdo") { cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ] inputs = [ _clang_sample_profile ] } @@ -110,7 +110,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2413,7 +2420,8 @@ config("symbols") { +@@ -2436,7 +2443,8 @@ config("symbols") { configs += [ "//build/config:compress_debug_sections" ] } diff --git a/www/ungoogled-chromium/files/patch-build_linux_unbundle_replace__gn__files.py b/www/ungoogled-chromium/files/patch-build_linux_unbundle_replace__gn__files.py index f39149c396dd..8cea9aed65c9 100644 --- a/www/ungoogled-chromium/files/patch-build_linux_unbundle_replace__gn__files.py +++ b/www/ungoogled-chromium/files/patch-build_linux_unbundle_replace__gn__files.py @@ -1,6 +1,6 @@ ---- build/linux/unbundle/replace_gn_files.py.orig 2022-10-01 07:40:07 UTC +--- build/linux/unbundle/replace_gn_files.py.orig 2022-12-02 17:56:32 UTC +++ build/linux/unbundle/replace_gn_files.py -@@ -52,6 +52,7 @@ REPLACEMENTS = { +@@ -53,6 +53,7 @@ REPLACEMENTS = { 'libjpeg': 'third_party/libjpeg.gni', 'libjxl' : 'third_party/libjxl/BUILD.gn', 'libpng': 'third_party/libpng/BUILD.gn', diff --git a/www/ungoogled-chromium/files/patch-cc_BUILD.gn b/www/ungoogled-chromium/files/patch-cc_BUILD.gn index a4554f2c55e9..ac0fb453eef1 100644 --- a/www/ungoogled-chromium/files/patch-cc_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-cc_BUILD.gn @@ -1,6 +1,6 @@ ---- cc/BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- cc/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ cc/BUILD.gn -@@ -664,7 +664,7 @@ cc_test_static_library("test_support") { +@@ -666,7 +666,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -892,7 +892,6 @@ cc_test("cc_unittests") { +@@ -894,7 +894,6 @@ cc_test("cc_unittests") { data = [ "//components/viz/test/data/" ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc index b6f70250444e..1430a5d4d7fb 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -128,7 +128,7 @@ +@@ -135,7 +135,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 -@@ -171,16 +171,16 @@ +@@ -179,16 +179,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 -@@ -336,7 +336,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -344,7 +344,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 -@@ -422,7 +422,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -429,7 +429,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) || -@@ -513,7 +513,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -518,7 +518,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. -@@ -596,7 +596,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -601,7 +601,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -65,16 +65,16 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::RecordStartupProcessCreationTime( -@@ -832,6 +832,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() { - // not always enabled on Linux/ChromeOS. - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -848,6 +848,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() { + // not always enabled on ChromeOS. + #if BUILDFLAG(IS_CHROMEOS) bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled(); +#elif BUILDFLAG(IS_BSD) + bool enable_gwp_asan = false; #else bool enable_gwp_asan = true; #endif -@@ -892,7 +894,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { +@@ -908,7 +910,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { base::internal::TimerBase::InitializeFeatures(); base::InitializeCpuReductionExperiment(); base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures(); @@ -82,8 +82,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) base::MessagePumpLibevent::InitializeFeatures(); #elif BUILDFLAG(IS_MAC) - base::PlatformThread::InitializeOptimizedRealtimeThreadingFeature(); -@@ -982,7 +984,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo + base::PlatformThread::InitFeaturesPostFieldTrial(); +@@ -1017,7 +1019,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 -@@ -1012,7 +1014,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo +@@ -1047,7 +1049,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -101,7 +101,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1402,7 +1404,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1437,7 +1439,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)) { -@@ -1478,7 +1480,7 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1517,7 +1519,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/ungoogled-chromium/files/patch-chrome_app_chromium__strings.grd b/www/ungoogled-chromium/files/patch-chrome_app_chromium__strings.grd index 332a015cc721..5fed98fc1f09 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_chromium__strings.grd +++ b/www/ungoogled-chromium/files/patch-chrome_app_chromium__strings.grd @@ -1,4 +1,4 @@ ---- chrome/app/chromium_strings.grd.orig 2022-10-01 07:40:07 UTC +--- chrome/app/chromium_strings.grd.orig 2022-12-02 17:56:32 UTC +++ chrome/app/chromium_strings.grd @@ -296,7 +296,7 @@ If you update this file, be sure also to update google Welcome to Chromium; new browser window opened @@ -9,8 +9,8 @@ <message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar"> Welcome to Chromium </message> -@@ -410,7 +410,7 @@ If you update this file, be sure also to update google - Chromium may not function correctly because it is no longer supported on Windows XP or Windows Vista +@@ -425,7 +425,7 @@ If you update this file, be sure also to update google + To get future Chromium updates, you'll need Windows 10 or later. This computer is using Windows 8.1. </message> </if> - <if expr="is_linux"> diff --git a/www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd b/www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd index ae7cfab30cfe..83bd4dac6b21 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/ungoogled-chromium/files/patch-chrome_app_generated__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/generated_resources.grd.orig 2022-10-29 17:50:56 UTC +--- chrome/app/generated_resources.grd.orig 2022-12-02 17:56:32 UTC +++ chrome/app/generated_resources.grd @@ -2,7 +2,7 @@ @@ -9,7 +9,7 @@ for making strings OS specific. Other platform defines such as use_titlecase are declared in tools/grit/grit_rule.gni. --> -@@ -3081,7 +3081,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3090,7 +3090,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> -@@ -4811,7 +4811,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4820,7 +4820,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> -@@ -5469,7 +5469,7 @@ Keep your key file in a safe place. You will need it t +@@ -5487,7 +5487,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> -@@ -5497,7 +5497,7 @@ Keep your key file in a safe place. You will need it t +@@ -5515,7 +5515,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> -@@ -8984,7 +8984,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -9106,7 +9106,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> -@@ -10195,7 +10195,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -10404,7 +10404,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> -@@ -12285,7 +12285,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -12500,7 +12500,7 @@ Please help our engineers fix this problem. Tell us wh Open Anyway </message> diff --git a/www/ungoogled-chromium/files/patch-chrome_app_google__chrome__strings.grd b/www/ungoogled-chromium/files/patch-chrome_app_google__chrome__strings.grd index 16fab79ee3b7..0d95688d0459 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/ungoogled-chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,4 +1,4 @@ ---- chrome/app/google_chrome_strings.grd.orig 2022-10-01 07:40:07 UTC +--- chrome/app/google_chrome_strings.grd.orig 2022-12-02 17:56:32 UTC +++ chrome/app/google_chrome_strings.grd @@ -301,7 +301,7 @@ chromium_strings.grd. --> Welcome to Chrome; new browser window opened @@ -9,8 +9,8 @@ <message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar"> Welcome to Google Chrome </message> -@@ -438,7 +438,7 @@ chromium_strings.grd. --> - This computer will no longer receive Google Chrome updates because Windows XP and Windows Vista are no longer supported +@@ -453,7 +453,7 @@ chromium_strings.grd. --> + To get future Google Chrome updates, you'll need Windows 10 or later. This computer is using Windows 8.1. </message> </if> - <if expr="is_linux"> diff --git a/www/ungoogled-chromium/files/patch-chrome_app_settings__strings.grdp b/www/ungoogled-chromium/files/patch-chrome_app_settings__strings.grdp index f5b17bcb38a7..9e3ed97c6597 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_settings__strings.grdp +++ b/www/ungoogled-chromium/files/patch-chrome_app_settings__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/settings_strings.grdp.orig 2022-10-29 17:50:56 UTC +--- chrome/app/settings_strings.grdp.orig 2022-12-02 17:56:32 UTC +++ chrome/app/settings_strings.grdp -@@ -137,7 +137,7 @@ +@@ -142,7 +142,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> -@@ -157,7 +157,7 @@ +@@ -162,7 +162,7 @@ Use Classic </message> </if> diff --git a/www/ungoogled-chromium/files/patch-chrome_app_theme_theme__resources.grd b/www/ungoogled-chromium/files/patch-chrome_app_theme_theme__resources.grd index 7a7cb7596c9d..c4bfad4e4a32 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_theme_theme__resources.grd +++ b/www/ungoogled-chromium/files/patch-chrome_app_theme_theme__resources.grd @@ -1,6 +1,6 @@ ---- chrome/app/theme/theme_resources.grd.orig 2022-10-29 17:50:56 UTC +--- chrome/app/theme/theme_resources.grd.orig 2022-12-02 17:56:32 UTC +++ chrome/app/theme/theme_resources.grd -@@ -131,7 +131,7 @@ +@@ -135,7 +135,7 @@ </if> <if expr="_google_chrome"> <then> @@ -9,7 +9,7 @@ <then> <if expr="_google_chrome_for_testing"> <then> -@@ -148,7 +148,7 @@ +@@ -152,7 +152,7 @@ </else> </if> <!-- _google_chrome_for_testing --> </then> @@ -18,7 +18,7 @@ <if expr="not is_android"> <if expr="_google_chrome_for_testing"> <then> -@@ -172,7 +172,7 @@ +@@ -176,7 +176,7 @@ </else> </if> <!-- _google_chrome_for_testing --> </else> @@ -27,7 +27,7 @@ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_CANARY" file="google_chrome/product_logo_32_canary.png" /> <if expr="not is_android"> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="google_chrome/product_logo_name_22.png" /> -@@ -182,7 +182,7 @@ +@@ -186,7 +186,7 @@ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_ENTERPRISE_WHITE" file="google_chrome/product_logo_enterprise_white.png" /> </then> <else> <!-- not _google_chrome --> @@ -36,7 +36,7 @@ <then> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/linux/product_logo_16.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/linux/product_logo_32.png" /> -@@ -191,7 +191,7 @@ +@@ -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" /> </else> diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc index 2c0205376c1a..f284869e51f6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/about_flags.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/about_flags.cc -@@ -215,7 +215,7 @@ +@@ -216,7 +216,7 @@ #include "ui/native_theme/native_theme_features.h" #include "ui/ui_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -290,7 +290,7 @@ +@@ -292,7 +292,7 @@ #include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h" // nogncheck #endif // ENABLE_SUPERVISED_USERS @@ -18,7 +18,7 @@ #include "ui/ozone/buildflags.h" #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -395,7 +395,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -399,7 +399,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -27,7 +27,7 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -1255,7 +1255,7 @@ const FeatureEntry::FeatureVariation +@@ -1323,7 +1323,7 @@ const FeatureEntry::FeatureVariation }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -36,7 +36,7 @@ const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, {"DocumentUseClientScore", "false"}, -@@ -4079,7 +4079,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4189,7 +4189,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(base::kOneGroupPerRenderer)}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -45,7 +45,7 @@ { "enable-accelerated-video-decode", flag_descriptions::kAcceleratedVideoDecodeName, -@@ -4667,7 +4667,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4791,7 +4791,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -54,7 +54,7 @@ {"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName, flag_descriptions::kOzonePlatformHintDescription, kOsLinux, MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)}, -@@ -4686,7 +4686,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4810,7 +4810,7 @@ const FeatureEntry kFeatureEntries[] = { password_manager::features::kForceInitialSyncWhenDecryptionFails)}, #endif // BUILDFLAG(IS_LINUX) @@ -63,7 +63,7 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -4946,7 +4946,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5070,7 +5070,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(feed::kDiscoFeedEndpoint)}, #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -72,7 +72,7 @@ {"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName, flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop, FEATURE_VALUE_TYPE(feed::kWebUiFeed)}, -@@ -5487,7 +5487,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5640,7 +5640,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -81,7 +81,7 @@ {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -6025,7 +6025,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6220,7 +6220,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kPointerLockOptionsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kPointerLockOptions)}, @@ -90,7 +90,7 @@ {"enable-async-dns", flag_descriptions::kAsyncDnsName, flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, FEATURE_VALUE_TYPE(features::kAsyncDns)}, -@@ -6969,7 +6969,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7193,7 +7193,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -99,7 +99,7 @@ {"global-media-controls-modern-ui", flag_descriptions::kGlobalMediaControlsModernUIName, flag_descriptions::kGlobalMediaControlsModernUIDescription, -@@ -7839,7 +7839,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8066,7 +8066,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -108,7 +108,7 @@ {"quick-commands", flag_descriptions::kQuickCommandsName, flag_descriptions::kQuickCommandsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kQuickCommands)}, -@@ -8154,7 +8154,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8357,7 +8357,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -117,7 +117,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -8763,7 +8763,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8975,7 +8975,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc index caf80fd6399d..5f0ef2cf683f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc @@ -1,11 +1,11 @@ ---- chrome/browser/browser_features.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/browser_features.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/browser_features.cc -@@ -29,7 +29,7 @@ const base::Feature kColorProviderRedirectionForThemeP +@@ -30,7 +30,7 @@ BASE_FEATURE(kColorProviderRedirectionForThemeProvider // the browser exits. - const base::Feature kDestroyProfileOnBrowserClose { - "DestroyProfileOnBrowserClose", + BASE_FEATURE(kDestroyProfileOnBrowserClose, + "DestroyProfileOnBrowserClose", -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - }; + base::FEATURE_ENABLED_BY_DEFAULT); #else + base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc index 0ac6d200c53d..b766fd2d6fec 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/browser_process_impl.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/browser_process_impl.cc -@@ -213,7 +213,7 @@ +@@ -214,7 +214,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif @@ -18,7 +18,7 @@ ChromeJsErrorReportProcessor::Create(); #endif -@@ -1401,7 +1401,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1405,7 +1405,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/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc index c27203198c15..1f1f518a3f31 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -112,13 +112,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 -@@ -188,7 +188,7 @@ +@@ -190,7 +190,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" -@@ -799,7 +799,7 @@ void PopulateChromeFrameBinders( +@@ -807,7 +807,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)); -@@ -807,7 +807,7 @@ void PopulateChromeFrameBinders( +@@ -815,7 +815,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 -@@ -872,14 +872,14 @@ void PopulateChromeWebUIFrameBinders( +@@ -880,14 +880,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 -@@ -1270,7 +1270,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1271,7 +1271,7 @@ void PopulateChromeWebUIFrameBinders( #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc index 62a12a1441e8..007f84a8506e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,4 +1,4 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/chrome_browser_main.cc @@ -239,11 +239,11 @@ @@ -11,10 +11,10 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "components/crash/core/app/breakpad_linux.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -279,7 +279,7 @@ + +@@ -278,7 +278,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -23,7 +23,7 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h" #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" -@@ -1030,7 +1030,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1048,7 +1048,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -32,16 +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 . -@@ -1043,7 +1043,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { - } - #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - // Set the product channel for crash reports. - if (!crash_reporter::IsCrashpadEnabled()) { - breakpad::SetChannelCrashKey( -@@ -1079,7 +1079,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1096,7 +1096,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/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc index b87cdc7e6940..0c88e6ed28b2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/chrome_browser_main_posix.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/chrome_browser_main_posix.cc -@@ -72,7 +72,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa +@@ -73,7 +73,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa } else { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index 61cfea1f6902..2c8e20b8acde 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -387,7 +387,7 @@ +@@ -392,7 +392,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" -@@ -471,17 +471,17 @@ +@@ -477,12 +477,12 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -24,13 +24,7 @@ #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif - --#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) - #if !BUILDFLAG(IS_ANDROID) - #include "base/debug/leak_annotations.h" - #include "components/crash/core/app/breakpad_linux.h" -@@ -489,13 +489,13 @@ +@@ -491,13 +491,13 @@ #include "components/crash/content/browser/crash_handler_host_linux.h" #endif @@ -46,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) -@@ -524,11 +524,11 @@ +@@ -526,11 +526,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -60,16 +54,7 @@ #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif defined(USE_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -941,7 +941,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo - int GetCrashSignalFD(const base::CommandLine& command_line) { - return crashpad::CrashHandlerHost::Get()->GetDeathSignalSocket(); - } --#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) -+#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) - breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( - const std::string& process_type) { - base::FilePath dumps_path; -@@ -1504,7 +1504,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1512,7 +1512,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( is_integration_test, &startup_data_); @@ -78,7 +63,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1543,7 +1543,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1551,7 +1551,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. @@ -87,7 +72,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1564,7 +1564,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1572,7 +1572,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); #endif @@ -96,7 +81,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif defined(USE_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1583,7 +1583,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1591,7 +1591,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -105,16 +90,16 @@ main_parts->AddParts( std::make_unique< chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2352,6 +2352,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin - #elif BUILDFLAG(IS_POSIX) +@@ -2371,6 +2371,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin + #if(0) #if BUILDFLAG(IS_ANDROID) bool enable_crash_reporter = true; +#elif BUILDFLAG(IS_BSD) + bool enable_crash_reporter = false; - #else + #elif BUILDFLAG(IS_CHROMEOS) bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { -@@ -2705,7 +2707,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2735,7 +2737,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); @@ -123,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)) { -@@ -4155,7 +4157,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4182,7 +4184,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -132,7 +117,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4595,14 +4597,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4626,14 +4628,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -149,12 +134,12 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -4631,7 +4633,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4660,7 +4662,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati + } + #endif - // 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) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), + &throttles); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_content__settings_chrome__content__settings__utils.cc b/www/ungoogled-chromium/files/patch-chrome_browser_content__settings_chrome__content__settings__utils.cc new file mode 100644 index 000000000000..b98f8c715b01 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_content__settings_chrome__content__settings__utils.cc @@ -0,0 +1,11 @@ +--- chrome/browser/content_settings/chrome_content_settings_utils.cc.orig 2022-12-02 17:56:32 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/ungoogled-chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc b/www/ungoogled-chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc deleted file mode 100644 index 85f05d0bf3f6..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2022-10-01 07:40:07 UTC -+++ chrome/browser/crash_upload_list/crash_upload_list.cc -@@ -50,7 +50,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() { - // which isn't compatible with CrashUploadListCrashpad. crash_sender continues - // to log uploads in CrashUploadList::kReporterLogFilename. - // Linux is handled below. --#if !(BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) -+#if !(BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) - if (crash_reporter::IsCrashpadEnabled()) { - return new CrashUploadListCrashpad(); - } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__file__picker.cc b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__file__picker.cc index 023260b132d7..7526561fbcf5 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__file__picker.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__file__picker.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_file_picker.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/download/download_file_picker.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/download/download_file_picker.cc @@ -16,7 +16,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" -@@ -87,7 +87,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl +@@ -85,7 +85,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/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc index bb623ff263b8..dcf4be1e35ce 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_item_model.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/download/download_item_model.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/download/download_item_model.cc -@@ -735,7 +735,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -753,7 +753,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,8 +9,8 @@ if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); -@@ -777,7 +777,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand - DownloadCommands::ALWAYS_OPEN_TYPE); +@@ -796,7 +796,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) || \ - BUILDFLAG(IS_MAC) @@ -18,7 +18,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); -@@ -1089,7 +1089,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1126,7 +1126,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe return; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.cc index 0ed491509a14..9eba70d6085b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_prefs.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/download/download_prefs.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/download/download_prefs.cc @@ -13,6 +13,7 @@ #include "base/callback_helpers.h" @@ -46,7 +46,7 @@ registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif #if BUILDFLAG(IS_ANDROID) -@@ -472,7 +477,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens +@@ -464,7 +469,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -55,7 +55,7 @@ void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) return; -@@ -504,7 +509,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -496,7 +501,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons void DownloadPrefs::ResetAutoOpenByUser() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -64,7 +64,7 @@ SetShouldOpenPdfInSystemReader(false); #endif auto_open_by_user_.clear(); -@@ -535,7 +540,7 @@ void DownloadPrefs::SaveAutoOpenState() { +@@ -527,7 +532,7 @@ void DownloadPrefs::SaveAutoOpenState() { bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const { #if BUILDFLAG(IS_CHROMEOS) return false; // There is no UI for auto-open on ChromeOS. @@ -73,7 +73,7 @@ return ShouldOpenPdfInSystemReader(); #else return false; -@@ -659,7 +664,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa +@@ -651,7 +656,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa #else // If the stored download directory is an absolute path, we presume it's // correct; there's not really much more validation we can do here. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.h b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.h index befaa4cff36e..b8e9a50950d3 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_prefs.h.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/download/download_prefs.h.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/download/download_prefs.h -@@ -125,7 +125,7 @@ class DownloadPrefs { +@@ -118,7 +118,7 @@ class DownloadPrefs { void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ // Store the user preference to disk. If |should_open| is true, also disable // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin. void SetShouldOpenPdfInSystemReader(bool should_open); -@@ -185,7 +185,7 @@ class DownloadPrefs { +@@ -178,7 +178,7 @@ class DownloadPrefs { std::unique_ptr<policy::URLBlocklist> auto_open_allowed_by_urls_; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc index b04cc3339c5b..3b9cf6c3d09e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc @@ -11,11 +11,11 @@ #include "chrome/browser/profiles/profile.h" @@ -14,7 +14,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/browser/browser_device_trust_connector_service.h" #endif // BUILDFLAG(IS_MAC) #include "chrome/browser/policy/chrome_browser_policy_connector.h" -@@ -44,7 +44,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi +@@ -45,7 +45,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi bool DeviceTrustConnectorServiceFactory::ServiceIsCreatedWithBrowserContext() const { @@ -23,7 +23,7 @@ return IsDeviceTrustConnectorFeatureEnabled(); #else return false; -@@ -75,7 +75,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil +@@ -81,7 +81,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil DeviceTrustConnectorService* service = nullptr; @@ -32,7 +32,7 @@ if (IsDeviceTrustConnectorFeatureEnabled()) { auto* key_manager = g_browser_process->browser_policy_connector() ->chrome_browser_cloud_management_controller() -@@ -83,7 +83,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil +@@ -89,7 +89,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil #if BUILDFLAG(IS_MAC) service = new MacDeviceTrustConnectorService( key_manager, profile->GetPrefs(), g_browser_process->local_state()); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc index 227580763735..2fd7ab61fe76 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc -@@ -22,7 +22,7 @@ +@@ -21,7 +21,7 @@ #include "components/policy/core/common/management/management_service.h" #include "content/public/browser/browser_context.h" diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc index 2c6ecef19882..483b3d62a24e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc -@@ -15,7 +15,7 @@ +@@ -18,7 +18,7 @@ #include "chrome/browser/profiles/profile.h" #include "components/policy/core/common/management/management_service.h" @@ -9,9 +9,9 @@ #include "base/check.h" #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" -@@ -52,7 +52,7 @@ std::unique_ptr<SignalsService> CreateSignalsService( - decorators.push_back( - std::make_unique<ContentSignalsDecorator>(policy_blocklist_service)); +@@ -54,7 +54,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P + enterprise_signals::ContextInfoFetcher::CreateInstance( + profile, ConnectorsServiceFactory::GetForBrowserContext(profile)))); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc index 5c44c95d0aa1..eda7de992167 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/enterprise/signals/device_info_fetcher.cc @@ -10,7 +10,7 @@ #include "chrome/browser/enterprise/signals/device_info_fetcher_mac.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h" #endif -@@ -70,7 +70,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher:: +@@ -71,7 +71,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher:: return std::make_unique<DeviceInfoFetcherMac>(); #elif BUILDFLAG(IS_WIN) return std::make_unique<DeviceInfoFetcherWin>(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn index 242a57131bfd..aa0eaf58d284 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1325,6 +1325,10 @@ static_library("extensions") { +@@ -1322,6 +1322,10 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc index 3b4faf05fd29..71de23b5e08b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc -@@ -6,7 +6,7 @@ +@@ -8,7 +8,7 @@ #include "build/build_config.h" diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc index 27208f428ecb..5fd3a354b356 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc @@ -32,7 +32,7 @@ #include "components/reporting/util/statusor.h" @@ -9,7 +9,7 @@ #include "base/strings/string_util.h" #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" #include "chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h" -@@ -107,7 +107,7 @@ api::enterprise_reporting_private::ContextInfo ToConte +@@ -105,7 +105,7 @@ api::enterprise_reporting_private::ContextInfo ToConte return info; } @@ -18,7 +18,7 @@ device_signals::SignalsAggregationRequest CreateAggregationRequest( const std::string& user_id, -@@ -167,7 +167,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: +@@ -165,7 +165,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: // getPersistentSecret @@ -27,7 +27,7 @@ EnterpriseReportingPrivateGetPersistentSecretFunction:: EnterpriseReportingPrivateGetPersistentSecretFunction() = default; -@@ -592,7 +592,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: +@@ -590,7 +590,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: } #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h index 953ec81d8c7b..afb69701893d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h @@ -19,7 +19,7 @@ #include "components/reporting/proto/synced/record.pb.h" @@ -6,10 +6,10 @@ #include "components/reporting/util/statusor.h" -#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/time/time.h" #include "components/device_signals/core/browser/signals_types.h" #endif // BUILDFLAG(IS_CHROMEOS) - -@@ -54,7 +54,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction : +@@ -55,7 +55,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction : ~EnterpriseReportingPrivateGetDeviceIdFunction() override; }; @@ -18,7 +18,7 @@ class EnterpriseReportingPrivateGetPersistentSecretFunction : public ExtensionFunction { -@@ -264,7 +264,7 @@ class EnterpriseReportingPrivateEnqueueRecordFunction +@@ -265,7 +265,7 @@ class EnterpriseReportingPrivateEnqueueRecordFunction #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc index cfcac807a18c..aace916f549c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc +++ b/www/ungoogled-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 2022-10-29 17:50:56 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -494,7 +494,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall( +@@ -508,7 +508,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall( } void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index a6af478dcac0..8506f11c8f8f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/ungoogled-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-10-29 17:50:56 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -190,7 +190,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -189,7 +189,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 +@@ -201,7 +201,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/ungoogled-chromium/files/patch-chrome_browser_first__run_first__run__dialog.h b/www/ungoogled-chromium/files/patch-chrome_browser_first__run_first__run__dialog.h index 33184acb2312..4cde20ab20ba 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_first__run_first__run__dialog.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_first__run_first__run__dialog.h @@ -1,4 +1,4 @@ ---- chrome/browser/first_run/first_run_dialog.h.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/first_run/first_run_dialog.h.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/first_run/first_run_dialog.h @@ -12,7 +12,7 @@ // Hide this function on platforms where the dialog does not exist. @@ -7,5 +7,5 @@ -#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) - class Profile; + namespace first_run { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_first__run_first__run__internal.h b/www/ungoogled-chromium/files/patch-chrome_browser_first__run_first__run__internal.h index 4487d16175c3..83476c9f3b49 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_first__run_first__run__internal.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_first__run_first__run__internal.h @@ -1,6 +1,6 @@ ---- chrome/browser/first_run/first_run_internal.h.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/first_run/first_run_internal.h.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/first_run/first_run_internal.h -@@ -56,7 +56,7 @@ FirstRunState DetermineFirstRunState(bool has_sentinel +@@ -54,7 +54,7 @@ FirstRunState DetermineFirstRunState(bool has_sentinel bool force_first_run, bool no_first_run); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc index d3247757987f..285a1d7c7f12 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/flag_descriptions.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/flag_descriptions.cc -@@ -6387,7 +6387,7 @@ const char kSearchWebInSidePanelDescription[] = +@@ -6604,7 +6604,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."; -@@ -6396,7 +6396,7 @@ const char kQuickCommandsDescription[] = +@@ -6613,7 +6613,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."; -@@ -6410,7 +6410,7 @@ const char kWebShareDescription[] = +@@ -6627,7 +6627,7 @@ const char kWebShareDescription[] = "platforms."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -27,7 +27,7 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -6430,7 +6430,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -6647,7 +6647,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -36,7 +36,7 @@ const char kCleanUndecryptablePasswordsLinuxName[] = "Cleanup local undecryptable passwords during initial sync flow"; const char kCleanUndecryptablePasswordsLinuxDescription[] = -@@ -6443,7 +6443,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail +@@ -6660,7 +6660,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail "storage and requests initial sync."; #endif // BUILDFLAG(IS_LINUX) @@ -45,7 +45,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -6452,7 +6452,7 @@ const char kSkipUndecryptablePasswordsDescription[] = +@@ -6669,7 +6669,7 @@ const char kSkipUndecryptablePasswordsDescription[] = "there are undecryptable ones."; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -54,7 +54,7 @@ const char kAsyncDnsName[] = "Async DNS resolver"; const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -@@ -6557,7 +6557,7 @@ const char kElasticOverscrollDescription[] = +@@ -6774,7 +6774,7 @@ const char kElasticOverscrollDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h index dd3ffb811754..7293a640591d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.h.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/flag_descriptions.h.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/flag_descriptions.h -@@ -3664,7 +3664,7 @@ extern const char kSearchWebInSidePanelDescription[]; +@@ -3782,7 +3782,7 @@ extern const char kSearchWebInSidePanelDescription[]; // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ extern const char kQuickCommandsName[]; extern const char kQuickCommandsDescription[]; -@@ -3681,7 +3681,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -3799,7 +3799,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -18,7 +18,7 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -3697,18 +3697,18 @@ extern const char kForcePasswordInitialSyncWhenDecrypt +@@ -3815,18 +3815,18 @@ extern const char kForcePasswordInitialSyncWhenDecrypt extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[]; #endif // BUILDFLAG(IS_LINUX) @@ -40,7 +40,7 @@ extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -3785,7 +3785,7 @@ extern const char kElasticOverscrollDescription[]; +@@ -3903,7 +3903,7 @@ extern const char kElasticOverscrollDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_headless_headless__mode__util.cc b/www/ungoogled-chromium/files/patch-chrome_browser_headless_headless__mode__util.cc index 3437f21bd003..d295d001b395 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_headless_headless__mode__util.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_headless_headless__mode__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/headless/headless_mode_util.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/headless/headless_mode_util.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/headless/headless_mode_util.cc @@ -9,7 +9,7 @@ // Native headless is currently available on Linux, Windows and Mac platforms. @@ -15,10 +15,10 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/gl/gl_switches.h" #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) - -@@ -51,7 +51,7 @@ void SetUpCommandLine(const base::CommandLine* command +@@ -52,7 +52,7 @@ void SetUpCommandLine(const base::CommandLine* command base::CommandLine::ForCurrentProcess()->AppendSwitch( ::switches::kNoErrorDialogs); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index f64af9e430f8..929b543761a2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -58,8 +58,10 @@ +@@ -61,8 +61,10 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -12,7 +12,7 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" -@@ -491,7 +493,7 @@ void RecordStartupMetrics() { +@@ -494,7 +496,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc index 5cefdaa1ce51..21d90be5620e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -175,7 +175,7 @@ +@@ -176,7 +176,7 @@ #include "chrome/notification_helper/notification_helper_constants.h" #endif @@ -9,7 +9,7 @@ #include "components/metrics/motherboard_metrics_provider.h" #endif -@@ -722,7 +722,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -731,7 +731,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 -@@ -799,7 +799,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -810,7 +810,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>()); -@@ -891,7 +891,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -905,7 +905,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) -@@ -1074,7 +1074,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1090,7 +1090,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/ungoogled-chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc index cd82738dac34..2aa60230877f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/perf/cpu_identity.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/metrics/perf/cpu_identity.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/metrics/perf/cpu_identity.cc -@@ -106,7 +106,7 @@ CPUIdentity GetCPUIdentity() { +@@ -109,7 +109,7 @@ CPUIdentity GetCPUIdentity() { result.release = #if BUILDFLAG(IS_CHROMEOS_ASH) base::SysInfo::KernelVersion(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc index e75428d76597..eab12f4fe56d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc @@ -1,4 +1,4 @@ ---- chrome/browser/metrics/power/process_monitor.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/metrics/power/process_monitor.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/metrics/power/process_monitor.cc @@ -64,7 +64,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet #endif @@ -18,7 +18,7 @@ metrics->idle_wakeups *= factor; #endif -@@ -147,7 +147,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me +@@ -168,7 +168,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me lhs.cpu_usage += rhs.cpu_usage; #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_power_process__monitor.h b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_power_process__monitor.h index 006b5a25d322..bf7f9bbd9294 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_power_process__monitor.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_power_process__monitor.h @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/power/process_monitor.h.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/metrics/power/process_monitor.h.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/metrics/power/process_monitor.h -@@ -71,7 +71,7 @@ class ProcessMonitor : public content::BrowserChildPro +@@ -75,7 +75,7 @@ class ProcessMonitor : public content::BrowserChildPro double cpu_usage = 0.0; #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index 7670b3fc5882..3fdc9f1e7ac5 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,129 +1,11 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -190,12 +190,12 @@ - #include "components/spellcheck/browser/pref_names.h" - #endif // BUILDFLAG(ENABLE_SPELLCHECK) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "components/device_signals/core/browser/pref_names.h" - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - #include "chrome/browser/web_applications/policy/web_app_settings_policy_handler.h" - #endif - -@@ -705,7 +705,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - prefs::kManagedDefaultGeolocationSetting, - base::Value::Type::INTEGER }, - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ -- || BUILDFLAG(IS_FUCHSIA) -+ || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - { key::kRequireOnlineRevocationChecksForLocalAnchors, - prefs::kCertRevocationCheckingRequiredLocalAnchors, - base::Value::Type::BOOLEAN }, -@@ -1313,7 +1313,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::STRING }, - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - { key::kGSSAPILibraryName, - prefs::kGSSAPILibraryName, - base::Value::Type::STRING }, -@@ -1383,18 +1383,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - prefs::kTotalMemoryLimitMb, - base::Value::Type::INTEGER }, - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - { key::kBackgroundModeEnabled, - prefs::kBackgroundModeEnabled, - base::Value::Type::BOOLEAN }, - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - { key::kUnmanagedDeviceSignalsConsentFlowEnabled, - device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, - base::Value::Type::BOOLEAN }, - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ -- || BUILDFLAG(IS_FUCHSIA) -+ || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - { key::kDefaultBrowserSettingEnabled, - prefs::kDefaultBrowserSettingEnabled, - base::Value::Type::BOOLEAN }, -@@ -1407,7 +1407,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - // || BUILDFLAG(IS_FUCHSIA) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ -- || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - { key::kAutoplayAllowed, - prefs::kAutoplayAllowed, - base::Value::Type::BOOLEAN }, -@@ -1592,7 +1592,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::BOOLEAN }, - #endif // BUILDFLAG(IS_CHROMEOS) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - { key::kAuthNegotiateDelegateByKdcPolicy, - prefs::kAuthNegotiateDelegateByKdcPolicy, - base::Value::Type::BOOLEAN }, -@@ -1645,7 +1645,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - - #if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) \ -- || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA)) -+ || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA)) || BUILDFLAG(IS_BSD) - { key::kChromeAppsEnabled, - extensions::pref_names::kChromeAppsEnabled, - base::Value::Type::BOOLEAN }, -@@ -1702,7 +1702,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1718,7 +1718,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { key::kPrefixedStorageInfoEnabled, storage::kPrefixedStorageInfoEnabled, base::Value::Type::BOOLEAN }, --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#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) { key::kHighEfficiencyModeEnabled, performance_manager::user_tuning::prefs::kHighEfficiencyModeEnabled, base::Value::Type::BOOLEAN }, -@@ -1988,7 +1988,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH - key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, - chrome_schema)); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); - handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -2332,7 +2332,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH - chrome_schema)); - - #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) || -@@ -2345,7 +2345,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH - #endif - - #if BUILDFLAG(ENABLE_SPELLCHECK) --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); - handlers->AddHandler( - std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -2353,7 +2353,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH - #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) - #endif // BUILDFLAG(ENABLE_SPELLCHECK) - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - handlers->AddHandler(std::make_unique<SimplePolicyHandler>( - key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, - base::Value::Type::BOOLEAN)); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index 988b20277d9b..41fcf0cb2d0e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -439,14 +439,14 @@ +@@ -444,14 +444,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 -@@ -474,7 +474,7 @@ +@@ -479,7 +479,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( +@@ -976,7 +976,7 @@ void RegisterProfilePrefsForMigration( registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0); #endif @@ -35,7 +35,7 @@ // Deprecated 08/2022. registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false); #endif -@@ -1238,7 +1238,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1209,7 +1209,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) -@@ -1555,13 +1555,13 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1531,11 +1531,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry); #endif @@ -53,14 +53,12 @@ device_signals::RegisterProfilePrefs(registry); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif -@@ -1975,7 +1975,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { + +@@ -1932,7 +1932,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { profile_prefs->ClearPref(kProfileAvatarTutorialShown); #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index e7d145f61184..627a764a5905 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -257,7 +257,7 @@ +@@ -258,7 +258,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 -@@ -438,11 +438,11 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -439,11 +439,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/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc index 9fb16c944462..cc9182cf5d3e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_impl.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -264,6 +264,10 @@ +@@ -256,6 +256,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #endif @@ -11,7 +11,7 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -851,7 +855,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -826,7 +830,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_route.ts b/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_route.ts index 7574effbd82c..7054c53e944a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_route.ts +++ b/www/ungoogled-chromium/files/patch-chrome_browser_resources_settings_route.ts @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/route.ts.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/resources/settings/route.ts.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/resources/settings/route.ts -@@ -204,7 +204,7 @@ function createBrowserSettingsRoutes(): Partial<Settin +@@ -202,7 +202,7 @@ function createBrowserSettingsRoutes(): Partial<Settin r.ACCESSIBILITY = r.ADVANCED.createSection( '/accessibility', 'a11y', loadTimeData.getString('a11yPageTitle')); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_resources_signin_signin__shared.css b/www/ungoogled-chromium/files/patch-chrome_browser_resources_signin_signin__shared.css index 24a6235e5401..e78de5f52c8f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_resources_signin_signin__shared.css +++ b/www/ungoogled-chromium/files/patch-chrome_browser_resources_signin_signin__shared.css @@ -1,7 +1,7 @@ ---- chrome/browser/resources/signin/signin_shared.css.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/resources/signin/signin_shared.css.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/resources/signin/signin_shared.css -@@ -34,7 +34,7 @@ a { - padding: var(--action-container-padding); +@@ -54,7 +54,7 @@ a { + border-radius: var(--scrollbar-width); } -<if expr="is_macosx or is_linux or is_chromeos"> diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html b/www/ungoogled-chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html index 58690e6cbd1f..09e6443c9069 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html +++ b/www/ungoogled-chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html @@ -1,6 +1,6 @@ ---- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html -@@ -334,7 +334,7 @@ +@@ -336,7 +336,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} -@@ -344,7 +344,7 @@ +@@ -346,7 +346,7 @@ disabled="[[anyButtonClicked_]]"> $i18n{syncConfirmationUndoLabel} </cr-button> @@ -18,7 +18,7 @@ <cr-button id="settingsButton" on-click="onGoToSettings_" disabled="[[anyButtonClicked_]]" consent-confirmation> $i18n{syncConfirmationSettingsLabel} -@@ -387,7 +387,7 @@ +@@ -389,7 +389,7 @@ consent-confirmation> $i18n{syncConfirmationConfirmLabel} </cr-button> @@ -27,7 +27,7 @@ <cr-button id="settingsButton" on-click="onGoToSettings_" disabled="[[anyButtonClicked_]]" consent-confirmation> $i18n{syncConfirmationSettingsLabel} -@@ -397,7 +397,7 @@ +@@ -399,7 +399,7 @@ disabled="[[anyButtonClicked_]]"> $i18n{syncConfirmationUndoLabel} </cr-button> diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc index 20e2f02b3eef..83b462cbd63e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc -@@ -17,7 +17,7 @@ +@@ -18,7 +18,7 @@ #include "net/base/url_util.h" #include "third_party/abseil-cpp/absl/types/variant.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" #endif -@@ -297,7 +297,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil +@@ -321,7 +321,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil Profile* profile, const enterprise_connectors::AnalysisSettings& settings) { // Local content analysis is supported only on desktop platforms. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc index b67e29d16078..a1bd8cfca656 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc @@ -20,7 +20,7 @@ #include "content/public/browser/browser_thread.h" @@ -9,7 +9,7 @@ #include "chrome/browser/safe_browsing/download_protection/document_analysis_service.h" #endif -@@ -102,7 +102,7 @@ void FileAnalyzer::Start(const base::FilePath& target_ +@@ -100,7 +100,7 @@ void FileAnalyzer::Start(const base::FilePath& target_ } else if (inspection_type == DownloadFileType::DMG) { StartExtractDmgFeatures(); #endif @@ -18,7 +18,7 @@ } else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT) { StartExtractDocumentFeatures(); #endif -@@ -325,7 +325,7 @@ void FileAnalyzer::OnDmgAnalysisFinished( +@@ -326,7 +326,7 @@ void FileAnalyzer::OnDmgAnalysisFinished( } #endif // BUILDFLAG(IS_MAC) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h index 515716e9b749..3bae2e56c01d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h @@ -1,6 +1,6 @@ ---- chrome/browser/safe_browsing/download_protection/file_analyzer.h.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/safe_browsing/download_protection/file_analyzer.h.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/safe_browsing/download_protection/file_analyzer.h -@@ -17,7 +17,7 @@ +@@ -18,7 +18,7 @@ #include "components/safe_browsing/core/common/proto/csd.pb.h" #include "third_party/protobuf/src/google/protobuf/repeated_field.h" @@ -9,7 +9,7 @@ #include "chrome/services/file_util/public/cpp/sandboxed_document_analyzer.h" #endif -@@ -105,7 +105,7 @@ class FileAnalyzer { +@@ -106,7 +106,7 @@ class FileAnalyzer { const safe_browsing::ArchiveAnalyzerResults& archive_results); #endif @@ -18,7 +18,7 @@ void StartExtractDocumentFeatures(); void OnDocumentAnalysisFinished( const DocumentAnalyzerResults& document_results); -@@ -128,7 +128,7 @@ class FileAnalyzer { +@@ -133,7 +133,7 @@ class FileAnalyzer { scoped_refptr<SandboxedDMGAnalyzer> dmg_analyzer_; #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc index 45c6aaa10f39..f1a648c4483d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -440,7 +440,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -445,7 +445,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. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc b/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc index 30072bb2013f..20f7872b465a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/themes/theme_service_aura_linux.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/themes/theme_service_aura_linux.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/themes/theme_service_aura_linux.cc -@@ -22,7 +22,7 @@ namespace { +@@ -24,7 +24,7 @@ namespace { ui::SystemTheme ValidateSystemTheme(ui::SystemTheme system_theme) { switch (system_theme) { case ui::SystemTheme::kDefault: diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index f7eda196111b..477368be542a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/ui/browser_command_controller.cc @@ -97,7 +97,7 @@ #include "components/user_manager/user_manager.h" @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -1093,7 +1093,7 @@ void BrowserCommandController::InitCommandState() { +@@ -1094,7 +1094,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/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc index b31989ff4024..526fa88d9d53 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/chrome_pages.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/ui/chrome_pages.cc @@ -68,7 +68,7 @@ #endif @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -597,7 +597,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, +@@ -596,7 +596,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc index 8e3ef1470e50..d188e97643bd 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc +++ b/www/ungoogled-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-10-01 07:40:07 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -90,7 +90,7 @@ static const char* kBadFlags[] = { +@@ -92,7 +92,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/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index b065c831ace9..d329d53aa153 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -128,7 +128,7 @@ +@@ -129,7 +129,7 @@ #include "chrome/credential_provider/common/gcp_strings.h" #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/startup/web_app_info_recorder_utils.h" #endif -@@ -1006,7 +1006,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1007,7 +1007,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) && -@@ -1196,7 +1196,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1197,7 +1197,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/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc index 35240a2f79c2..001958f624bc 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -211,7 +211,7 @@ +@@ -207,7 +207,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/autofill_assistant/common_dependencies_chrome.h" #include "chrome/browser/autofill_assistant/platform_dependencies_desktop.h" #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" -@@ -545,13 +545,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -535,13 +535,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -25,7 +25,7 @@ if (base::FeatureList::IsEnabled( features::kHappinessTrackingSurveysForDesktopDemo) || base::FeatureList::IsEnabled(features::kTrustSafetySentimentSurvey) || -@@ -574,7 +574,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -564,7 +564,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc index 6644248c9563..ca6002dde0e9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc -@@ -454,7 +454,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r +@@ -455,7 +455,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r ? stringifier_->backgrounded_string() : stringifier_->foregrounded_string(); @@ -9,7 +9,7 @@ case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]); return fd_count >= 0 ? base::FormatNumber(fd_count) -@@ -621,7 +621,7 @@ int TaskManagerTableModel::CompareValues(size_t row1, +@@ -622,7 +622,7 @@ int TaskManagerTableModel::CompareValues(size_t row1, return BooleanCompare(is_proc1_bg, is_proc2_bg); } @@ -18,7 +18,7 @@ case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int proc1_fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row1]); -@@ -795,7 +795,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col +@@ -796,7 +796,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col type = REFRESH_TYPE_KEEPALIVE_COUNT; break; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_bubble__anchor__util__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_bubble__anchor__util__views.cc new file mode 100644 index 000000000000..3beb389880d6 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_bubble__anchor__util__views.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/bubble_anchor_util_views.cc.orig 2022-12-02 17:56:32 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/ungoogled-chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc index e09f8e82713d..1a6044b237e0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/download/download_item_view.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/ui/views/download/download_item_view.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/ui/views/download/download_item_view.cc -@@ -188,7 +188,7 @@ bool UseNewWarnings() { +@@ -190,7 +190,7 @@ bool UseNewWarnings() { } int GetFilenameStyle(const views::Label& label) { @@ -9,7 +9,7 @@ if (UseNewWarnings()) return views::style::STYLE_EMPHASIZED; #endif -@@ -196,7 +196,7 @@ int GetFilenameStyle(const views::Label& label) { +@@ -198,7 +198,7 @@ int GetFilenameStyle(const views::Label& label) { } int GetFilenameStyle(const views::StyledLabel& label) { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc deleted file mode 100644 index 755ee3dd3179..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/ui/views/first_run_dialog.cc.orig 2022-10-29 17:50:56 UTC -+++ chrome/browser/ui/views/first_run_dialog.cc -@@ -35,7 +35,7 @@ - - namespace { - --#if !BUILDFLAG(IS_MAC) -+#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) - void InitCrashReporterIfEnabled(bool enabled) { - if (!crash_reporter::IsCrashpadEnabled() && enabled) - breakpad::InitCrashReporter(std::string()); -@@ -129,7 +129,7 @@ bool FirstRunDialog::Accept() { - - #if BUILDFLAG(IS_MAC) - ChangeMetricsReportingState(report_crashes_->GetChecked()); --#else -+#elif !BUILDFLAG(IS_BSD) - ChangeMetricsReportingStateWithReply( - report_crashes_->GetChecked(), - base::BindOnce(&InitCrashReporterIfEnabled)); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index e4c5fafa2f8a..8015585e4a37 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2038,7 +2038,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2070,7 +2070,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/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc index e41d2e4dc723..2e12735c9cbf 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -583,7 +583,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -582,7 +582,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled()) return; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index 799084641cb3..cd12582467f5 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -481,7 +481,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -487,7 +487,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. // - Chrome OS // Releasing capture on Ash cancels gestures so avoid it. @@ -9,7 +9,7 @@ can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); -@@ -1034,7 +1034,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -1049,7 +1049,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -1972,7 +1972,7 @@ void TabDragController::CompleteDrag() { +@@ -1987,7 +1987,7 @@ void TabDragController::CompleteDrag() { } // If source window was maximized - maximize the new window as well. @@ -27,7 +27,7 @@ // Keeping maximized state breaks snap to Grid on Windows when dragging // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in -@@ -2362,7 +2362,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2378,7 +2378,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/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index 90458ddf72bc..6fc9db4b8522 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -313,7 +313,7 @@ +@@ -317,7 +317,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 -@@ -339,17 +339,17 @@ +@@ -343,17 +343,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 -@@ -699,7 +699,7 @@ bool IsAboutUI(const GURL& url) { +@@ -710,7 +710,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) -@@ -1131,7 +1131,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1147,7 +1147,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we #endif // !defined(USE_REAL_DBUS_CLIENTS) #endif // !defined(OFFICIAL_BUILD) #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -48,7 +48,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -1192,7 +1192,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1208,7 +1208,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) -@@ -1252,27 +1252,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1268,27 +1268,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_connectors__internals_zero__trust__utils.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc index 768086c998d3..385e131aec86 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_connectors__internals_zero__trust__utils.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc @@ -1,15 +1,15 @@ ---- chrome/browser/ui/webui/connectors_internals/zero_trust_utils.cc.orig 2022-10-01 07:40:07 UTC -+++ chrome/browser/ui/webui/connectors_internals/zero_trust_utils.cc +--- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig 2022-12-02 17:56:32 UTC ++++ chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc @@ -6,7 +6,7 @@ #include "build/build_config.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #include "base/base64url.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" - #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" -@@ -22,7 +22,7 @@ namespace utils { +@@ -24,7 +24,7 @@ namespace utils { namespace { @@ -18,7 +18,7 @@ connectors_internals::mojom::KeyTrustLevel ParseTrustLevel( BPKUR::KeyTrustLevel trust_level) { -@@ -53,7 +53,7 @@ connectors_internals::mojom::KeyType AlgorithmToType( +@@ -63,7 +63,7 @@ std::string HashAndEncodeString(const std::string& spk } // namespace connectors_internals::mojom::KeyInfoPtr GetKeyInfo() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index 016ebd892793..64320198d2a4 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -116,7 +116,7 @@ +@@ -119,7 +119,7 @@ #include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h" #endif @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -137,7 +137,7 @@ +@@ -140,7 +140,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -18,7 +18,7 @@ #include "ui/linux/linux_ui_factory.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -223,7 +223,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s +@@ -226,7 +226,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s #endif html_source->AddBoolean("isChildAccount", profile->IsChild()); @@ -27,7 +27,7 @@ bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt); #else bool allow_qt_theme = false; -@@ -369,7 +369,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -372,7 +372,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}, -@@ -379,7 +379,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -382,7 +382,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) -@@ -403,7 +403,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -406,7 +406,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/ungoogled-chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc index c8d2c8203473..8cfd432bba68 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc +++ b/www/ungoogled-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 2022-10-01 07:40:07 UTC +--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2022-12-02 17:56:32 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) - base::Feature kChromeAppsDeprecationExcludeForceInstalls( - "ChromeAppsDeprecationExcludeForceInstalls", - base::FEATURE_DISABLED_BY_DEFAULT); -@@ -100,7 +100,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo + const char kMobilityPrintExtensionId[] = "alhngdkjgnedakdlnamimgfihgkmenbh"; + + BASE_FEATURE(kChromeAppsDeprecationExcludeForceInstalls, +@@ -102,7 +102,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h index 1523c76c356f..b5b14fffc525 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h -@@ -44,7 +44,7 @@ void UnregisterFileHandlersWithOs(const AppId& app_id, +@@ -45,7 +45,7 @@ void UnregisterFileHandlersWithOs(const AppId& app_id, Profile* profile, ResultCallback callback); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc index 04c87937043f..2b340ef36c72 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/web_app_provider.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/web_applications/web_app_provider.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/browser/web_applications/web_app_provider.cc -@@ -271,7 +271,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile +@@ -277,7 +277,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile protocol_handler_manager.get()); std::unique_ptr<UrlHandlerManager> url_handler_manager; diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc index 533240a69a20..fd4740a89e7a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc @@ -1,16 +1,16 @@ ---- chrome/common/chrome_features.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/common/chrome_features.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/common/chrome_features.cc -@@ -95,7 +95,7 @@ const base::Feature kAsyncDns { - }; +@@ -107,7 +107,7 @@ BASE_FEATURE(kAsyncDns, + ); #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) // Enables or disables the Autofill survey triggered by opening a prompt to // save address info. - const base::Feature kAutofillAddressSurvey{"AutofillAddressSurvey", -@@ -110,7 +110,7 @@ const base::Feature kAutofillPasswordSurvey{"AutofillP - base::FEATURE_DISABLED_BY_DEFAULT}; + BASE_FEATURE(kAutofillAddressSurvey, +@@ -125,7 +125,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, + base::FEATURE_DISABLED_BY_DEFAULT); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -18,17 +18,17 @@ // 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. -@@ -268,7 +268,7 @@ const base::Feature kDesktopPWAsEnforceWebAppSettingsP +@@ -304,7 +304,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, // Enables or disables Desktop PWAs to be auto-started on OS login. - const base::Feature kDesktopPWAsRunOnOsLogin { - "DesktopPWAsRunOnOsLogin", + BASE_FEATURE(kDesktopPWAsRunOnOsLogin, + "DesktopPWAsRunOnOsLogin", -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT + base::FEATURE_ENABLED_BY_DEFAULT #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -289,7 +289,7 @@ const base::Feature kDesktopPWAsWebBundles{"DesktopPWA - base::FEATURE_DISABLED_BY_DEFAULT}; + base::FEATURE_DISABLED_BY_DEFAULT +@@ -328,7 +328,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles, + base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) @@ -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. -@@ -322,7 +322,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa +@@ -363,7 +363,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa const base::FeatureParam<bool> kDnsOverHttpsShowUiParam { &kDnsOverHttps, "ShowUi", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -45,21 +45,21 @@ true #else false -@@ -622,7 +622,7 @@ const base::Feature kKAnonymityServiceOHTTPRequests{ - const base::Feature kUpdateHistoryEntryPointsInIncognito{ - "UpdateHistoryEntryPointsInIncognito", base::FEATURE_ENABLED_BY_DEFAULT}; +@@ -739,7 +739,7 @@ BASE_FEATURE(kUpdateHistoryEntryPointsInIncognito, + "UpdateHistoryEntryPointsInIncognito", + base::FEATURE_ENABLED_BY_DEFAULT); -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) - COMPONENT_EXPORT(CHROME_FEATURES) - const base::Feature kLinuxLowMemoryMonitor{"LinuxLowMemoryMonitor", - base::FEATURE_DISABLED_BY_DEFAULT}; -@@ -635,7 +635,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit + BASE_FEATURE(kLinuxLowMemoryMonitor, + "LinuxLowMemoryMonitor", + base::FEATURE_DISABLED_BY_DEFAULT); +@@ -752,7 +752,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit &kLinuxLowMemoryMonitor, "critical_level", 255}; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - const base::Feature kListWebAppsSwitch{"ListWebAppsSwitch", - base::FEATURE_DISABLED_BY_DEFAULT}; - #endif + BASE_FEATURE(kListWebAppsSwitch, + "ListWebAppsSwitch", + base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h index 34c6f8210037..f6f2987dc6d0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h @@ -1,47 +1,45 @@ ---- chrome/common/chrome_features.h.orig 2022-10-29 17:50:56 UTC +--- chrome/common/chrome_features.h.orig 2022-12-02 17:56:32 UTC +++ chrome/common/chrome_features.h -@@ -86,7 +86,7 @@ extern const base::Feature kAppShimNewCloseBehavior; - COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns; +@@ -81,13 +81,13 @@ BASE_DECLARE_FEATURE(kAppShimNewCloseBehavior); + COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAsyncDns); #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) - COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kAutofillAddressSurvey; - COMPONENT_EXPORT(CHROME_FEATURES) -@@ -95,7 +95,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kAutofillPasswordSurvey; + COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAutofillAddressSurvey); + COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAutofillCardSurvey); + COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAutofillPasswordSurvey); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kBackgroundModeAllowRestart; + BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -207,7 +207,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kDesktopPWAsWebBundles; +@@ -189,7 +189,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); + COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsWebBundles); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kChromeAppsDeprecation; - COMPONENT_EXPORT(CHROME_FEATURES) -@@ -440,7 +440,7 @@ extern const base::Feature kKAnonymityServiceOHTTPRequ + BASE_DECLARE_FEATURE(kKeepForceInstalledPreinstalledApps); +@@ -432,7 +432,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kUpdateHistoryEntryPointsInIncognito; + BASE_DECLARE_FEATURE(kUpdateHistoryEntryPointsInIncognito); -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS) ++#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor); COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kLinuxLowMemoryMonitor; - COMPONENT_EXPORT(CHROME_FEATURES) -@@ -449,7 +449,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel; +@@ -440,7 +440,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kListWebAppsSwitch; + COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kListWebAppsSwitch); #endif + diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc index 1712d4528d48..bc3e5cc73b7f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,4 +1,4 @@ ---- chrome/common/chrome_paths.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/common/chrome_paths.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/common/chrome_paths.cc @@ -49,14 +49,14 @@ @@ -11,7 +11,7 @@ const base::FilePath::CharType kFilepathSinglePrefExtensions[] = #if BUILDFLAG(GOOGLE_CHROME_BRANDING) - FILE_PATH_LITERAL("/usr/share/google-chrome/extensions"); -+ FILE_PATH_LITERAL("/usr/local/share/chromium/extensions"); ++ FILE_PATH_LITERAL("/usr/local/share/ungoogled-chromium/extensions"); #else - FILE_PATH_LITERAL("/usr/share/chromium/extensions"); + FILE_PATH_LITERAL("/usr/local/share/ungoogled-chromium/extensions"); diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc index debda459cda1..d8facbf7642a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/common/chrome_switches.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/common/chrome_switches.cc -@@ -814,14 +814,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -831,14 +831,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h index 3afd12c90a33..c1c36e4c09a6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.h.orig 2022-10-01 07:40:07 UTC +--- chrome/common/chrome_switches.h.orig 2022-12-02 17:56:32 UTC +++ chrome/common/chrome_switches.h -@@ -257,12 +257,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -260,12 +260,12 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc b/www/ungoogled-chromium/files/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc index 46b2a972b9f5..a8e0a7ccffa4 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc @@ -1,6 +1,6 @@ ---- chrome/common/extensions/permissions/chrome_permission_message_rules.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/common/extensions/permissions/chrome_permission_message_rules.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/common/extensions/permissions/chrome_permission_message_rules.cc -@@ -284,7 +284,7 @@ int GetEnterpriseReportingPrivatePermissionMessageId() +@@ -285,7 +285,7 @@ int GetEnterpriseReportingPrivatePermissionMessageId() } #if BUILDFLAG(IS_WIN) return IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_WIN; diff --git a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.cc b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.cc index dcf733bbc944..10293e54f349 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.cc @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/common/pref_names.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/common/pref_names.cc -@@ -1249,7 +1249,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox +@@ -1267,7 +1267,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. const char kUsesSystemThemeDeprecated[] = "extensions.theme.use_system"; const char kSystemTheme[] = "extensions.theme.system_theme"; -@@ -1363,7 +1363,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1381,7 +1381,7 @@ const char kShowUpdatePromotionInfoBar[] = // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -1866,7 +1866,7 @@ const char kDownloadDirUpgraded[] = "download.director +@@ -1886,7 +1886,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 -@@ -2163,7 +2163,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i +@@ -2190,7 +2190,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"; -@@ -2263,7 +2263,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled +@@ -2290,7 +2290,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[] = -@@ -3286,7 +3286,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto +@@ -3307,7 +3307,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto const char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; diff --git a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h index 9ab9c843e376..2b19d1c2d9b2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2022-10-29 17:50:56 UTC +--- chrome/common/pref_names.h.orig 2022-12-02 17:56:32 UTC +++ chrome/common/pref_names.h -@@ -393,7 +393,7 @@ extern const char kUseAshProxy[]; +@@ -397,7 +397,7 @@ extern const char kUseAshProxy[]; #endif // BUILDFLAG(IS_CHROMEOS_LACROS) // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // TODO(https://crbug.com/1317782): Remove in M110. extern const char kUsesSystemThemeDeprecated[]; extern const char kSystemTheme[]; -@@ -420,7 +420,7 @@ extern const char kShowUpdatePromotionInfoBar[]; +@@ -424,7 +424,7 @@ extern const char kShowUpdatePromotionInfoBar[]; #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ extern const char kUseCustomChromeFrame[]; #endif #if BUILDFLAG(ENABLE_PLUGINS) -@@ -607,7 +607,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[ +@@ -611,7 +611,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) -@@ -717,7 +717,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps +@@ -723,7 +723,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 -@@ -848,7 +848,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] +@@ -854,7 +854,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) -@@ -1118,7 +1118,7 @@ extern const char kBlockAutoplayEnabled[]; +@@ -1123,7 +1123,7 @@ extern const char kBlockAutoplayEnabled[]; #endif extern const char kSandboxExternalProtocolBlocked[]; diff --git a/www/ungoogled-chromium/files/patch-chrome_common_url__constants.cc b/www/ungoogled-chromium/files/patch-chrome_common_url__constants.cc index 4be35ffcb8d0..d375740abcdc 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_url__constants.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/url_constants.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/common/url_constants.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/common/url_constants.cc -@@ -492,7 +492,7 @@ const char kPhoneHubPermissionLearnMoreURL[] = +@@ -498,7 +498,7 @@ const char kPhoneHubPermissionLearnMoreURL[] = "https://support.9oo91e.qjz9zk/chromebook/?p=multidevice"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_common_url__constants.h b/www/ungoogled-chromium/files/patch-chrome_common_url__constants.h index 3419de44aaf6..3c1456d32d89 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_url__constants.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/url_constants.h.orig 2022-10-29 17:50:56 UTC +--- chrome/common/url_constants.h.orig 2022-12-02 17:56:32 UTC +++ chrome/common/url_constants.h -@@ -465,7 +465,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; +@@ -471,7 +471,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; extern const char kPhoneHubPermissionLearnMoreURL[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc index c9a8579cdb7a..4e7c87a9996b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc @@ -1,6 +1,33 @@ ---- chrome/services/printing/print_backend_service_impl.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/services/printing/print_backend_service_impl.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/services/printing/print_backend_service_impl.cc -@@ -606,7 +606,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( +@@ -41,7 +41,7 @@ + #include "printing/backend/cups_connection_pool.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/no_destructor.h" + #include "ui/linux/linux_ui.h" + #include "ui/linux/linux_ui_delegate_stub.h" +@@ -62,7 +62,7 @@ namespace printing { + + namespace { + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void InstantiateLinuxUiDelegate() { + // TODO(crbug.com/809738) Until a real UI can be used in a utility process, + // need to use the stub version. +@@ -429,7 +429,7 @@ void PrintBackendServiceImpl::Init(const std::string& + // `InitCommon()`. + InitializeProcessForPrinting(); + print_backend_ = PrintBackend::CreateInstance(locale); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // 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`. +@@ -598,7 +598,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>( print_backend_->GetPrinterDriverInfo(*printer_name)); diff --git a/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn index 8c0d1c901a22..8346344ecaf1 100644 --- a/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- chrome/test/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ chrome/test/BUILD.gn -@@ -9992,7 +9992,7 @@ test("chrome_app_unittests") { +@@ -10085,7 +10085,7 @@ test("chrome_app_unittests") { "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", ] diff --git a/www/ungoogled-chromium/files/patch-chrome_updater_device__management_dm__storage.cc b/www/ungoogled-chromium/files/patch-chrome_updater_device__management_dm__storage.cc deleted file mode 100644 index 9d2d8337d81b..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_updater_device__management_dm__storage.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/updater/device_management/dm_storage.cc.orig 2022-10-01 07:40:07 UTC -+++ chrome/updater/device_management/dm_storage.cc -@@ -70,7 +70,7 @@ bool DeleteObsoletePolicies(const base::FilePath& cach - - } // namespace - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/1276162) - implement. - DMStorage::DMStorage(const base::FilePath& policy_cache_root) - : policy_cache_root_(policy_cache_root), -@@ -215,7 +215,7 @@ DMStorage::GetOmahaPolicySettings() const { - return omaha_settings; - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/1276162) - implement. - scoped_refptr<DMStorage> GetDefaultDMStorage() { - NOTIMPLEMENTED(); diff --git a/www/ungoogled-chromium/files/patch-chrome_updater_installer.cc b/www/ungoogled-chromium/files/patch-chrome_updater_installer.cc index e5bdc708ec34..4c2399c0549e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_updater_installer.cc +++ b/www/ungoogled-chromium/files/patch-chrome_updater_installer.cc @@ -1,6 +1,6 @@ ---- chrome/updater/installer.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/updater/installer.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/updater/installer.cc -@@ -242,7 +242,7 @@ absl::optional<base::FilePath> Installer::GetCurrentIn +@@ -250,7 +250,7 @@ absl::optional<base::FilePath> Installer::GetCurrentIn return path->AppendASCII(pv_.GetString()); } diff --git a/www/ungoogled-chromium/files/patch-chrome_updater_util.cc b/www/ungoogled-chromium/files/patch-chrome_updater_util.cc index 1325991958bc..98f8f20d1ed2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_updater_util.cc +++ b/www/ungoogled-chromium/files/patch-chrome_updater_util.cc @@ -1,11 +1,20 @@ ---- chrome/updater/util.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/updater/util.cc.orig 2022-12-02 17:56:32 UTC +++ chrome/updater/util.cc -@@ -264,7 +264,7 @@ GURL AppendQueryParameter(const GURL& url, - return url.ReplaceComponents(replacements); - } +@@ -37,7 +37,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) - - // TODO(crbug.com/1276188) - implement the functions below. - absl::optional<base::FilePath> GetBaseInstallDirectory(UpdaterScope scope) { + #include "chrome/updater/linux/linux_util.h" + #elif BUILDFLAG(IS_MAC) + #import "chrome/updater/mac/mac_util.h" +@@ -118,7 +118,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/ungoogled-chromium/files/patch-components_autofill__assistant_browser_autofill__assistant__impl.cc b/www/ungoogled-chromium/files/patch-components_autofill__assistant_browser_autofill__assistant__impl.cc index 58b2bdd13f97..bcfef6707085 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill__assistant_browser_autofill__assistant__impl.cc +++ b/www/ungoogled-chromium/files/patch-components_autofill__assistant_browser_autofill__assistant__impl.cc @@ -1,6 +1,6 @@ ---- components/autofill_assistant/browser/autofill_assistant_impl.cc.orig 2022-10-01 07:40:07 UTC +--- components/autofill_assistant/browser/autofill_assistant_impl.cc.orig 2022-12-02 17:56:32 UTC +++ components/autofill_assistant/browser/autofill_assistant_impl.cc -@@ -150,7 +150,7 @@ void AutofillAssistantImpl::GetCapabilitiesByHashPrefi +@@ -161,7 +161,7 @@ void AutofillAssistantImpl::GetCapabilitiesByHashPrefi client_context.set_platform_type(ClientContextProto::PLATFORM_TYPE_ANDROID); #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc index 21956fa59a70..b6873a229c40 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/personal_data_manager.cc.orig 2022-10-29 17:50:56 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2022-12-02 17:56:32 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -2056,7 +2056,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2053,7 +2053,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/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc index 54b268585466..f4e4bb72b621 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/ungoogled-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-10-29 17:50:56 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2022-12-02 17:56:32 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -239,7 +239,7 @@ const base::FeatureParam<int> +@@ -267,7 +267,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/ungoogled-chromium/files/patch-components_crash_content_browser_BUILD.gn b/www/ungoogled-chromium/files/patch-components_crash_content_browser_BUILD.gn deleted file mode 100644 index 80a33c372a41..000000000000 --- a/www/ungoogled-chromium/files/patch-components_crash_content_browser_BUILD.gn +++ /dev/null @@ -1,29 +0,0 @@ ---- components/crash/content/browser/BUILD.gn.orig 2022-10-01 07:40:07 UTC -+++ components/crash/content/browser/BUILD.gn -@@ -21,7 +21,7 @@ source_set("browser") { - "//content/public/common", - ] - -- if (is_linux || is_chromeos || is_android) { -+ if ((is_linux && !is_bsd) || is_chromeos || is_android) { - # Want this file on both Linux and Android. - sources += [ - "crash_handler_host_linux.cc", -@@ -37,7 +37,7 @@ source_set("browser") { - - # This is not in the GYP build but this target includes breakpad client - # headers, so add the dependency here. -- if ((is_posix && !is_ios) || is_fuchsia) { -+ if ((is_posix && !is_ios && !is_bsd) || is_fuchsia) { - configs += [ "//third_party/breakpad:client_config" ] - public_configs = [ "//third_party/breakpad:client_config" ] - } -@@ -59,7 +59,7 @@ source_set("browser") { - "//components/crash/android:jni_headers", - "//mojo/public/cpp/bindings", - ] -- } else { -+ } else if (!is_bsd) { - deps += [ "//third_party/breakpad:client" ] - } - } diff --git a/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn b/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn index 5450169ec6f5..39063b315ec7 100644 --- a/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-components_crash_core_app_BUILD.gn @@ -1,4 +1,4 @@ ---- components/crash/core/app/BUILD.gn.orig 2022-10-01 07:40:07 UTC +--- components/crash/core/app/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ components/crash/core/app/BUILD.gn @@ -52,7 +52,7 @@ static_library("app") { "crashpad.h", @@ -6,10 +6,10 @@ - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { - sources += [ - "breakpad_linux.cc", - "breakpad_linux.h", -@@ -62,6 +62,10 @@ static_library("app") { + sources += [ "crashpad_linux.cc" ] + } + +@@ -65,6 +65,10 @@ static_library("app") { ] } @@ -20,7 +20,7 @@ defines = [ "CRASH_IMPLEMENTATION" ] public_deps = [ ":lib" ] -@@ -93,7 +97,7 @@ static_library("app") { +@@ -96,7 +100,7 @@ static_library("app") { libs = [ "log" ] } @@ -29,16 +29,7 @@ deps += [ "//base:base_static", "//components/crash/core/common", -@@ -101,7 +105,7 @@ static_library("app") { - ] - } - -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - deps += [ "//third_party/breakpad:client" ] - } - -@@ -221,11 +225,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { +@@ -224,11 +228,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { # define custom UserStreamDataSources. executable("chrome_crashpad_handler") { sources = [ "chrome_crashpad_handler.cc" ] diff --git a/www/ungoogled-chromium/files/patch-components_crash_core_browser_crash__upload__list__crashpad.cc b/www/ungoogled-chromium/files/patch-components_crash_core_browser_crash__upload__list__crashpad.cc index 25a4075cb518..0d8c4d476ddd 100644 --- a/www/ungoogled-chromium/files/patch-components_crash_core_browser_crash__upload__list__crashpad.cc +++ b/www/ungoogled-chromium/files/patch-components_crash_core_browser_crash__upload__list__crashpad.cc @@ -1,6 +1,16 @@ ---- components/crash/core/browser/crash_upload_list_crashpad.cc.orig 2022-10-01 07:40:07 UTC +--- components/crash/core/browser/crash_upload_list_crashpad.cc.orig 2022-12-02 17:56:32 UTC +++ components/crash/core/browser/crash_upload_list_crashpad.cc -@@ -51,9 +51,13 @@ std::vector<UploadList::UploadInfo> CrashUploadListCra +@@ -37,7 +37,9 @@ CrashUploadListCrashpad::~CrashUploadListCrashpad() = + + std::vector<UploadList::UploadInfo> CrashUploadListCrashpad::LoadUploadList() { + std::vector<crash_reporter::Report> reports; ++#if !defined(OS_BSD) + crash_reporter::GetReports(&reports); ++#endif + + std::vector<UploadInfo> uploads; + for (const crash_reporter::Report& report : reports) { +@@ -51,9 +53,13 @@ std::vector<UploadList::UploadInfo> CrashUploadListCra void CrashUploadListCrashpad::ClearUploadList(const base::Time& begin, const base::Time& end) { diff --git a/www/ungoogled-chromium/files/patch-components_crash_core_common_BUILD.gn b/www/ungoogled-chromium/files/patch-components_crash_core_common_BUILD.gn index bdc08a3634c9..3bbb040e9ee7 100644 --- a/www/ungoogled-chromium/files/patch-components_crash_core_common_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-components_crash_core_common_BUILD.gn @@ -1,4 +1,4 @@ ---- components/crash/core/common/BUILD.gn.orig 2022-10-01 07:40:07 UTC +--- components/crash/core/common/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ components/crash/core/common/BUILD.gn @@ -8,7 +8,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn @@ -9,12 +9,3 @@ } group("common") { -@@ -190,7 +190,7 @@ source_set("unit_tests") { - sources += [ "crash_key_breakpad_ios_unittest.cc" ] - deps += [ "//third_party/breakpad:client" ] - include_dirs = [ "//third_party/breakpad/breakpad/src/" ] -- } else if (!is_mac && !is_win && !is_fuchsia && !is_android) { -+ } else if (!is_mac && !is_win && !is_fuchsia && !is_android && !is_bsd) { - include_dirs = [ "//third_party/breakpad/breakpad/src/" ] - sources += [ "crash_key_breakpad_unittest.cc" ] - } diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_core_common_signals__features.cc b/www/ungoogled-chromium/files/patch-components_device__signals_core_common_signals__features.cc index 9b73ce14388f..c5010f187127 100644 --- a/www/ungoogled-chromium/files/patch-components_device__signals_core_common_signals__features.cc +++ b/www/ungoogled-chromium/files/patch-components_device__signals_core_common_signals__features.cc @@ -1,6 +1,6 @@ ---- components/device_signals/core/common/signals_features.cc.orig 2022-10-01 07:40:07 UTC +--- components/device_signals/core/common/signals_features.cc.orig 2022-12-02 17:56:32 UTC +++ components/device_signals/core/common/signals_features.cc -@@ -18,7 +18,7 @@ const base::FeatureParam<bool> kDisableAntiVirus{&kNew +@@ -19,7 +19,7 @@ const base::FeatureParam<bool> kDisableAntiVirus{&kNew const base::FeatureParam<bool> kDisableHotfix{&kNewEvSignalsEnabled, "DisableHotfix", false}; diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_core_common_signals__features.h b/www/ungoogled-chromium/files/patch-components_device__signals_core_common_signals__features.h index 3c556b7cb45e..261470bee7ce 100644 --- a/www/ungoogled-chromium/files/patch-components_device__signals_core_common_signals__features.h +++ b/www/ungoogled-chromium/files/patch-components_device__signals_core_common_signals__features.h @@ -1,4 +1,4 @@ ---- components/device_signals/core/common/signals_features.h.orig 2022-10-01 07:40:07 UTC +--- components/device_signals/core/common/signals_features.h.orig 2022-12-02 17:56:32 UTC +++ components/device_signals/core/common/signals_features.h @@ -20,7 +20,7 @@ extern const base::FeatureParam<bool> kDisableSettings extern const base::FeatureParam<bool> kDisableAntiVirus; @@ -6,6 +6,6 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - extern const base::Feature kDeviceSignalsPromoAfterSigninIntercept; + BASE_DECLARE_FEATURE(kDeviceSignalsPromoAfterSigninIntercept); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) diff --git a/www/ungoogled-chromium/files/patch-components_device__signals_test_signals__contract.cc b/www/ungoogled-chromium/files/patch-components_device__signals_test_signals__contract.cc new file mode 100644 index 000000000000..8116406f7fa2 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_device__signals_test_signals__contract.cc @@ -0,0 +1,11 @@ +--- components/device_signals/test/signals_contract.cc.orig 2022-12-02 17:56:32 UTC ++++ components/device_signals/test/signals_contract.cc +@@ -164,7 +164,7 @@ GetSignalsContract() { + base::BindRepeating(VerifyUnset, names::kSecureBootEnabled); + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUIDLFLAG(IS_BSD) + contract[names::kAllowScreenLock] = + base::BindRepeating(VerifyUnset, names::kAllowScreenLock); + contract[names::kImei] = base::BindRepeating(VerifyUnset, names::kImei); diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc index e089a5822395..b70ac35d2c27 100644 --- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc +++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2022-10-29 17:50:56 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2022-12-02 17:56:32 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -35,7 +35,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe absl::optional<FeatureConfig> GetClientSideFeatureConfig( @@ -9,7 +9,7 @@ if (kIPHPasswordsAccountStorageFeature.name == feature->name) { absl::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -917,7 +917,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf +@@ -988,7 +988,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc index 0294da305f8a..9e0dca3af43d 100644 --- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,21 +1,21 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2022-10-29 17:50:56 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2022-12-02 17:56:32 UTC +++ components/feature_engagement/public/feature_constants.cc -@@ -24,7 +24,7 @@ const base::Feature kIPHDummyFeature{"IPH_Dummy", - base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -24,7 +24,7 @@ BASE_FEATURE(kUseClientConfigIPH, + BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - const base::Feature kIPHBatterySaverModeFeature{ - "IPH_BatterySaverMode", base::FEATURE_DISABLED_BY_DEFAULT}; - const base::Feature kIPHDesktopSharedHighlightingFeature{ -@@ -301,7 +301,8 @@ const base::Feature kIPHOverflowMenuTipFeature{ + BASE_FEATURE(kIPHBatterySaverModeFeature, + "IPH_BatterySaverMode", + base::FEATURE_DISABLED_BY_DEFAULT); +@@ -418,7 +418,8 @@ BASE_FEATURE(kIPHOverflowMenuTipFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ + BUILDFLAG(IS_BSD) - const base::Feature kIPHAutofillVirtualCardSuggestionFeature{ - "IPH_AutofillVirtualCardSuggestion", base::FEATURE_ENABLED_BY_DEFAULT}; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || + BASE_FEATURE(kIPHAutofillVirtualCardSuggestionFeature, + "IPH_AutofillVirtualCardSuggestion", + base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h index 76659f03c353..83d2d0abbe98 100644 --- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,21 +1,21 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2022-10-29 17:50:56 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2022-12-02 17:56:32 UTC +++ components/feature_engagement/public/feature_constants.h -@@ -32,7 +32,7 @@ extern const base::Feature kIPHDummyFeature; - extern const base::Feature kEnableIPH; +@@ -32,7 +32,7 @@ BASE_DECLARE_FEATURE(kIPHDummyFeature); + BASE_DECLARE_FEATURE(kEnableIPH); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - extern const base::Feature kIPHBatterySaverModeFeature; - extern const base::Feature kIPHDesktopSharedHighlightingFeature; - extern const base::Feature kIPHDesktopTabGroupsNewGroupFeature; -@@ -182,7 +182,8 @@ extern const base::Feature kIPHOverflowMenuTipFeature; + BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature); + BASE_DECLARE_FEATURE(kIPHDesktopSharedHighlightingFeature); + BASE_DECLARE_FEATURE(kIPHDesktopTabGroupsNewGroupFeature); +@@ -183,7 +183,8 @@ BASE_DECLARE_FEATURE(kIPHOverflowMenuTipFeature); #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ + BUILDFLAG(IS_BSD) - extern const base::Feature kIPHAutofillVirtualCardSuggestionFeature; + BASE_DECLARE_FEATURE(kIPHAutofillVirtualCardSuggestionFeature); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc index 35eb25330948..af3d0a3185bd 100644 --- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc +++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2022-10-29 17:50:56 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2022-12-02 17:56:32 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -118,7 +118,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -120,7 +120,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHOverflowMenuTipFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ &kIPHBatterySaverModeFeature, &kIPHDesktopTabGroupsNewGroupFeature, &kIPHExtensionsMenuFeature, -@@ -145,7 +145,8 @@ const base::Feature* const kAllFeatures[] = { +@@ -152,7 +152,8 @@ const base::Feature* const kAllFeatures[] = { // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h index 546133b05ec9..95970d8e6a27 100644 --- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h +++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_list.h.orig 2022-10-29 17:50:56 UTC +--- components/feature_engagement/public/feature_list.h.orig 2022-12-02 17:56:32 UTC +++ components/feature_engagement/public/feature_list.h -@@ -216,7 +216,7 @@ DEFINE_VARIATION_PARAM(kIPHOverflowMenuTipFeature, "IP +@@ -218,7 +218,7 @@ DEFINE_VARIATION_PARAM(kIPHOverflowMenuTipFeature, "IP #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode"); DEFINE_VARIATION_PARAM(kIPHDesktopTabGroupsNewGroupFeature, "IPH_DesktopTabGroupsNewGroup"); -@@ -253,7 +253,8 @@ DEFINE_VARIATION_PARAM(kIPHWebUiHelpBubbleTestFeature, +@@ -264,7 +264,8 @@ DEFINE_VARIATION_PARAM(kIPHPriceTrackingInSidePanelFea // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,7 +19,7 @@ DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardSuggestionFeature, "IPH_AutofillVirtualCardSuggestion"); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || -@@ -355,7 +356,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -369,7 +370,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHFollowWhileBrowsingFeature), VARIATION_ENTRY(kIPHOverflowMenuTipFeature), #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -28,7 +28,7 @@ VARIATION_ENTRY(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHDesktopTabGroupsNewGroupFeature), VARIATION_ENTRY(kIPHExtensionsMenuFeature), -@@ -383,7 +384,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -402,7 +403,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/ungoogled-chromium/files/patch-components_gwp__asan_BUILD.gn b/www/ungoogled-chromium/files/patch-components_gwp__asan_BUILD.gn index 20011f07ddcb..f081b6ad7220 100644 --- a/www/ungoogled-chromium/files/patch-components_gwp__asan_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-components_gwp__asan_BUILD.gn @@ -1,8 +1,8 @@ ---- components/gwp_asan/BUILD.gn.orig 2022-10-01 07:40:07 UTC +--- components/gwp_asan/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ components/gwp_asan/BUILD.gn -@@ -14,7 +14,7 @@ test("gwp_asan_unittests") { - "//components/gwp_asan/common:unit_tests", +@@ -15,7 +15,7 @@ test("gwp_asan_unittests") { "//testing/gtest", + "//third_party/boringssl", ] - if (is_win || is_mac || is_linux || is_chromeos || is_android) { + if ((is_win || is_mac || is_linux || is_chromeos || is_android) && !is_bsd) { diff --git a/www/ungoogled-chromium/files/patch-components_invalidation_impl_invalidation__switches.cc b/www/ungoogled-chromium/files/patch-components_invalidation_impl_invalidation__switches.cc index 7453082a0fa0..d6e575de5a1d 100644 --- a/www/ungoogled-chromium/files/patch-components_invalidation_impl_invalidation__switches.cc +++ b/www/ungoogled-chromium/files/patch-components_invalidation_impl_invalidation__switches.cc @@ -1,11 +1,11 @@ ---- components/invalidation/impl/invalidation_switches.cc.orig 2022-10-01 07:40:07 UTC +--- components/invalidation/impl/invalidation_switches.cc.orig 2022-12-02 17:56:32 UTC +++ components/invalidation/impl/invalidation_switches.cc @@ -21,7 +21,7 @@ const int kDefaultInstanceIDTokenTTLSeconds = 14 * 24 - const base::Feature kSyncInstanceIDTokenTTL { - "SyncInstanceIDTokenTTL", + BASE_FEATURE(kSyncInstanceIDTokenTTL, + "SyncInstanceIDTokenTTL", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT + base::FEATURE_ENABLED_BY_DEFAULT #else - base::FEATURE_DISABLED_BY_DEFAULT + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/ungoogled-chromium/files/patch-components_cast__channel_cast__message__util.cc b/www/ungoogled-chromium/files/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc index eb4186d5dc5b..661f5fd3269b 100644 --- a/www/ungoogled-chromium/files/patch-components_cast__channel_cast__message__util.cc +++ b/www/ungoogled-chromium/files/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc @@ -1,5 +1,5 @@ ---- components/cast_channel/cast_message_util.cc.orig 2022-10-29 17:50:56 UTC -+++ components/cast_channel/cast_message_util.cc +--- components/media_router/common/providers/cast/channel/cast_message_util.cc.orig 2022-12-02 17:56:32 UTC ++++ components/media_router/common/providers/cast/channel/cast_message_util.cc @@ -170,7 +170,7 @@ int GetVirtualConnectPlatformValue() { return 4; #elif BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/ungoogled-chromium/files/patch-components_metrics_metrics__log.cc b/www/ungoogled-chromium/files/patch-components_metrics_metrics__log.cc new file mode 100644 index 000000000000..31b3cc9a5771 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_metrics_metrics__log.cc @@ -0,0 +1,38 @@ +--- components/metrics/metrics_log.cc.orig 2022-12-02 17:56:32 UTC ++++ components/metrics/metrics_log.cc +@@ -54,7 +54,7 @@ + #include "base/win/current_module.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/environment.h" + #include "base/nix/xdg_util.h" + #endif +@@ -144,7 +144,7 @@ void RecordCurrentTime( + } + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + metrics::SystemProfileProto::OS::XdgSessionType ToProtoSessionType( + base::nix::SessionType session_type) { + switch (session_type) { +@@ -415,7 +415,7 @@ void MetricsLog::RecordCoreSystemProfile( + // OperatingSystemVersion refers to the ChromeOS release version. + #if BUILDFLAG(IS_CHROMEOS_ASH) + os->set_kernel_version(base::SysInfo::KernelVersion()); +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // Linux operating system version is copied over into kernel version to be + // consistent. + os->set_kernel_version(base::SysInfo::OperatingSystemVersion()); +@@ -432,7 +432,7 @@ void MetricsLog::RecordCoreSystemProfile( + os->set_build_number(base::SysInfo::GetIOSBuildNumber()); + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::unique_ptr<base::Environment> env = base::Environment::Create(); + os->set_xdg_session_type(ToProtoSessionType(base::nix::GetSessionType(*env))); + os->set_xdg_current_desktop( diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database.cc index 6b086ba64c3e..741c7f81a8ee 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database.cc +++ b/www/ungoogled-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-10-01 07:40:07 UTC +--- components/password_manager/core/browser/login_database.cc.orig 2022-12-02 17:56:32 UTC +++ components/password_manager/core/browser/login_database.cc -@@ -731,7 +731,7 @@ std::string GeneratePlaceholders(size_t count) { +@@ -732,7 +732,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) { -@@ -748,7 +748,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme +@@ -749,7 +749,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; -@@ -1577,7 +1577,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { +@@ -1578,7 +1578,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { } DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() { diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc index e994089de766..18429919fe15 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc +++ b/www/ungoogled-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 2022-10-01 07:40:07 UTC +--- components/password_manager/core/browser/login_database_unittest.cc.orig 2022-12-02 17:56:32 UTC +++ components/password_manager/core/browser/login_database_unittest.cc -@@ -2092,7 +2092,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd +@@ -2093,7 +2093,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 +@@ -2119,7 +2119,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd #endif // Check histograms. @@ -18,7 +18,7 @@ histogram_tester.ExpectUniqueSample("PasswordManager.CleanedUpPasswords", 2, 1); histogram_tester.ExpectUniqueSample( -@@ -2170,7 +2170,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL +@@ -2171,7 +2171,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL } #endif // BUILDFLAG(IS_MAC) diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc index 10d496eaeeb7..da8bda25cfe7 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2022-10-29 17:50:56 UTC +--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2022-12-02 17:56:32 UTC +++ components/password_manager/core/browser/sync/password_sync_bridge.cc -@@ -178,7 +178,7 @@ bool ShouldRecoverPasswordsDuringMerge() { +@@ -187,7 +187,7 @@ bool ShouldRecoverPasswordsDuringMerge() { // Delete the local undecryptable copy when this is MacOS only. #if BUILDFLAG(IS_MAC) return true; @@ -9,7 +9,7 @@ return base::FeatureList::IsEnabled( features::kSyncUndecryptablePasswordsLinux); #else -@@ -187,7 +187,7 @@ bool ShouldRecoverPasswordsDuringMerge() { +@@ -196,7 +196,7 @@ bool ShouldRecoverPasswordsDuringMerge() { } bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() { diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.cc index c1c9eb1532ad..1d06be50420c 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.cc @@ -1,28 +1,29 @@ ---- components/password_manager/core/common/password_manager_features.cc.orig 2022-10-29 17:50:56 UTC +--- components/password_manager/core/common/password_manager_features.cc.orig 2022-12-02 17:56:32 UTC +++ components/password_manager/core/common/password_manager_features.cc -@@ -83,7 +83,7 @@ const base::Feature kFillingAcrossAffiliatedWebsites{ - const base::Feature kFillOnAccountSelect = {"fill-on-account-select", - base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -91,7 +91,7 @@ BASE_FEATURE(kFillOnAccountSelect, + "fill-on-account-select", + base::FEATURE_DISABLED_BY_DEFAULT); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // When enabled, initial sync will be forced during startup if the password // store has encryption service failures. - const base::Feature kForceInitialSyncWhenDecryptionFails = { -@@ -200,14 +200,14 @@ const base::Feature kRecoverFromNeverSaveAndroid = { - const base::Feature kPasswordStrengthIndicator = { - "PasswordStrengthIndicator", base::FEATURE_DISABLED_BY_DEFAULT}; + BASE_FEATURE(kForceInitialSyncWhenDecryptionFails, +@@ -222,7 +222,7 @@ BASE_FEATURE(kPasswordStrengthIndicator, + "PasswordStrengthIndicator", + base::FEATURE_DISABLED_BY_DEFAULT); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Displays at least the decryptable and never saved logins in the password // manager - const base::Feature kSkipUndecryptablePasswords = { - "SkipUndecryptablePasswords", base::FEATURE_DISABLED_BY_DEFAULT}; + BASE_FEATURE(kSkipUndecryptablePasswords, +@@ -230,7 +230,7 @@ BASE_FEATURE(kSkipUndecryptablePasswords, + base::FEATURE_DISABLED_BY_DEFAULT); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // When enabled, all undecryptable passwords are deleted from the local database // during initial sync flow. - const base::Feature kSyncUndecryptablePasswordsLinux = { + BASE_FEATURE(kSyncUndecryptablePasswordsLinux, diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.h index 59e90a1b5e9e..8e702dc248e1 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.h +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.h @@ -1,24 +1,24 @@ ---- components/password_manager/core/common/password_manager_features.h.orig 2022-10-29 17:50:56 UTC +--- components/password_manager/core/common/password_manager_features.h.orig 2022-12-02 17:56:32 UTC +++ components/password_manager/core/common/password_manager_features.h -@@ -38,7 +38,7 @@ extern const base::Feature KEnablePasswordGenerationFo - extern const base::Feature kEnablePasswordManagerWithinFencedFrame; - extern const base::Feature kFillingAcrossAffiliatedWebsites; - extern const base::Feature kFillOnAccountSelect; +@@ -38,7 +38,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) - extern const base::Feature kForceInitialSyncWhenDecryptionFails; + BASE_DECLARE_FEATURE(kForceInitialSyncWhenDecryptionFails); #endif - extern const base::Feature kInferConfirmationPasswordField; -@@ -68,10 +68,10 @@ extern const base::Feature kPasswordScriptsFetching; - extern const base::Feature kPasswordsGrouping; - extern const base::Feature kPasswordStrengthIndicator; - extern const base::Feature kRecoverFromNeverSaveAndroid; + BASE_DECLARE_FEATURE(kInferConfirmationPasswordField); +@@ -65,10 +65,10 @@ BASE_DECLARE_FEATURE(kPasswordScriptsFetching); + BASE_DECLARE_FEATURE(kPasswordsGrouping); + BASE_DECLARE_FEATURE(kPasswordStrengthIndicator); + BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - extern const base::Feature kSkipUndecryptablePasswords; + BASE_DECLARE_FEATURE(kSkipUndecryptablePasswords); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - extern const base::Feature kSyncUndecryptablePasswordsLinux; + BASE_DECLARE_FEATURE(kSyncUndecryptablePasswordsLinux); #endif #if BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/files/patch-components_performance__manager_public_features.h b/www/ungoogled-chromium/files/patch-components_performance__manager_public_features.h index 313517a226cf..c5a9578df14d 100644 --- a/www/ungoogled-chromium/files/patch-components_performance__manager_public_features.h +++ b/www/ungoogled-chromium/files/patch-components_performance__manager_public_features.h @@ -1,6 +1,6 @@ ---- components/performance_manager/public/features.h.orig 2022-10-01 07:40:07 UTC +--- components/performance_manager/public/features.h.orig 2022-12-02 17:56:32 UTC +++ components/performance_manager/public/features.h -@@ -20,7 +20,7 @@ extern const base::Feature kRunOnMainThread; +@@ -20,7 +20,7 @@ BASE_DECLARE_FEATURE(kRunOnMainThread); #if !BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/www/ungoogled-chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc index 871cd617c130..1b947584c78c 100644 --- a/www/ungoogled-chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc +++ b/www/ungoogled-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-10-01 07:40:07 UTC +--- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2022-12-02 17:56:32 UTC +++ components/policy/core/browser/policy_pref_mapping_test.cc -@@ -338,7 +338,7 @@ class PolicyTestCase { +@@ -337,7 +337,7 @@ class PolicyTestCase { const std::string os("chromeos_lacros"); #elif BUILDFLAG(IS_IOS) const std::string os("ios"); diff --git a/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc index 9ec77c61a2c4..2a65f4c8355c 100644 --- a/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc +++ b/www/ungoogled-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-10-01 07:40:07 UTC +--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2022-12-02 17:56:32 UTC +++ components/policy/core/common/cloud/cloud_policy_client.cc -@@ -447,7 +447,7 @@ void CloudPolicyClient::FetchPolicy() { +@@ -448,7 +448,7 @@ void CloudPolicyClient::FetchPolicy() { fetch_request->set_invalidation_payload(invalidation_payload_); } } diff --git a/www/ungoogled-chromium/files/patch-components_policy_resources_policy__templates.json b/www/ungoogled-chromium/files/patch-components_policy_resources_policy__templates.json index e86799c8cc4e..d7e0eb737a4e 100644 --- a/www/ungoogled-chromium/files/patch-components_policy_resources_policy__templates.json +++ b/www/ungoogled-chromium/files/patch-components_policy_resources_policy__templates.json @@ -1,6 +1,6 @@ ---- components/policy/resources/policy_templates.json.orig 2022-10-29 17:50:56 UTC +--- components/policy/resources/policy_templates.json.orig 2022-12-02 17:56:32 UTC +++ components/policy/resources/policy_templates.json -@@ -1450,7 +1450,7 @@ +@@ -1454,7 +1454,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -9,7 +9,7 @@ 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, -@@ -2600,7 +2600,7 @@ +@@ -2604,7 +2604,7 @@ 'owners': ['file://remoting/OWNERS', 'jamiewalch@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,7 +18,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -4420,7 +4420,7 @@ +@@ -4455,7 +4455,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -27,7 +27,7 @@ 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': False, -@@ -4450,7 +4450,7 @@ +@@ -4485,7 +4485,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@ch40m1um.qjz9zk'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -36,7 +36,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -5434,7 +5434,7 @@ +@@ -5469,7 +5469,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -45,7 +45,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -5496,7 +5496,7 @@ +@@ -5531,7 +5531,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -54,7 +54,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -5563,7 +5563,7 @@ +@@ -5598,7 +5598,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -63,7 +63,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -11183,7 +11183,7 @@ +@@ -11250,7 +11250,7 @@ 'owners': ['file://net/cert/OWNERS', 'rsleevi@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -72,7 +72,7 @@ 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, -@@ -11308,7 +11308,7 @@ +@@ -11375,7 +11375,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -81,7 +81,7 @@ 'deprecated': True, 'features': { 'dynamic_refresh': False, -@@ -13738,7 +13738,7 @@ +@@ -13901,7 +13901,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -90,7 +90,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -14608,7 +14608,7 @@ +@@ -14970,7 +14970,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -99,7 +99,7 @@ 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, -@@ -17483,7 +17483,7 @@ +@@ -18548,7 +18548,7 @@ 'deprecated': True, 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:64-', 'chrome.mac:66-', 'android:65-'], @@ -108,7 +108,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -21716,7 +21716,7 @@ +@@ -23132,7 +23132,7 @@ 'items': { 'type': 'string' } }, # Spell checking is provided by macOS, so can't be controlled on Mac. @@ -117,7 +117,7 @@ 'features': { 'can_be_recommended': False, 'dynamic_refresh': True, -@@ -21747,7 +21747,7 @@ +@@ -23163,7 +23163,7 @@ 'items': { 'type': 'string' } }, # Spell checking is provided by macOS, so can't be controlled on Mac. @@ -126,7 +126,7 @@ 'deprecated': True, 'features': { 'can_be_recommended': False, -@@ -21781,7 +21781,7 @@ +@@ -23197,7 +23197,7 @@ 'items': { 'type': 'string' } }, # Spell checking is provided by macOS, so can't be controlled on Mac. @@ -135,7 +135,7 @@ 'features': { 'can_be_recommended': False, 'dynamic_refresh': True, -@@ -22565,7 +22565,7 @@ +@@ -24076,7 +24076,7 @@ 'owners': ['fbeaufort@ch40m1um.qjz9zk', 'beccahughes@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -144,7 +144,7 @@ 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, -@@ -27314,7 +27314,7 @@ +@@ -29297,7 +29297,7 @@ 'owners': ['file://services/audio/OWNERS', 'dalecurtis@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -153,7 +153,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -28714,7 +28714,7 @@ If this policy is left unset, privacy screen is disabl +@@ -30795,7 +30795,7 @@ If this policy is left unset, privacy screen is disabl 'owners': ['file://chrome/browser/notifications/OWNERS', 'knollr@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -162,7 +162,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -28738,7 +28738,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google +@@ -30819,7 +30819,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google 'owners': ['file://chrome/browser/notifications/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -171,7 +171,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -29848,7 +29848,7 @@ If you disable this policy, web page scrolling to spec +@@ -32044,7 +32044,7 @@ If you disable this policy, web page scrolling to spec 'owners': ['asumaneev@9oo91e.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -180,7 +180,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -31206,7 +31206,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PR +@@ -33402,7 +33402,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PR }, ], 'default': True, @@ -189,7 +189,7 @@ 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, -@@ -31340,7 +31340,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PR +@@ -33536,7 +33536,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PR 'owners': ['mattm@ch40m1um.qjz9zk'], 'type': 'main', 'schema': { 'type': 'boolean' }, diff --git a/www/ungoogled-chromium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc b/www/ungoogled-chromium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc index 36eca150dc71..c4ea333fa5d9 100644 --- a/www/ungoogled-chromium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc +++ b/www/ungoogled-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-10-29 17:50:56 UTC +--- components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc.orig 2022-12-02 17:56:32 UTC +++ components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc -@@ -184,7 +184,7 @@ void CrossDeviceUserSegment::ExecuteModelWithInput( +@@ -200,7 +200,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/ungoogled-chromium/files/patch-components_storage__monitor_BUILD.gn b/www/ungoogled-chromium/files/patch-components_storage__monitor_BUILD.gn index 638902b77608..397269c656e4 100644 --- a/www/ungoogled-chromium/files/patch-components_storage__monitor_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-components_storage__monitor_BUILD.gn @@ -1,6 +1,15 @@ ---- components/storage_monitor/BUILD.gn.orig 2022-10-01 07:40:07 UTC +--- components/storage_monitor/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ components/storage_monitor/BUILD.gn -@@ -175,7 +175,7 @@ source_set("unit_tests") { +@@ -74,7 +74,7 @@ static_library("storage_monitor") { + deps += [ "//services/device/public/mojom" ] + } + } else if (is_linux || is_chromeos_lacros) { +- if (use_udev) { ++ if (use_udev && !is_bsd) { + sources += [ + "mtab_watcher_linux.cc", + "mtab_watcher_linux.h", +@@ -178,7 +178,7 @@ source_set("unit_tests") { "storage_monitor_chromeos_unittest.cc", ] } diff --git a/www/ungoogled-chromium/files/patch-components_sync__device__info_local__device__info__util.cc b/www/ungoogled-chromium/files/patch-components_sync__device__info_local__device__info__util.cc index f7b7a5d3b001..6985e3eace7d 100644 --- a/www/ungoogled-chromium/files/patch-components_sync__device__info_local__device__info__util.cc +++ b/www/ungoogled-chromium/files/patch-components_sync__device__info_local__device__info__util.cc @@ -1,4 +1,4 @@ ---- components/sync_device_info/local_device_info_util.cc.orig 2022-10-01 07:40:07 UTC +--- components/sync_device_info/local_device_info_util.cc.orig 2022-12-02 17:56:32 UTC +++ components/sync_device_info/local_device_info_util.cc @@ -78,7 +78,7 @@ void OnMachineStatisticsLoaded(LocalDeviceNameInfo* na sync_pb::SyncEnums::DeviceType GetLocalDeviceType() { @@ -9,3 +9,21 @@ 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() { + return DeviceInfo::OsType::kChromeOsAsh; + #elif BUILDFLAG(IS_CHROMEOS_LACROS) + return DeviceInfo::OsType::kChromeOsLacros; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return DeviceInfo::OsType::kLinux; + #elif BUILDFLAG(IS_ANDROID) + return DeviceInfo::OsType::kAndroid; +@@ -117,7 +117,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { + + DeviceInfo::FormFactor GetLocalDeviceFormFactor() { + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + return DeviceInfo::FormFactor::kDesktop; + #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) + return ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET diff --git a/www/ungoogled-chromium/files/patch-components_translate_core_common_translate__util.cc b/www/ungoogled-chromium/files/patch-components_translate_core_common_translate__util.cc index c44dda62a6e7..86f3a642da0f 100644 --- a/www/ungoogled-chromium/files/patch-components_translate_core_common_translate__util.cc +++ b/www/ungoogled-chromium/files/patch-components_translate_core_common_translate__util.cc @@ -1,11 +1,11 @@ ---- components/translate/core/common/translate_util.cc.orig 2022-10-29 17:50:56 UTC +--- components/translate/core/common/translate_util.cc.orig 2022-12-02 17:56:32 UTC +++ components/translate/core/common/translate_util.cc -@@ -34,7 +34,7 @@ const base::Feature kTranslateSubFrames{"TranslateSubF - const base::Feature kTFLiteLanguageDetectionEnabled { - "TFLiteLanguageDetectionEnabled", +@@ -35,7 +35,7 @@ BASE_FEATURE(kTranslateSubFrames, + BASE_FEATURE(kTFLiteLanguageDetectionEnabled, + "TFLiteLanguageDetectionEnabled", #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT + base::FEATURE_ENABLED_BY_DEFAULT #else - base::FEATURE_DISABLED_BY_DEFAULT + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/ungoogled-chromium/files/patch-components_variations_service_variations__service.cc b/www/ungoogled-chromium/files/patch-components_variations_service_variations__service.cc new file mode 100644 index 000000000000..5d7aca221358 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_variations_service_variations__service.cc @@ -0,0 +1,11 @@ +--- components/variations/service/variations_service.cc.orig 2022-12-02 17:56:32 UTC ++++ components/variations/service/variations_service.cc +@@ -95,7 +95,7 @@ std::string GetPlatformString() { + return "android"; + #elif BUILDFLAG(IS_FUCHSIA) + return "fuchsia"; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_SOLARIS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_BSD) + // Default BSD and SOLARIS to Linux to not break those builds, although these + // platforms are not officially supported by Chrome. + return "linux"; diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc index 98fe89d84c50..104dc5d9d858 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -1,4 +1,4 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2022-10-29 17:50:56 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2022-12-02 17:56:32 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc @@ -1161,7 +1161,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetDeviceQueue() @@ -9,3 +9,12 @@ // Textures that were allocated _on linux_ with ycbcr info came from // VaapiVideoDecoder, which exports using DRM format modifiers. return GrBackendFormat::MakeVk(gr_ycbcr_info, +@@ -1180,7 +1180,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/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc b/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc index 0544a08a461b..5993129e07ce 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display/skia_renderer.cc.orig 2022-10-29 17:50:56 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2022-12-02 17:56:32 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1135,7 +1135,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1129,7 +1129,7 @@ void SkiaRenderer::ClearFramebuffer() { if (current_frame()->current_render_pass->has_transparent_background) { ClearCanvas(SkColors::kTransparent); } else { diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc index c3bf31ec5556..cafa8c04366f 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2022-10-01 07:40:07 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2022-12-02 17:56:32 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -@@ -97,7 +97,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -98,7 +98,7 @@ RootCompositorFrameSinkImpl::Create( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // For X11, we need notify client about swap completion after resizing, so the // client can use it for synchronize with X11 WM. output_surface->SetNeedsSwapSizeNotifications(true); -@@ -576,7 +576,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -577,7 +577,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw display_client_->DidCompleteSwapWithSize(pixel_size); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc b/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc index a18e9780d66b..73f9e06be7f5 100644 --- a/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc @@ -1,6 +1,6 @@ ---- content/app/content_main_runner_impl.cc.orig 2022-10-29 17:50:56 UTC +--- content/app/content_main_runner_impl.cc.orig 2022-12-02 17:56:32 UTC +++ content/app/content_main_runner_impl.cc -@@ -133,13 +133,13 @@ +@@ -135,13 +135,13 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" @@ -16,7 +16,7 @@ #include "base/native_library.h" #include "base/rand_util.h" #include "content/public/common/zygote/sandbox_support_linux.h" -@@ -178,6 +178,10 @@ +@@ -180,6 +180,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" -@@ -375,7 +379,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -382,7 +386,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 -@@ -411,7 +415,7 @@ void PreloadLibraryCdms() { +@@ -418,7 +422,7 @@ void PreloadLibraryCdms() { } #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS) @@ -45,9 +45,9 @@ void PreSandboxInit() { // Pre-acquire resources needed by BoringSSL. See // https://boringssl.9oo91esource.qjz9zk/boringssl/+/HEAD/SANDBOXING.md -@@ -427,6 +431,11 @@ void PreSandboxInit() { +@@ -441,6 +445,11 @@ void PreSandboxInit() { + } #endif - InitializeWebRtcModule(); +#if BUILDFLAG(IS_BSD) + // "cache" the amount of physical memory before pledge(2) @@ -57,7 +57,7 @@ // Set the android SkFontMgr for blink. We need to ensure this is done // before the sandbox is initialized to allow the font manager to access // font configuration files on disk. -@@ -609,7 +618,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* +@@ -623,7 +632,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -66,7 +66,7 @@ PreSandboxInit(); #endif -@@ -803,11 +812,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -817,11 +826,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -80,7 +80,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -990,6 +998,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1007,6 +1015,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam } #endif @@ -97,7 +97,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE_HANDLE) -@@ -1053,7 +1071,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1070,7 +1088,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { process_type); } @@ -106,7 +106,7 @@ // If dynamic Mojo Core is being used, ensure that it's loaded very early in // the child/zygote process, before any sandbox is initialized. The library // is not fully initialized with IPC support until a ChildProcess is later -@@ -1086,6 +1104,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1103,6 +1121,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); diff --git a/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn b/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn index 5ecee8d873fa..56b26fc7a712 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- content/browser/BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- content/browser/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ content/browser/BUILD.gn -@@ -2484,6 +2484,13 @@ source_set("browser") { +@@ -2491,6 +2491,13 @@ source_set("browser") { ] } diff --git a/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc index ec1aa82e9a58..629fffe50f60 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_child_process_host_impl.cc.orig 2022-10-01 07:40:07 UTC +--- content/browser/browser_child_process_host_impl.cc.orig 2022-12-02 17:56:32 UTC +++ content/browser/browser_child_process_host_impl.cc -@@ -307,6 +307,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo +@@ -316,6 +316,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo switches::kDisableBestEffortTasks, switches::kDisableLogging, switches::kEnableLogging, diff --git a/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc b/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc index c2d1c4d2a77d..f4a39bdb079a 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2022-10-29 17:50:56 UTC +--- content/browser/browser_main_loop.cc.orig 2022-12-02 17:56:32 UTC +++ content/browser/browser_main_loop.cc -@@ -241,6 +241,12 @@ +@@ -242,6 +242,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 -@@ -524,6 +530,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -526,6 +532,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 -@@ -555,7 +567,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -557,7 +569,7 @@ int BrowserMainLoop::EarlyInitialization() { base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc b/www/ungoogled-chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc index 4e510182d6e1..b5a5c135cdf2 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc @@ -1,6 +1,6 @@ ---- content/browser/compositor/viz_process_transport_factory.cc.orig 2022-10-29 17:50:56 UTC +--- content/browser/compositor/viz_process_transport_factory.cc.orig 2022-12-02 17:56:32 UTC +++ content/browser/compositor/viz_process_transport_factory.cc -@@ -115,7 +115,7 @@ class HostDisplayClient : public viz::HostDisplayClien +@@ -118,7 +118,7 @@ class HostDisplayClient : public viz::HostDisplayClien // viz::HostDisplayClient: // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__process__host.cc index 6f23cc019cf3..a692b245bb5f 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2022-10-29 17:50:56 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2022-12-02 17:56:32 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -249,6 +249,7 @@ static const char* const kSwitchNames[] = { +@@ -255,6 +255,7 @@ static const char* const kSwitchNames[] = { switches::kEnableBackgroundThreadPool, switches::kEnableGpuRasterization, switches::kEnableLogging, @@ -8,7 +8,7 @@ switches::kEnableDeJelly, switches::kDeJellyScreenWidth, switches::kDoubleBufferCompositing, -@@ -282,7 +283,7 @@ static const char* const kSwitchNames[] = { +@@ -288,7 +289,7 @@ static const char* const kSwitchNames[] = { switches::kOzoneDumpFile, switches::kDisableBufferBWCompression, #endif diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__message__filter.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__message__filter.cc index b05ad23c9acb..992caf5abf4e 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__message__filter.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__message__filter.cc @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/render_message_filter.cc.orig 2022-10-01 07:40:07 UTC +--- content/browser/renderer_host/render_message_filter.cc.orig 2022-12-02 17:56:32 UTC +++ content/browser/renderer_host/render_message_filter.cc @@ -66,7 +66,7 @@ #if BUILDFLAG(IS_MAC) @@ -9,8 +9,8 @@ #include "base/linux_util.h" #include "base/threading/platform_thread.h" #endif -@@ -128,7 +128,7 @@ void RenderMessageFilter::GenerateFrameRoutingID( - std::move(callback).Run(routing_id, frame_token, devtools_frame_token); +@@ -130,7 +130,7 @@ void RenderMessageFilter::GenerateFrameRoutingID( + document_token); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -18,7 +18,7 @@ void RenderMessageFilter::SetThreadTypeOnWorkerThread( base::PlatformThreadId ns_tid, base::ThreadType thread_type) { -@@ -149,7 +149,7 @@ void RenderMessageFilter::SetThreadTypeOnWorkerThread( +@@ -151,7 +151,7 @@ void RenderMessageFilter::SetThreadTypeOnWorkerThread( } #endif diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index 1d7a9984dd8a..63e42a5abc75 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2022-10-29 17:50:56 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2022-12-02 17:56:32 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -213,7 +213,7 @@ +@@ -214,7 +214,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -1137,7 +1137,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1138,7 +1138,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; -@@ -1224,7 +1224,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1225,7 +1225,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } @@ -27,7 +27,7 @@ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -2119,7 +2119,7 @@ void RenderProcessHostImpl::ReinitializeLogging( +@@ -2120,7 +2120,7 @@ void RenderProcessHostImpl::ReinitializeLogging( } #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -36,7 +36,7 @@ void RenderProcessHostImpl::CreateStableVideoDecoder( mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) { if (!stable_video_decoder_factory_remote_.is_bound()) { -@@ -3259,6 +3259,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3270,6 +3270,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, @@ -44,7 +44,7 @@ switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, switches::kDisableWebGLImageChromium, -@@ -4736,7 +4737,7 @@ void RenderProcessHostImpl::ResetIPC() { +@@ -4746,7 +4747,7 @@ void RenderProcessHostImpl::ResetIPC() { coordinator_connector_receiver_.reset(); tracing_registration_.reset(); diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h index cdfb414f3f66..dbb41d5ece9f 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2022-10-29 17:50:56 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2022-12-02 17:56:32 UTC +++ content/browser/renderer_host/render_process_host_impl.h @@ -83,7 +83,7 @@ #include "content/public/browser/android/child_process_importance.h" @@ -9,7 +9,7 @@ #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -479,7 +479,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -480,7 +480,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) -@@ -678,7 +678,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -679,7 +679,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; -@@ -1133,7 +1133,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -1134,7 +1134,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // RenderProcessHost. This is destroyed early in ResetIPC() method. std::unique_ptr<PermissionServiceContext> permission_service_context_; diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc index bcbf9c866f19..72c138d99568 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2022-10-29 17:50:56 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2022-12-02 17:56:32 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -254,7 +254,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -253,7 +253,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index aeec891af9ab..f558af26b99e 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2022-10-29 17:50:56 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2022-12-02 17:56:32 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -116,7 +116,7 @@ +@@ -118,7 +118,7 @@ #include "ui/gfx/gdi_util.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/linux/linux_ui.h" -@@ -449,7 +449,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -451,7 +451,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); @@ -18,7 +18,7 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1587,7 +1587,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1589,7 +1589,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return GetTextInputManager() && GetTextInputManager()->should_do_learning(); } @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2407,7 +2407,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2415,7 +2415,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2584,7 +2584,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2592,7 +2592,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/ungoogled-chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc b/www/ungoogled-chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc index e2c2b3c24c0a..dc208ce38bd5 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc @@ -1,6 +1,17 @@ ---- content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2022-10-01 07:40:07 UTC +--- content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2022-12-02 17:56:32 UTC +++ content/browser/zygote_host/zygote_host_impl_linux.cc -@@ -28,6 +28,7 @@ namespace content { +@@ -19,8 +19,10 @@ + #include "build/chromeos_buildflags.h" + #include "content/common/zygote/zygote_commands_linux.h" + #include "content/common/zygote/zygote_communication_linux.h" ++#if !BUILDFLAG(IS_BSD) + #include "content/common/zygote/zygote_handle_impl_linux.h" + #include "content/public/common/zygote/zygote_handle.h" ++#endif + #include "sandbox/linux/services/credentials.h" + #include "sandbox/linux/services/namespace_sandbox.h" + #include "sandbox/linux/suid/client/setuid_sandbox_host.h" +@@ -38,6 +40,7 @@ namespace content { namespace { @@ -8,7 +19,7 @@ // Receive a fixed message on fd and return the sender's PID. // Returns true if the message received matches the expected message. bool ReceiveFixedMessage(int fd, -@@ -49,6 +50,7 @@ bool ReceiveFixedMessage(int fd, +@@ -59,6 +62,7 @@ bool ReceiveFixedMessage(int fd, return false; return true; } @@ -16,7 +27,7 @@ } // namespace -@@ -58,9 +60,13 @@ ZygoteHost* ZygoteHost::GetInstance() { +@@ -68,9 +72,13 @@ ZygoteHost* ZygoteHost::GetInstance() { } ZygoteHostImpl::ZygoteHostImpl() @@ -30,7 +41,7 @@ sandbox_binary_(), zygote_pids_lock_(), zygote_pids_() {} -@@ -73,6 +79,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() { +@@ -83,6 +91,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() { } void ZygoteHostImpl::Init(const base::CommandLine& command_line) { @@ -38,7 +49,7 @@ if (command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) { return; } -@@ -123,6 +130,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com +@@ -133,6 +142,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com "you can try using --" << sandbox::policy::switches::kNoSandbox << "."; } @@ -46,7 +57,7 @@ } void ZygoteHostImpl::AddZygotePid(pid_t pid) { -@@ -147,6 +155,7 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -157,6 +167,7 @@ pid_t ZygoteHostImpl::LaunchZygote( base::CommandLine* cmd_line, base::ScopedFD* control_fd, base::FileHandleMappingVector additional_remapped_fds) { @@ -54,7 +65,7 @@ int fds[2]; CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds)); CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0])); -@@ -214,9 +223,12 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -224,9 +235,12 @@ pid_t ZygoteHostImpl::LaunchZygote( AddZygotePid(pid); return pid; diff --git a/www/ungoogled-chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h b/www/ungoogled-chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h index 026b272c0f92..279aca6a1e60 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h +++ b/www/ungoogled-chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h @@ -1,21 +1,25 @@ ---- content/browser/zygote_host/zygote_host_impl_linux.h.orig 2022-10-01 07:40:07 UTC +--- content/browser/zygote_host/zygote_host_impl_linux.h.orig 2022-12-02 17:56:32 UTC +++ content/browser/zygote_host/zygote_host_impl_linux.h -@@ -42,8 +42,10 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHos +@@ -47,12 +47,14 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHos base::ScopedFD* control_fd, base::FileHandleMappingVector additional_remapped_fds); -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) void AdjustRendererOOMScore(base::ProcessHandle process_handle, int score) override; + #if BUILDFLAG(IS_CHROMEOS_ASH) + void ReinitializeLogging(uint32_t logging_dest, + base::PlatformFile log_file_fd) override; + #endif +#endif + bool HasZygote() { return !zygote_pids_.empty(); } - private: -@@ -57,9 +59,11 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHos +@@ -67,9 +69,11 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHos int renderer_sandbox_status_; -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) bool use_namespace_sandbox_; bool use_suid_sandbox_; bool use_suid_sandbox_for_adj_oom_score_; diff --git a/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc b/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc index 55d9fbdeced2..c78fd07269f1 100644 --- a/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_main.cc.orig 2022-10-01 07:40:07 UTC +--- content/gpu/gpu_main.cc.orig 2022-12-02 17:56:32 UTC +++ content/gpu/gpu_main.cc -@@ -86,7 +86,7 @@ +@@ -87,7 +87,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_); -@@ -266,7 +266,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -268,7 +268,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 -@@ -401,7 +401,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -403,7 +403,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { diff --git a/www/ungoogled-chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc b/www/ungoogled-chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc index 19f8d6592ad6..1f016e7c166b 100644 --- a/www/ungoogled-chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc +++ b/www/ungoogled-chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2022-10-29 17:50:56 UTC +--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2022-12-02 17:56:32 UTC +++ content/gpu/gpu_sandbox_hook_linux.cc -@@ -121,6 +121,7 @@ void AddStandardChromeOsPermissions( +@@ -126,6 +126,7 @@ void AddStandardChromeOsPermissions( permissions->push_back(BrokerFilePermission::ReadOnly(kAngleGlesPath)); } @@ -8,7 +8,7 @@ void AddV4L2GpuPermissions( std::vector<BrokerFilePermission>* permissions, const sandbox::policy::SandboxSeccompBPF::Options& options) { -@@ -440,8 +441,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp +@@ -445,8 +446,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp AddStandardGpuPermissions(&permissions); return permissions; } @@ -19,7 +19,7 @@ // Preload the Mali library. if (UseChromecastSandboxAllowlist()) { for (const char* path : kAllowedChromecastPaths) { -@@ -483,6 +486,7 @@ void LoadArmGpuLibraries() { +@@ -488,6 +491,7 @@ void LoadArmGpuLibraries() { dlopen(driver_paths[i], dlopen_flag); } } @@ -27,7 +27,7 @@ } bool LoadAmdGpuLibraries() { -@@ -550,12 +554,14 @@ void LoadV4L2Libraries( +@@ -555,12 +559,14 @@ void LoadV4L2Libraries( } void LoadChromecastV4L2Libraries() { @@ -42,7 +42,7 @@ } bool LoadLibrariesForGpu( -@@ -583,6 +589,7 @@ bool LoadLibrariesForGpu( +@@ -588,6 +594,7 @@ bool LoadLibrariesForGpu( return true; } @@ -50,7 +50,7 @@ sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU( const sandbox::policy::SandboxLinux::Options& options) { sandbox::syscall_broker::BrokerCommandSet command_set; -@@ -605,13 +612,17 @@ bool BrokerProcessPreSandboxHook( +@@ -610,13 +617,17 @@ bool BrokerProcessPreSandboxHook( SetProcessTitleFromCommandLine(nullptr); return true; } diff --git a/www/ungoogled-chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc b/www/ungoogled-chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc index c3148a341b66..93bd6e95dee2 100644 --- a/www/ungoogled-chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc +++ b/www/ungoogled-chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc @@ -1,4 +1,4 @@ ---- content/ppapi_plugin/ppapi_plugin_main.cc.orig 2022-10-01 07:40:07 UTC +--- content/ppapi_plugin/ppapi_plugin_main.cc.orig 2022-12-02 17:56:32 UTC +++ content/ppapi_plugin/ppapi_plugin_main.cc @@ -53,6 +53,11 @@ #include "gin/v8_initializer.h" @@ -12,7 +12,7 @@ #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) #include <stdlib.h> #endif -@@ -136,7 +141,7 @@ int PpapiPluginMain(MainFunctionParams parameters) { +@@ -146,7 +151,7 @@ int PpapiPluginMain(MainFunctionParams parameters) { gin::V8Initializer::LoadV8Snapshot(); #endif diff --git a/www/ungoogled-chromium/files/patch-content_public_browser_render__process__host.h b/www/ungoogled-chromium/files/patch-content_public_browser_render__process__host.h index f25bd21ddf25..a382ad12c3e8 100644 --- a/www/ungoogled-chromium/files/patch-content_public_browser_render__process__host.h +++ b/www/ungoogled-chromium/files/patch-content_public_browser_render__process__host.h @@ -1,4 +1,4 @@ ---- content/public/browser/render_process_host.h.orig 2022-10-29 17:50:56 UTC +--- content/public/browser/render_process_host.h.orig 2022-12-02 17:56:32 UTC +++ content/public/browser/render_process_host.h @@ -53,7 +53,7 @@ #include "content/public/browser/android/child_process_importance.h" @@ -9,7 +9,7 @@ #include "media/mojo/mojom/stable/stable_video_decoder.mojom-forward.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -614,7 +614,7 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::S +@@ -618,7 +618,7 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::S const blink::StorageKey& storage_key, mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) = 0; diff --git a/www/ungoogled-chromium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h b/www/ungoogled-chromium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h index 5a50e595b73f..a4184c403af5 100644 --- a/www/ungoogled-chromium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h +++ b/www/ungoogled-chromium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h @@ -1,16 +1,16 @@ ---- content/public/browser/zygote_host/zygote_host_linux.h.orig 2022-10-01 07:40:07 UTC +--- content/public/browser/zygote_host/zygote_host_linux.h.orig 2022-12-02 17:56:32 UTC +++ content/public/browser/zygote_host/zygote_host_linux.h -@@ -30,11 +30,13 @@ class ZygoteHost { +@@ -35,11 +35,13 @@ class ZygoteHost { // after the first render has been forked. virtual int GetRendererSandboxStatus() = 0; -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) // Adjust the OOM score of the given renderer's PID. The allowed // range for the score is [0, 1000], where higher values are more // likely to be killed by the OOM killer. virtual void AdjustRendererOOMScore(base::ProcessHandle process_handle, int score) = 0; +#endif - }; - } // namespace content + #if BUILDFLAG(IS_CHROMEOS_ASH) + // Reinitialize logging for the Zygote processes. Needed on ChromeOS, which diff --git a/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc b/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc index 63a7d2b8de6a..c5df90ed73c4 100644 --- a/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc +++ b/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc @@ -1,50 +1,50 @@ ---- content/public/common/content_features.cc.orig 2022-10-29 17:50:56 UTC +--- content/public/common/content_features.cc.orig 2022-12-02 17:56:32 UTC +++ content/public/common/content_features.cc -@@ -43,7 +43,7 @@ const base::Feature kAudioServiceOutOfProcess { - "AudioServiceOutOfProcess", +@@ -46,7 +46,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, + "AudioServiceOutOfProcess", // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) - base::FEATURE_ENABLED_BY_DEFAULT + base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -55,7 +55,7 @@ const base::Feature kAudioServiceOutOfProcess { +@@ -58,7 +58,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, // kAudioServiceOutOfProcess feature is enabled. - const base::Feature kAudioServiceSandbox { - "AudioServiceSandbox", + BASE_FEATURE(kAudioServiceSandbox, + "AudioServiceSandbox", -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT + base::FEATURE_ENABLED_BY_DEFAULT #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -1102,7 +1102,7 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB - const base::Feature kWebAssemblyCodeProtection{ - "WebAssemblyCodeProtection", base::FEATURE_ENABLED_BY_DEFAULT}; + base::FEATURE_DISABLED_BY_DEFAULT +@@ -1228,7 +1228,7 @@ BASE_FEATURE(kWebAssemblyCodeProtection, + "WebAssemblyCodeProtection", + base::FEATURE_DISABLED_BY_DEFAULT); -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) // 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. -@@ -1138,7 +1138,7 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi - const base::Feature kWebAssemblyTrapHandler { - "WebAssemblyTrapHandler", +@@ -1270,7 +1270,7 @@ BASE_FEATURE(kWebAssemblyTiering, + BASE_FEATURE(kWebAssemblyTrapHandler, + "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_MAC)) && \ + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) && \ defined(ARCH_CPU_X86_64)) || \ (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) - base::FEATURE_ENABLED_BY_DEFAULT -@@ -1208,7 +1208,11 @@ const base::Feature kWebUIReportOnlyTrustedTypes{ + base::FEATURE_ENABLED_BY_DEFAULT +@@ -1345,7 +1345,11 @@ BASE_FEATURE(kWebUIReportOnlyTrustedTypes, // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb +#if BUILDFLAG(IS_BSD) -+const base::Feature kWebUsb{"WebUSB", base::FEATURE_DISABLED_BY_DEFAULT}; ++BASE_FEATURE(kWebUsb, "WebUSB", base::FEATURE_DISABLED_BY_DEFAULT); +#else - const base::Feature kWebUsb{"WebUSB", base::FEATURE_ENABLED_BY_DEFAULT}; + BASE_FEATURE(kWebUsb, "WebUSB", base::FEATURE_ENABLED_BY_DEFAULT); +#endif // Controls whether the WebXR Device API is enabled. - const base::Feature kWebXr{"WebXR", base::FEATURE_ENABLED_BY_DEFAULT}; + BASE_FEATURE(kWebXr, "WebXR", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-content_public_common_content__features.h b/www/ungoogled-chromium/files/patch-content_public_common_content__features.h index 61a2b4edd71d..bc24caaf7d0c 100644 --- a/www/ungoogled-chromium/files/patch-content_public_common_content__features.h +++ b/www/ungoogled-chromium/files/patch-content_public_common_content__features.h @@ -1,11 +1,11 @@ ---- content/public/common/content_features.h.orig 2022-10-29 17:50:56 UTC +--- content/public/common/content_features.h.orig 2022-12-02 17:56:32 UTC +++ content/public/common/content_features.h -@@ -284,7 +284,7 @@ CONTENT_EXPORT extern const base::Feature kJavaScriptE - CONTENT_EXPORT extern const base::Feature kWebAppWindowControlsOverlay; - CONTENT_EXPORT extern const base::Feature kWebAssemblyBaseline; - CONTENT_EXPORT extern const base::Feature kWebAssemblyCodeProtection; +@@ -272,7 +272,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kV8VmFuture); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAppWindowControlsOverlay); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyBaseline); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyCodeProtection); -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) - CONTENT_EXPORT extern const base::Feature kWebAssemblyCodeProtectionPku; + CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyCodeProtectionPku); #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && // defined(ARCH_CPU_X86_64) diff --git a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc index 5158f59279e2..65acec4911c5 100644 --- a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc +++ b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.cc.orig 2022-10-29 17:50:56 UTC +--- content/public/common/content_switches.cc.orig 2022-12-02 17:56:32 UTC +++ content/public/common/content_switches.cc -@@ -374,6 +374,8 @@ const char kEnableGpuMemoryBufferVideoFrames[] = +@@ -367,6 +367,8 @@ const char kEnableGpuMemoryBufferVideoFrames[] = // builds. const char kEnableLogging[] = "enable-logging"; @@ -9,7 +9,7 @@ // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables // triggering of change attribute of the NetInfo API when there is a change in // the connection type. -@@ -988,7 +990,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -994,7 +996,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/ungoogled-chromium/files/patch-content_public_common_content__switches.h b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.h index cd7264e13db6..aa622272a727 100644 --- a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.h +++ b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.h @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.h.orig 2022-10-29 17:50:56 UTC +--- content/public/common/content_switches.h.orig 2022-12-02 17:56:32 UTC +++ content/public/common/content_switches.h -@@ -119,6 +119,7 @@ CONTENT_EXPORT extern const char kEnableBlinkTestFeatu +@@ -118,6 +118,7 @@ CONTENT_EXPORT extern const char kEnableBlinkTestFeatu CONTENT_EXPORT extern const char kEnableGpuMemoryBufferVideoFrames[]; CONTENT_EXPORT extern const char kEnableLCDText[]; CONTENT_EXPORT extern const char kEnableLogging[]; @@ -8,7 +8,7 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -266,7 +267,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD +@@ -269,7 +270,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/ungoogled-chromium/files/patch-content_public_test_mock__render__thread.cc b/www/ungoogled-chromium/files/patch-content_public_test_mock__render__thread.cc index 2f51e0bffbf6..215d5ef0695e 100644 --- a/www/ungoogled-chromium/files/patch-content_public_test_mock__render__thread.cc +++ b/www/ungoogled-chromium/files/patch-content_public_test_mock__render__thread.cc @@ -1,6 +1,6 @@ ---- content/public/test/mock_render_thread.cc.orig 2022-10-01 07:40:07 UTC +--- content/public/test/mock_render_thread.cc.orig 2022-12-02 17:56:32 UTC +++ content/public/test/mock_render_thread.cc -@@ -62,7 +62,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend +@@ -64,7 +64,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend std::move(callback).Run(false); } diff --git a/www/ungoogled-chromium/files/patch-content_renderer_render__process__impl.cc b/www/ungoogled-chromium/files/patch-content_renderer_render__process__impl.cc index 00014eaf68ab..48edf5c6cc62 100644 --- a/www/ungoogled-chromium/files/patch-content_renderer_render__process__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_renderer_render__process__impl.cc @@ -1,4 +1,4 @@ ---- content/renderer/render_process_impl.cc.orig 2022-10-29 17:50:56 UTC +--- content/renderer/render_process_impl.cc.orig 2022-12-02 17:56:32 UTC +++ content/renderer/render_process_impl.cc @@ -46,7 +46,7 @@ #if BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ #include "v8/include/v8-wasm-trap-handler-posix.h" #endif -@@ -141,7 +141,7 @@ RenderProcessImpl::RenderProcessImpl() +@@ -154,7 +154,7 @@ RenderProcessImpl::RenderProcessImpl() SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtection, "--no-wasm-write-protect-code-memory"); @@ -18,12 +18,12 @@ SetV8FlagIfFeature(features::kWebAssemblyCodeProtectionPku, "--wasm-memory-protection-keys"); SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtectionPku, -@@ -226,7 +226,7 @@ RenderProcessImpl::RenderProcessImpl() +@@ -228,7 +228,7 @@ RenderProcessImpl::RenderProcessImpl() SetV8FlagIfNotFeature(features::kWebAssemblyDynamicTiering, "--no-wasm-dynamic-tiering"); -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) { - if (command_line->HasSwitch(switches::kEnableCrashpad) || - command_line->HasSwitch(switches::kEnableCrashReporter) || + base::CommandLine* const command_line = + base::CommandLine::ForCurrentProcess(); diff --git a/www/ungoogled-chromium/files/patch-content_renderer_render__thread__impl.cc b/www/ungoogled-chromium/files/patch-content_renderer_render__thread__impl.cc index d90fd75acf2c..f4bfe6762fdb 100644 --- a/www/ungoogled-chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_thread_impl.cc.orig 2022-10-29 17:50:56 UTC +--- content/renderer/render_thread_impl.cc.orig 2022-12-02 17:56:32 UTC +++ content/renderer/render_thread_impl.cc -@@ -190,7 +190,7 @@ +@@ -193,7 +193,7 @@ #if BUILDFLAG(IS_MAC) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #include <malloc.h> #endif -@@ -655,7 +655,7 @@ void RenderThreadImpl::Init() { +@@ -658,7 +658,7 @@ void RenderThreadImpl::Init() { base::DiscardableMemoryAllocator::SetInstance( discardable_memory_allocator_.get()); @@ -18,7 +18,7 @@ render_message_filter()->SetThreadType( ChildProcess::current()->io_thread_id(), base::ThreadType::kCompositing); #endif -@@ -1025,7 +1025,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1029,7 +1029,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: const bool enable_video_decode_accelerator = @@ -27,7 +27,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1036,7 +1036,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1040,7 +1040,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: const bool enable_video_encode_accelerator = diff --git a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc index cd6e5a453548..55aa9068c84a 100644 --- a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2022-10-29 17:50:56 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2022-12-02 17:56:32 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -108,7 +108,7 @@ +@@ -110,7 +110,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 -@@ -177,7 +177,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -180,7 +180,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()); -@@ -187,7 +187,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -190,7 +190,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -27,7 +27,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -258,7 +258,7 @@ RendererBlinkPlatformImpl::WrapURLLoaderFactory( +@@ -261,7 +261,7 @@ RendererBlinkPlatformImpl::WrapURLLoaderFactory( /*terminate_sync_load_event=*/nullptr); } @@ -36,7 +36,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::PlatformThreadId thread_id, base::ThreadType thread_type) { if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) { -@@ -269,7 +269,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -272,7 +272,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl #endif blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index 2658d25ec546..b67be8346977 100644 --- a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,4 +1,4 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2022-10-01 07:40:07 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2022-12-02 17:56:32 UTC +++ content/renderer/renderer_blink_platform_impl.h @@ -29,7 +29,7 @@ #include "third_party/blink/public/common/user_agent/user_agent_metadata.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -169,7 +169,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -171,7 +171,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi const blink::WebURL& top_document_web_url) override; gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; blink::WebString ConvertIDNToUnicode(const blink::WebString& host) override; @@ -18,7 +18,7 @@ void SetThreadType(base::PlatformThreadId thread_id, base::ThreadType) override; #endif -@@ -235,7 +235,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -237,7 +237,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) const; @@ -27,7 +27,7 @@ std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif -@@ -255,7 +255,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -257,7 +257,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/ungoogled-chromium/files/patch-content_shell_BUILD.gn b/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn index 657dc5346380..316bffe7a0a2 100644 --- a/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- content/shell/BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- content/shell/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ content/shell/BUILD.gn -@@ -897,7 +897,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/ungoogled-chromium/files/patch-content_test_BUILD.gn b/www/ungoogled-chromium/files/patch-content_test_BUILD.gn index be825817d053..03ac6beeb318 100644 --- a/www/ungoogled-chromium/files/patch-content_test_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-content_test_BUILD.gn @@ -1,6 +1,6 @@ ---- content/test/BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- content/test/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ content/test/BUILD.gn -@@ -2076,7 +2076,7 @@ static_library("run_all_unittests") { +@@ -2089,7 +2089,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -9,7 +9,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -3053,7 +3053,7 @@ test("content_unittests") { +@@ -3071,7 +3071,7 @@ test("content_unittests") { deps += [ "//third_party/boringssl" ] } diff --git a/www/ungoogled-chromium/files/patch-content_utility_services.cc b/www/ungoogled-chromium/files/patch-content_utility_services.cc index 8a0057625c29..16aa441d5848 100644 --- a/www/ungoogled-chromium/files/patch-content_utility_services.cc +++ b/www/ungoogled-chromium/files/patch-content_utility_services.cc @@ -1,6 +1,6 @@ ---- content/utility/services.cc.orig 2022-10-01 07:40:07 UTC +--- content/utility/services.cc.orig 2022-12-02 17:56:32 UTC +++ content/utility/services.cc -@@ -63,7 +63,7 @@ +@@ -66,7 +66,7 @@ extern sandbox::TargetServices* g_utility_target_services; #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ #include "sandbox/linux/services/libc_interceptor.h" #include "sandbox/policy/mojom/sandbox.mojom.h" #include "sandbox/policy/sandbox_type.h" -@@ -85,7 +85,7 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -88,7 +88,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)) && -@@ -198,7 +198,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi +@@ -211,7 +211,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) { -@@ -288,7 +288,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( +@@ -326,7 +326,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -36,7 +36,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) auto RunStableVideoDecoderFactoryService( mojo::PendingReceiver<media::stable::mojom::StableVideoDecoderFactory> -@@ -342,7 +342,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -380,7 +380,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) diff --git a/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc b/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc index 2d791399e149..3a79ee846e19 100644 --- a/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc +++ b/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc @@ -1,4 +1,4 @@ ---- content/utility/utility_main.cc.orig 2022-10-01 07:40:07 UTC +--- content/utility/utility_main.cc.orig 2022-12-02 17:56:32 UTC +++ content/utility/utility_main.cc @@ -31,17 +31,19 @@ #include "third_party/icu/source/common/unicode/unistr.h" @@ -33,7 +33,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) #include "ash/services/ime/ime_sandbox_hook.h" #include "chromeos/ash/components/assistant/buildflags.h" -@@ -129,7 +135,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -130,7 +136,7 @@ int UtilityMain(MainFunctionParams parameters) { } } @@ -42,7 +42,7 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -157,7 +163,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -158,7 +164,7 @@ int UtilityMain(MainFunctionParams parameters) { pre_sandbox_hook = base::BindOnce(&screen_ai::ScreenAIPreSandboxHook); break; #endif @@ -51,7 +51,7 @@ case sandbox::mojom::Sandbox::kHardwareVideoDecoding: pre_sandbox_hook = base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); -@@ -180,10 +186,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -181,10 +187,11 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -64,7 +64,7 @@ if (sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding) { // The kHardwareVideoDecoding sandbox needs to know the GPU type in order // to select the right policy. -@@ -196,6 +203,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -197,6 +204,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } diff --git a/www/ungoogled-chromium/files/patch-content_zygote_zygote__linux.cc b/www/ungoogled-chromium/files/patch-content_zygote_zygote__linux.cc index befbee670290..54fb06e62869 100644 --- a/www/ungoogled-chromium/files/patch-content_zygote_zygote__linux.cc +++ b/www/ungoogled-chromium/files/patch-content_zygote_zygote__linux.cc @@ -1,4 +1,4 @@ ---- content/zygote/zygote_linux.cc.orig 2022-10-29 17:50:56 UTC +--- content/zygote/zygote_linux.cc.orig 2022-12-02 17:56:32 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" -@@ -653,3 +654,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick +@@ -696,3 +697,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi } } // namespace content diff --git a/www/ungoogled-chromium/files/patch-device_gamepad_BUILD.gn b/www/ungoogled-chromium/files/patch-device_gamepad_BUILD.gn new file mode 100644 index 000000000000..1757d1107a3a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-device_gamepad_BUILD.gn @@ -0,0 +1,11 @@ +--- device/gamepad/BUILD.gn.orig 2022-12-02 17:56:32 UTC ++++ device/gamepad/BUILD.gn +@@ -98,7 +98,7 @@ component("gamepad") { + "hid_writer_linux.cc", + "hid_writer_linux.h", + ] +- if (use_udev) { ++ if (use_udev && !is_bsd) { + sources += [ + "gamepad_device_linux.cc", + "gamepad_device_linux.h", diff --git a/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc index 44b91f7c716a..e56a52e9323a 100644 --- a/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc +++ b/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc @@ -1,4 +1,4 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2022-10-01 07:40:07 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2022-12-02 17:56:32 UTC +++ extensions/browser/api/messaging/message_service.cc @@ -74,7 +74,7 @@ namespace { const char kReceivingEndDoesntExistError[] = @@ -9,7 +9,7 @@ const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -437,7 +437,7 @@ void MessageService::OpenChannelToNativeApp( +@@ -438,7 +438,7 @@ void MessageService::OpenChannelToNativeApp( return; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-extensions_browser_extension__prefs.cc b/www/ungoogled-chromium/files/patch-extensions_browser_extension__prefs.cc index 9d70f76ef69d..a186bf42d39b 100644 --- a/www/ungoogled-chromium/files/patch-extensions_browser_extension__prefs.cc +++ b/www/ungoogled-chromium/files/patch-extensions_browser_extension__prefs.cc @@ -1,6 +1,6 @@ ---- extensions/browser/extension_prefs.cc.orig 2022-10-29 17:50:56 UTC +--- extensions/browser/extension_prefs.cc.orig 2022-12-02 17:56:32 UTC +++ extensions/browser/extension_prefs.cc -@@ -2286,7 +2286,7 @@ void ExtensionPrefs::RegisterProfilePrefs( +@@ -2287,7 +2287,7 @@ void ExtensionPrefs::RegisterProfilePrefs( registry->RegisterDictionaryPref(kInstallSignature); registry->RegisterListPref(kExternalUninstalls); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-extensions_common_command.cc b/www/ungoogled-chromium/files/patch-extensions_common_command.cc index e514f329d1e0..836e6a2f305f 100644 --- a/www/ungoogled-chromium/files/patch-extensions_common_command.cc +++ b/www/ungoogled-chromium/files/patch-extensions_common_command.cc @@ -1,6 +1,6 @@ ---- extensions/common/command.cc.orig 2022-10-01 07:40:07 UTC +--- extensions/common/command.cc.orig 2022-12-02 17:56:32 UTC +++ extensions/common/command.cc -@@ -288,7 +288,7 @@ std::string Command::CommandPlatform() { +@@ -280,7 +280,7 @@ std::string Command::CommandPlatform() { return values::kKeybindingPlatformMac; #elif BUILDFLAG(IS_CHROMEOS) return values::kKeybindingPlatformChromeOs; diff --git a/www/ungoogled-chromium/files/patch-extensions_renderer_bindings_argument__spec.cc b/www/ungoogled-chromium/files/patch-extensions_renderer_bindings_argument__spec.cc index a720745cb7c4..cdf6b7d15ffd 100644 --- a/www/ungoogled-chromium/files/patch-extensions_renderer_bindings_argument__spec.cc +++ b/www/ungoogled-chromium/files/patch-extensions_renderer_bindings_argument__spec.cc @@ -1,6 +1,6 @@ ---- extensions/renderer/bindings/argument_spec.cc.orig 2022-10-01 07:40:07 UTC +--- extensions/renderer/bindings/argument_spec.cc.orig 2022-12-02 17:56:32 UTC +++ extensions/renderer/bindings/argument_spec.cc -@@ -16,6 +16,8 @@ +@@ -18,6 +18,8 @@ #include "gin/data_object_builder.h" #include "gin/dictionary.h" diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc index 0f794ba3190d..82fac841b699 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2022-10-01 07:40:07 UTC +--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2022-12-02 17:56:32 UTC +++ gpu/command_buffer/common/gpu_memory_buffer_support.cc -@@ -134,7 +134,7 @@ uint32_t GetPlatformSpecificTextureTarget() { +@@ -144,7 +144,7 @@ uint32_t GetPlatformSpecificTextureTarget() { #if BUILDFLAG(IS_MAC) return macos_specific_texture_target; #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ return GL_TEXTURE_EXTERNAL_OES; #elif BUILDFLAG(IS_FUCHSIA) return GL_TEXTURE_2D; -@@ -166,7 +166,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu +@@ -176,7 +176,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu gfx::BufferFormat format, gfx::BufferPlane plane) { #if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc index d4a8235ae892..a87bbf3416ef 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc +++ b/www/ungoogled-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-10-29 17:50:56 UTC +--- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2022-12-02 17:56:32 UTC +++ gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc -@@ -600,7 +600,7 @@ bool AngleVulkanImageBackingFactory::CanUseAngleVulkan +@@ -94,7 +94,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/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc index 42ae18fd65ed..e8bf3ab4700f 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc +++ b/www/ungoogled-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 2022-10-29 17:50:56 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2022-12-02 17:56:32 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc -@@ -31,7 +31,7 @@ +@@ -32,7 +32,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/scoped_binders.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" #endif -@@ -568,7 +568,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma +@@ -570,7 +570,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma MemoryTypeTracker* tracker, WGPUDevice wgpuDevice, WGPUBackendType backend_type) { diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc index ac54437f7b86..0e17464d0f67 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc +++ b/www/ungoogled-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 2022-10-29 17:50:56 UTC +--- gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc.orig 2022-12-02 17:56:32 UTC +++ gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc -@@ -246,7 +246,7 @@ void GLTextureImageBacking::InitializeGLTexture( +@@ -345,7 +345,7 @@ void GLTextureImageBacking::InitializeGLTexture( } void GLTextureImageBacking::CreateEGLImage() { diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc index ebafc5fff4cb..a09ddb697cd8 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc +++ b/www/ungoogled-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 2022-10-01 07:40:07 UTC +--- gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc.orig 2022-12-02 17:56:32 UTC +++ gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc -@@ -152,7 +152,7 @@ bool GLTextureImageBackingFactory::IsSupported( +@@ -164,7 +164,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/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc deleted file mode 100644 index c1c69dc143a6..000000000000 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2022-10-29 17:50:56 UTC -+++ gpu/command_buffer/service/shared_image/shared_image_factory.cc -@@ -51,7 +51,7 @@ - #include "ui/ozone/public/surface_factory_ozone.h" - #endif - --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) && \ -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) && \ - BUILDFLAG(ENABLE_VULKAN) - #include "gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.h" - #include "gpu/command_buffer/service/shared_image/ozone_image_backing_factory.h" -@@ -86,7 +86,7 @@ namespace gpu { - - namespace { - --#if defined(USE_OZONE) && BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS) -+#if defined(USE_OZONE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CASTOS) - - bool ShouldUseExternalVulkanImageFactory() { - #if BUILDFLAG(ENABLE_VULKAN) -@@ -394,7 +394,7 @@ SharedImageFactory::SharedImageFactory( - factories_.push_back(std::move(external_vk_image_factory)); - } - #elif defined(USE_OZONE) --#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CASTOS) - // Desktop Linux, not ChromeOS. - if (ShouldUseOzoneImageBackingFactory()) { - auto ozone_factory = std::make_unique<OzoneImageBackingFactory>( diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc index c1bf96833f99..c4871a314b75 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc +++ b/www/ungoogled-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 2022-10-29 17:50:56 UTC +--- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc.orig 2022-12-02 17:56:32 UTC +++ gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc -@@ -244,7 +244,7 @@ class WrappedSkImage : public ClearTrackingSharedImage +@@ -238,7 +238,7 @@ class WrappedSkImage : public ClearTrackingSharedImage : GrMipMapped::kNo; const std::string label = "WrappedSkImageBackingFactory_Initialize" + CreateLabelForSharedImageUsage(usage()); diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc index 1a825424b40e..5ec270522e46 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2022-10-29 17:50:56 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2022-12-02 17:56:32 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1099,7 +1099,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1208,7 +1208,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( if (gr_context_type_ != GrContextType::kVulkan && use_webgpu_adapter_ != WebGPUAdapterName::kCompat) { diff --git a/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc index ec7768cc90f9..3e128718342d 100644 --- a/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,4 +1,4 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2022-10-29 17:50:56 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2022-12-02 17:56:32 UTC +++ gpu/ipc/service/gpu_init.cc @@ -351,7 +351,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; @@ -9,7 +9,7 @@ bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early; #else // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) // For some reasons MacOSX's VideoToolbox might crash when called after -@@ -401,7 +401,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -387,7 +387,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -18,7 +18,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -450,7 +450,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -436,7 +436,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL if (gl_initialized && gl_use_swiftshader_ && !gl::IsSoftwareGLImplementation(gl::GetGLImplementationParts())) { @@ -27,7 +27,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -501,7 +501,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -487,7 +487,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } @@ -36,7 +36,7 @@ // The ContentSandboxHelper is currently the only one implementation of // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -561,7 +561,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -547,7 +547,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -45,7 +45,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -689,7 +689,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -675,7 +675,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -54,7 +54,7 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -741,7 +741,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -727,7 +727,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL gl_use_swiftshader_ = true; } } @@ -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 -@@ -883,7 +883,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -869,7 +869,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 -@@ -946,7 +946,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -932,7 +932,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); diff --git a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc index ba514c7a052f..475f7a6cfd9c 100644 --- a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc +++ b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_device_queue.cc.orig 2022-10-01 07:40:07 UTC +--- gpu/vulkan/vulkan_device_queue.cc.orig 2022-12-02 17:56:32 UTC +++ gpu/vulkan/vulkan_device_queue.cc -@@ -88,7 +88,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -89,7 +89,7 @@ bool VulkanDeviceQueue::Initialize( // In dual-CPU cases, we cannot detect the active GPU correctly on Linux, // so don't select GPU device based on the |gpu_info|. @@ -9,7 +9,7 @@ // If gpu_info is provided, the device should match it. if (gpu_info && (device_properties.vendorID != gpu_info->gpu.vendor_id || device_properties.deviceID != gpu_info->gpu.device_id)) { -@@ -232,7 +232,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -229,7 +229,7 @@ bool VulkanDeviceQueue::Initialize( enabled_device_features_2_ = {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2}; // Android, Fuchsia, and Linux(VaapiVideoDecoder) need YCbCr sampler support. diff --git a/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc index 563bdf759e04..fa24da5b63b2 100644 --- a/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc +++ b/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc @@ -1,6 +1,6 @@ ---- headless/lib/headless_content_main_delegate.cc.orig 2022-10-01 07:40:07 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2022-12-02 17:56:32 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -337,7 +337,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -336,7 +336,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/ungoogled-chromium/files/patch-media_audio_BUILD.gn b/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn index dcc7258d1269..82cc8f561f97 100644 --- a/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- media/audio/BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- media/audio/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ media/audio/BUILD.gn -@@ -250,9 +250,20 @@ source_set("audio") { +@@ -259,9 +259,20 @@ source_set("audio") { ] } diff --git a/www/ungoogled-chromium/files/patch-media_base_audio__latency.cc b/www/ungoogled-chromium/files/patch-media_base_audio__latency.cc index 11d93f5df2b6..cbc73ddab0a8 100644 --- a/www/ungoogled-chromium/files/patch-media_base_audio__latency.cc +++ b/www/ungoogled-chromium/files/patch-media_base_audio__latency.cc @@ -1,6 +1,6 @@ ---- media/base/audio_latency.cc.orig 2022-10-01 07:40:07 UTC +--- media/base/audio_latency.cc.orig 2022-12-02 17:56:32 UTC +++ media/base/audio_latency.cc -@@ -137,7 +137,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in +@@ -147,7 +147,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in } #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-media_base_media__switches.cc b/www/ungoogled-chromium/files/patch-media_base_media__switches.cc index d6102455a520..3fdc0b5ead07 100644 --- a/www/ungoogled-chromium/files/patch-media_base_media__switches.cc +++ b/www/ungoogled-chromium/files/patch-media_base_media__switches.cc @@ -1,4 +1,4 @@ ---- media/base/media_switches.cc.orig 2022-10-29 17:50:56 UTC +--- media/base/media_switches.cc.orig 2022-12-02 17:56:32 UTC +++ media/base/media_switches.cc @@ -10,7 +10,7 @@ #include "components/system_media_controls/linux/buildflags/buildflags.h" @@ -9,34 +9,34 @@ #include "base/cpu.h" #endif -@@ -448,7 +448,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode +@@ -485,7 +485,7 @@ BASE_FEATURE(kGav1VideoDecoder, // Show toolbar button that opens dialog for controlling media sessions. - const base::Feature kGlobalMediaControls { - "GlobalMediaControls", + BASE_FEATURE(kGlobalMediaControls, + "GlobalMediaControls", -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT + base::FEATURE_ENABLED_BY_DEFAULT #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -486,7 +486,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP - const base::Feature kGlobalMediaControlsPictureInPicture { - "GlobalMediaControlsPictureInPicture", + base::FEATURE_DISABLED_BY_DEFAULT +@@ -526,7 +526,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP + BASE_FEATURE(kGlobalMediaControlsPictureInPicture, + "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_CHROMEOS_LACROS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT + base::FEATURE_ENABLED_BY_DEFAULT #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -523,7 +523,7 @@ const base::Feature kUseR16Texture{"use-r16-texture", - const base::Feature kUnifiedAutoplay{"UnifiedAutoplay", - base::FEATURE_ENABLED_BY_DEFAULT}; + base::FEATURE_DISABLED_BY_DEFAULT +@@ -570,7 +570,7 @@ BASE_FEATURE(kUnifiedAutoplay, + "UnifiedAutoplay", + base::FEATURE_ENABLED_BY_DEFAULT); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. - const base::Feature kVaapiVideoDecodeLinux{"VaapiVideoDecoder", -@@ -944,7 +944,7 @@ const base::Feature MEDIA_EXPORT kDeprecateLowUsageCod + BASE_FEATURE(kVaapiVideoDecodeLinux, +@@ -1061,14 +1061,14 @@ const base::Feature MEDIA_EXPORT kDeprecateLowUsageCod "DeprecateLowUsageCodecs", base::FEATURE_ENABLED_BY_DEFAULT}; #endif // BUILDFLAG(IS_CHROMEOS) @@ -45,3 +45,11 @@ // Spawn utility processes to perform hardware decode acceleration instead of // using the GPU process. const base::Feature MEDIA_EXPORT kUseOutOfProcessVideoDecoding{ + "UseOutOfProcessVideoDecoding", base::FEATURE_DISABLED_BY_DEFAULT}; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Spawn utility processes to perform hardware encode acceleration instead of + // using the GPU process. + const base::Feature MEDIA_EXPORT kUseOutOfProcessVideoEncoding{ diff --git a/www/ungoogled-chromium/files/patch-media_base_media__switches.h b/www/ungoogled-chromium/files/patch-media_base_media__switches.h index a96bc2b71928..7ac80d3f7775 100644 --- a/www/ungoogled-chromium/files/patch-media_base_media__switches.h +++ b/www/ungoogled-chromium/files/patch-media_base_media__switches.h @@ -1,20 +1,25 @@ ---- media/base/media_switches.h.orig 2022-10-29 17:50:56 UTC +--- media/base/media_switches.h.orig 2022-12-02 17:56:32 UTC +++ media/base/media_switches.h -@@ -202,7 +202,7 @@ MEDIA_EXPORT extern const base::Feature kUseDecoderStr - MEDIA_EXPORT extern const base::Feature kUseFakeDeviceForMediaStream; - MEDIA_EXPORT extern const base::Feature kUseMediaHistoryStore; - MEDIA_EXPORT extern const base::Feature kUseR16Texture; +@@ -214,7 +214,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); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - MEDIA_EXPORT extern const base::Feature kVaapiVideoDecodeLinux; - MEDIA_EXPORT extern const base::Feature kVaapiVideoEncodeLinux; - MEDIA_EXPORT extern const base::Feature kVaapiIgnoreDriverChecks; -@@ -310,7 +310,7 @@ MEDIA_EXPORT extern const base::FeatureParam< - MEDIA_EXPORT extern const base::Feature kDeprecateLowUsageCodecs; + MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiIgnoreDriverChecks); +@@ -319,11 +319,11 @@ MEDIA_EXPORT extern const base::FeatureParam< + MEDIA_EXPORT BASE_DECLARE_FEATURE(kDeprecateLowUsageCodecs); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - MEDIA_EXPORT extern const base::Feature kUseOutOfProcessVideoDecoding; + MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoEncoding); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-media_base_vector__math.cc b/www/ungoogled-chromium/files/patch-media_base_vector__math.cc deleted file mode 100644 index 6e3b63569ca8..000000000000 --- a/www/ungoogled-chromium/files/patch-media_base_vector__math.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- media/base/vector_math.cc.orig 2022-10-01 07:40:07 UTC -+++ media/base/vector_math.cc -@@ -18,7 +18,7 @@ - // better, which is anywhere clang is used. - // TODO(pcc): Linux currently uses ThinLTO which has broken auto-vectorization - // in clang, so use our intrinsic version for now. http://crbug.com/738085 --#if !defined(__clang__) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if !defined(__clang__) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #define FMAC_FUNC FMAC_SSE - #define FMUL_FUNC FMUL_SSE - #else diff --git a/www/ungoogled-chromium/files/patch-media_base_video__frame.cc b/www/ungoogled-chromium/files/patch-media_base_video__frame.cc index 4acfcb0110b7..1d519a6bf6c4 100644 --- a/www/ungoogled-chromium/files/patch-media_base_video__frame.cc +++ b/www/ungoogled-chromium/files/patch-media_base_video__frame.cc @@ -1,6 +1,6 @@ ---- media/base/video_frame.cc.orig 2022-10-29 17:50:56 UTC +--- media/base/video_frame.cc.orig 2022-12-02 17:56:32 UTC +++ media/base/video_frame.cc -@@ -72,7 +72,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -75,7 +75,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; @@ -9,7 +9,7 @@ case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif -@@ -87,7 +87,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -90,7 +90,7 @@ std::string VideoFrame::StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return @@ -18,7 +18,7 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -282,7 +282,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo +@@ -285,7 +285,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); } @@ -27,7 +27,7 @@ // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and // thus to have several VideoFrames share the same set of DMABUF FDs. class VideoFrame::DmabufHolder -@@ -621,7 +621,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -625,7 +625,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM for (size_t i = 0; i < num_planes; ++i) planes[i].stride = gpu_memory_buffer->stride(i); uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; @@ -36,7 +36,7 @@ if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { const auto gmb_handle = gpu_memory_buffer->CloneHandle(); if (gmb_handle.is_null() || -@@ -667,7 +667,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -671,7 +671,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -45,7 +45,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -884,7 +884,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -888,7 +888,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_; -@@ -1259,7 +1259,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( +@@ -1275,7 +1275,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); -@@ -1371,7 +1371,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1387,7 +1387,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/ungoogled-chromium/files/patch-media_base_video__frame.h b/www/ungoogled-chromium/files/patch-media_base_video__frame.h index 9b0df0060232..7ac88cb3323b 100644 --- a/www/ungoogled-chromium/files/patch-media_base_video__frame.h +++ b/www/ungoogled-chromium/files/patch-media_base_video__frame.h @@ -1,4 +1,4 @@ ---- media/base/video_frame.h.orig 2022-10-29 17:50:56 UTC +--- media/base/video_frame.h.orig 2022-12-02 17:56:32 UTC +++ media/base/video_frame.h @@ -41,7 +41,7 @@ #include "base/mac/scoped_cftyperef.h" @@ -27,7 +27,7 @@ // Wraps provided dmabufs // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will -@@ -538,7 +538,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -548,7 +548,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // mailbox, the caller must wait for the included sync point. const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const; @@ -36,7 +36,7 @@ // Returns a vector containing the backing DmaBufs for this frame. The number // of returned DmaBufs will be equal or less than the number of planes of // the frame. If there are less, this means that the last FD contains the -@@ -745,7 +745,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -755,7 +755,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER. std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_; diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc b/www/ungoogled-chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc index 612e10030678..1eb0a0cb89c6 100644 --- a/www/ungoogled-chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc +++ b/www/ungoogled-chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc @@ -1,6 +1,6 @@ ---- media/capture/video/linux/fake_v4l2_impl.cc.orig 2022-10-01 07:40:07 UTC +--- media/capture/video/linux/fake_v4l2_impl.cc.orig 2022-12-02 17:56:32 UTC +++ media/capture/video/linux/fake_v4l2_impl.cc -@@ -427,7 +427,7 @@ int FakeV4L2Impl::close(int fd) { +@@ -426,7 +426,7 @@ int FakeV4L2Impl::close(int fd) { return kSuccessReturnValue; } diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc index 643bd20411ec..39bc8f9464e4 100644 --- a/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc +++ b/www/ungoogled-chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc @@ -1,4 +1,4 @@ ---- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2022-10-01 07:40:07 UTC +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2022-12-02 17:56:32 UTC +++ media/capture/video/linux/v4l2_capture_delegate.cc @@ -4,8 +4,10 @@ @@ -11,7 +11,7 @@ #include <poll.h> #include <sys/fcntl.h> #include <sys/ioctl.h> -@@ -27,10 +29,10 @@ +@@ -28,10 +30,10 @@ using media::mojom::MeteringMode; @@ -24,7 +24,7 @@ // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the // format is introduced to kernel. -@@ -666,7 +668,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate +@@ -667,7 +669,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate V4L2CaptureDelegate::~V4L2CaptureDelegate() = default; @@ -33,7 +33,7 @@ int num_retries = 0; for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries; ++num_retries) { -@@ -676,7 +678,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* +@@ -677,7 +679,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* return num_retries != kMaxIOCtrlRetries; } diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc b/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc deleted file mode 100644 index 06bb6a22520a..000000000000 --- a/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- media/capture/video/video_capture_buffer_pool_impl.cc.orig 2022-10-01 07:40:07 UTC -+++ media/capture/video/video_capture_buffer_pool_impl.cc -@@ -74,7 +74,7 @@ VideoCaptureBufferPoolImpl::CreateSharedMemoryViaRawFi - int buffer_id) { - // This requires platforms where base::SharedMemoryHandle is backed by a - // file descriptor. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - base::AutoLock lock(lock_); - - VideoCaptureBufferTracker* tracker = GetTracker(buffer_id); diff --git a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc index 4c538a1adf75..5544af31445c 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2022-10-29 17:50:56 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2022-12-02 17:56:32 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -748,7 +748,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -767,7 +767,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()); -@@ -770,7 +770,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -789,7 +789,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( #error "Unsupported platform" #endif diff --git a/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc b/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc index 6232b51e2d2b..a6f41cf00da1 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc @@ -1,6 +1,6 @@ ---- media/gpu/vaapi/vaapi_wrapper.cc.orig 2022-10-01 07:40:07 UTC +--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2022-12-02 17:56:32 UTC +++ media/gpu/vaapi/vaapi_wrapper.cc -@@ -742,7 +742,7 @@ VADisplayState::VADisplayState() +@@ -740,7 +740,7 @@ VADisplayState::VADisplayState() bool VADisplayState::Initialize() { base::AutoLock auto_lock(va_lock_); diff --git a/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc b/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc index 5013db739200..a13e3f1da166 100644 --- a/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc +++ b/www/ungoogled-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-10-01 07:40:07 UTC +--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2022-12-02 17:56:32 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 -@@ -749,7 +749,7 @@ const gfx::GpuMemoryBufferId& StructTraits< +@@ -747,7 +747,7 @@ const gfx::GpuMemoryBufferId& StructTraits< return input.id; } @@ -18,7 +18,7 @@ // static gfx::NativePixmapHandle StructTraits< media::stable::mojom::NativeGpuMemoryBufferHandleDataView, -@@ -770,7 +770,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor +@@ -768,7 +768,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor output->type = gfx::NATIVE_PIXMAP; diff --git a/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index 89574afc98f5..7bd22bfb0097 100644 --- a/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/ungoogled-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 2022-10-29 17:50:56 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2022-12-02 17:56:32 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -729,7 +729,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -732,7 +732,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 -@@ -1158,7 +1158,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1160,7 +1160,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo is_webgpu_compatible = (gpu_memory_buffer != nullptr); #endif @@ -18,9 +18,9 @@ is_webgpu_compatible = (gpu_memory_buffer != nullptr); if (is_webgpu_compatible) { is_webgpu_compatible &= -@@ -1176,7 +1176,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo - gpu::SHARED_IMAGE_USAGE_GLES2 | gpu::SHARED_IMAGE_USAGE_RASTER | - gpu::SHARED_IMAGE_USAGE_DISPLAY | gpu::SHARED_IMAGE_USAGE_SCANOUT; +@@ -1179,7 +1179,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo + gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | + gpu::SHARED_IMAGE_USAGE_SCANOUT; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc b/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc index 0f9e916a3155..2bb68187d4b8 100644 --- a/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc +++ b/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc @@ -1,6 +1,6 @@ ---- media/webrtc/audio_processor.cc.orig 2022-10-01 07:40:07 UTC +--- media/webrtc/audio_processor.cc.orig 2022-12-02 17:56:32 UTC +++ media/webrtc/audio_processor.cc -@@ -473,7 +473,7 @@ absl::optional<double> AudioProcessor::ProcessData( +@@ -487,7 +487,7 @@ absl::optional<double> AudioProcessor::ProcessData( #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) DCHECK_LE(volume, 1.0); #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/ungoogled-chromium/files/patch-mojo_core_BUILD.gn b/www/ungoogled-chromium/files/patch-mojo_core_BUILD.gn index 77153cbd4079..d063fa4d1899 100644 --- a/www/ungoogled-chromium/files/patch-mojo_core_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-mojo_core_BUILD.gn @@ -1,6 +1,6 @@ ---- mojo/core/BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- mojo/core/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ mojo/core/BUILD.gn -@@ -159,7 +159,7 @@ template("core_impl_source_set") { +@@ -163,7 +163,7 @@ template("core_impl_source_set") { ] } diff --git a/www/ungoogled-chromium/files/patch-mojo_core_embedder_features.h b/www/ungoogled-chromium/files/patch-mojo_core_embedder_features.h index 914a9f7c4f7c..3be83a1b6869 100644 --- a/www/ungoogled-chromium/files/patch-mojo_core_embedder_features.h +++ b/www/ungoogled-chromium/files/patch-mojo_core_embedder_features.h @@ -1,4 +1,4 @@ ---- mojo/core/embedder/features.h.orig 2022-10-01 07:40:07 UTC +--- mojo/core/embedder/features.h.orig 2022-12-02 17:56:32 UTC +++ mojo/core/embedder/features.h @@ -14,7 +14,7 @@ namespace mojo { namespace core { @@ -7,5 +7,5 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(MOJO_CORE_EMBEDDER_FEATURES) - extern const base::Feature kMojoLinuxChannelSharedMem; + BASE_DECLARE_FEATURE(kMojoLinuxChannelSharedMem); diff --git a/www/ungoogled-chromium/files/patch-mojo_public_c_system_thunks.cc b/www/ungoogled-chromium/files/patch-mojo_public_c_system_thunks.cc index 2287a8ddb7cd..e55a982865a3 100644 --- a/www/ungoogled-chromium/files/patch-mojo_public_c_system_thunks.cc +++ b/www/ungoogled-chromium/files/patch-mojo_public_c_system_thunks.cc @@ -1,6 +1,6 @@ ---- mojo/public/c/system/thunks.cc.orig 2022-10-01 07:40:07 UTC +--- mojo/public/c/system/thunks.cc.orig 2022-12-02 17:56:32 UTC +++ mojo/public/c/system/thunks.cc -@@ -24,7 +24,7 @@ +@@ -23,7 +23,7 @@ #include "mojo/public/c/system/message_pipe.h" #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/files/file_path.h" #include "base/scoped_native_library.h" -@@ -73,7 +73,7 @@ class CoreLibraryInitializer { +@@ -72,7 +72,7 @@ class CoreLibraryInitializer { MojoResult LoadLibrary(base::FilePath library_path) { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ @@ -18,7 +18,7 @@ if (library_ && library_->is_valid()) return MOJO_RESULT_OK; -@@ -87,7 +87,7 @@ class CoreLibraryInitializer { +@@ -86,7 +86,7 @@ class CoreLibraryInitializer { if (library_path.empty()) { // Default to looking for the library in the current working directory. @@ -27,7 +27,7 @@ const base::FilePath::CharType kDefaultLibraryPathValue[] = FILE_PATH_LITERAL("./libmojo_core.so"); #elif BUILDFLAG(IS_FUCHSIA) -@@ -143,7 +143,7 @@ class CoreLibraryInitializer { +@@ -142,7 +142,7 @@ class CoreLibraryInitializer { private: #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ diff --git a/www/ungoogled-chromium/files/patch-net_BUILD.gn b/www/ungoogled-chromium/files/patch-net_BUILD.gn index 5910be32aab3..f8be97d962e4 100644 --- a/www/ungoogled-chromium/files/patch-net_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-net_BUILD.gn @@ -1,6 +1,6 @@ ---- net/BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- net/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ net/BUILD.gn -@@ -104,7 +104,7 @@ net_configs = [ +@@ -103,7 +103,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1204,6 +1204,15 @@ component("net") { +@@ -1209,6 +1209,15 @@ component("net") { deps += [ "//third_party/xdg_shared_mime_info" ] } @@ -25,7 +25,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1336,7 +1345,7 @@ component("net") { +@@ -1343,7 +1352,7 @@ component("net") { } } @@ -34,7 +34,7 @@ sources += [ "base/network_change_notifier_posix.cc", "base/network_change_notifier_posix.h", -@@ -1369,7 +1378,7 @@ component("net") { +@@ -1376,7 +1385,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -43,7 +43,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -4376,7 +4385,7 @@ test("net_unittests") { +@@ -4388,7 +4397,7 @@ test("net_unittests") { ] } @@ -52,7 +52,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -4451,6 +4460,10 @@ test("net_unittests") { +@@ -4464,6 +4473,10 @@ test("net_unittests") { "//url:buildflags", ] @@ -63,7 +63,7 @@ if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -4518,7 +4531,7 @@ test("net_unittests") { +@@ -4531,7 +4544,7 @@ test("net_unittests") { ] } @@ -72,7 +72,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -4659,7 +4672,7 @@ test("net_unittests") { +@@ -4671,7 +4684,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/ungoogled-chromium/files/patch-net_base_network__change__notifier.cc b/www/ungoogled-chromium/files/patch-net_base_network__change__notifier.cc index 4424611e2e48..d1281c7880d2 100644 --- a/www/ungoogled-chromium/files/patch-net_base_network__change__notifier.cc +++ b/www/ungoogled-chromium/files/patch-net_base_network__change__notifier.cc @@ -1,4 +1,4 @@ ---- net/base/network_change_notifier.cc.orig 2022-10-01 07:40:07 UTC +--- net/base/network_change_notifier.cc.orig 2022-12-02 17:56:32 UTC +++ net/base/network_change_notifier.cc @@ -37,7 +37,7 @@ #include "net/base/network_change_notifier_linux.h" @@ -9,7 +9,7 @@ #include "net/base/network_change_notifier_posix.h" #elif BUILDFLAG(IS_FUCHSIA) #include "net/base/network_change_notifier_fuchsia.h" -@@ -326,6 +326,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo +@@ -321,6 +321,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo #elif BUILDFLAG(IS_FUCHSIA) return std::make_unique<NetworkChangeNotifierFuchsia>( /*require_wlan=*/false); diff --git a/www/ungoogled-chromium/files/patch-net_cert_cert__verifier.cc b/www/ungoogled-chromium/files/patch-net_cert_cert__verifier.cc index 134b44902034..74ff6690d851 100644 --- a/www/ungoogled-chromium/files/patch-net_cert_cert__verifier.cc +++ b/www/ungoogled-chromium/files/patch-net_cert_cert__verifier.cc @@ -1,11 +1,11 @@ ---- net/cert/cert_verifier.cc.orig 2022-10-01 07:40:07 UTC +--- net/cert/cert_verifier.cc.orig 2022-12-02 17:56:32 UTC +++ net/cert/cert_verifier.cc -@@ -78,7 +78,7 @@ bool CertVerifier::RequestParams::operator<( - std::unique_ptr<CertVerifier> CertVerifier::CreateDefaultWithoutCaching( - scoped_refptr<CertNetFetcher> cert_net_fetcher) { - scoped_refptr<CertVerifyProc> verify_proc; +@@ -87,7 +87,7 @@ std::unique_ptr<CertVerifier> CertVerifier::CreateDefa + } + #endif + if (!verify_proc) { -#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - verify_proc = - CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher)); - #elif BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) + verify_proc = + CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher)); + #else diff --git a/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc.cc b/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc.cc index 297f74106bdf..b2084e2d506c 100644 --- a/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc.cc +++ b/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc.cc @@ -1,6 +1,6 @@ ---- net/cert/cert_verify_proc.cc.orig 2022-10-01 07:40:07 UTC +--- net/cert/cert_verify_proc.cc.orig 2022-12-02 17:56:32 UTC +++ net/cert/cert_verify_proc.cc -@@ -510,7 +510,7 @@ base::Value CertVerifyParams(X509Certificate* cert, +@@ -506,7 +506,7 @@ base::Value CertVerifyParams(X509Certificate* cert, } // namespace diff --git a/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc.h b/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc.h index 7fabe13ad015..0454783475db 100644 --- a/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc.h +++ b/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc.h @@ -1,6 +1,6 @@ ---- net/cert/cert_verify_proc.h.orig 2022-10-01 07:40:07 UTC +--- net/cert/cert_verify_proc.h.orig 2022-12-02 17:56:32 UTC +++ net/cert/cert_verify_proc.h -@@ -80,7 +80,7 @@ class NET_EXPORT CertVerifyProc +@@ -81,7 +81,7 @@ class NET_EXPORT CertVerifyProc kMaxValue = kOther }; diff --git a/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc__unittest.cc b/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc__unittest.cc index d461a5e0cd58..2f4d417b6c65 100644 --- a/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc__unittest.cc +++ b/www/ungoogled-chromium/files/patch-net_cert_cert__verify__proc__unittest.cc @@ -1,6 +1,6 @@ ---- net/cert/cert_verify_proc_unittest.cc.orig 2022-10-01 07:40:07 UTC +--- net/cert/cert_verify_proc_unittest.cc.orig 2022-12-02 17:56:32 UTC +++ net/cert/cert_verify_proc_unittest.cc -@@ -239,7 +239,7 @@ const std::vector<CertVerifyProcType> kAllCertVerifier +@@ -242,7 +242,7 @@ const std::vector<CertVerifyProcType> kAllCertVerifier #if BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED) CERT_VERIFY_PROC_BUILTIN_CHROME_ROOTS #endif diff --git a/www/ungoogled-chromium/files/patch-net_cert_test__root__certs__unittest.cc b/www/ungoogled-chromium/files/patch-net_cert_test__root__certs__unittest.cc index 07df54067687..cbe88f4cf3eb 100644 --- a/www/ungoogled-chromium/files/patch-net_cert_test__root__certs__unittest.cc +++ b/www/ungoogled-chromium/files/patch-net_cert_test__root__certs__unittest.cc @@ -1,11 +1,11 @@ ---- net/cert/test_root_certs_unittest.cc.orig 2022-10-01 07:40:07 UTC +--- net/cert/test_root_certs_unittest.cc.orig 2022-12-02 17:56:32 UTC +++ net/cert/test_root_certs_unittest.cc -@@ -33,7 +33,7 @@ const char kRootCertificateFile[] = "root_ca_cert.pem" - const char kGoodCertificateFile[] = "ok_cert.pem"; - - scoped_refptr<CertVerifyProc> CreateCertVerifyProc() { +@@ -39,7 +39,7 @@ scoped_refptr<CertVerifyProc> CreateCertVerifyProc() { + /*cert_net_fetcher=*/nullptr); + } + #endif -#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return CertVerifyProc::CreateBuiltinVerifyProc(/*cert_net_fetcher=*/nullptr); - #elif BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) - if (base::FeatureList::IsEnabled(features::kCertVerifierBuiltinFeature)) { + #else + return CertVerifyProc::CreateSystemVerifyProc(/*cert_net_fetcher=*/nullptr); diff --git a/www/ungoogled-chromium/files/patch-net_dns_BUILD.gn b/www/ungoogled-chromium/files/patch-net_dns_BUILD.gn index 17b6932b5d17..b50de6571de9 100644 --- a/www/ungoogled-chromium/files/patch-net_dns_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-net_dns_BUILD.gn @@ -1,6 +1,6 @@ ---- net/dns/BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- net/dns/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ net/dns/BUILD.gn -@@ -112,7 +112,7 @@ source_set("dns") { +@@ -116,7 +116,7 @@ source_set("dns") { "dns_config_service_android.cc", "dns_config_service_android.h", ] @@ -9,7 +9,7 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -153,6 +153,7 @@ source_set("dns") { +@@ -157,6 +157,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +17,7 @@ ] allow_circular_includes_from = [ -@@ -414,9 +415,9 @@ source_set("tests") { +@@ -418,9 +419,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/www/ungoogled-chromium/files/patch-net_dns_dns__reloader.h b/www/ungoogled-chromium/files/patch-net_dns_dns__reloader.h index 3fc028a40732..70783dccfb75 100644 --- a/www/ungoogled-chromium/files/patch-net_dns_dns__reloader.h +++ b/www/ungoogled-chromium/files/patch-net_dns_dns__reloader.h @@ -1,4 +1,4 @@ ---- net/dns/dns_reloader.h.orig 2022-10-01 07:40:07 UTC +--- net/dns/dns_reloader.h.orig 2022-12-02 17:56:32 UTC +++ net/dns/dns_reloader.h @@ -7,7 +7,7 @@ @@ -9,3 +9,11 @@ namespace net { // Call on the network thread before calling DnsReloaderMaybeReload() anywhere. +@@ -18,6 +18,6 @@ void EnsureDnsReloaderInit(); + void DnsReloaderMaybeReload(); + + } // namespace net +-#endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) ++#endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) + + #endif // NET_DNS_DNS_RELOADER_H_ diff --git a/www/ungoogled-chromium/files/patch-net_dns_host__resolver__manager.cc b/www/ungoogled-chromium/files/patch-net_dns_host__resolver__manager.cc deleted file mode 100644 index ee009dbc9a0c..000000000000 --- a/www/ungoogled-chromium/files/patch-net_dns_host__resolver__manager.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- net/dns/host_resolver_manager.cc.orig 2022-10-29 17:50:56 UTC -+++ net/dns/host_resolver_manager.cc -@@ -3127,7 +3127,7 @@ HostResolverManager::HostResolverManager( - } - if (system_dns_config_notifier_) - system_dns_config_notifier_->AddObserver(this); --#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \ -+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) && \ - !BUILDFLAG(IS_ANDROID) - EnsureDnsReloaderInit(); - #endif diff --git a/www/ungoogled-chromium/files/patch-net_dns_host__resolver__proc.cc b/www/ungoogled-chromium/files/patch-net_dns_host__resolver__proc.cc index 90bce0f51678..880464558725 100644 --- a/www/ungoogled-chromium/files/patch-net_dns_host__resolver__proc.cc +++ b/www/ungoogled-chromium/files/patch-net_dns_host__resolver__proc.cc @@ -1,8 +1,8 @@ ---- net/dns/host_resolver_proc.cc.orig 2022-10-01 07:40:07 UTC +--- net/dns/host_resolver_proc.cc.orig 2022-12-02 17:56:32 UTC +++ net/dns/host_resolver_proc.cc -@@ -19,10 +19,6 @@ - #include "net/dns/dns_util.h" - #include "net/dns/host_resolver.h" +@@ -15,10 +15,6 @@ + #include "net/base/net_errors.h" + #include "net/dns/host_resolver_system_task.h" -#if BUILDFLAG(IS_OPENBSD) -#define AI_ADDRCONFIG 0 @@ -11,12 +11,3 @@ namespace net { HostResolverProc* HostResolverProc::default_proc_ = nullptr; -@@ -193,7 +189,7 @@ int SystemHostResolverCall(const std::string& host, - base::BlockingType::WILL_BLOCK); - - #if BUILDFLAG(IS_POSIX) && \ -- !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_ANDROID)) -+ !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_ANDROID)) - DnsReloaderMaybeReload(); - #endif - auto [ai, err, os_error] = AddressInfo::Get(host, hints, nullptr, network); diff --git a/www/ungoogled-chromium/files/patch-net_dns_host__resolver__system__task.cc b/www/ungoogled-chromium/files/patch-net_dns_host__resolver__system__task.cc new file mode 100644 index 000000000000..d55dfcc64f01 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-net_dns_host__resolver__system__task.cc @@ -0,0 +1,22 @@ +--- net/dns/host_resolver_system_task.cc.orig 2022-12-02 17:56:32 UTC ++++ net/dns/host_resolver_system_task.cc +@@ -310,8 +310,8 @@ void HostResolverSystemTask::OnLookupComplete(const ui + } + + void EnsureSystemHostResolverCallReady() { +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \ +- !BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && \ ++ !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD) + EnsureDnsReloaderInit(); + #elif BUILDFLAG(IS_WIN) + EnsureWinsockInit(); +@@ -397,7 +397,7 @@ int SystemHostResolverCall(const std::string& host, + base::BlockingType::WILL_BLOCK); + + #if BUILDFLAG(IS_POSIX) && \ +- !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_ANDROID)) ++ !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)) + DnsReloaderMaybeReload(); + #endif + auto [ai, err, os_error] = AddressInfo::Get(host, hints, nullptr, network); diff --git a/www/ungoogled-chromium/files/patch-net_socket_udp__socket__unittest.cc b/www/ungoogled-chromium/files/patch-net_socket_udp__socket__unittest.cc index bc48d5b169bc..6b4f67a23677 100644 --- a/www/ungoogled-chromium/files/patch-net_socket_udp__socket__unittest.cc +++ b/www/ungoogled-chromium/files/patch-net_socket_udp__socket__unittest.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_unittest.cc.orig 2022-10-01 07:40:07 UTC +--- net/socket/udp_socket_unittest.cc.orig 2022-12-02 17:56:32 UTC +++ net/socket/udp_socket_unittest.cc -@@ -328,7 +328,7 @@ TEST_F(UDPSocketTest, PartialRecv) { +@@ -342,7 +342,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). -@@ -588,7 +588,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) { +@@ -602,7 +602,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) -@@ -616,7 +616,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) { +@@ -630,7 +630,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) -@@ -681,7 +681,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { +@@ -695,7 +695,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 -@@ -735,7 +735,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { +@@ -749,7 +749,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { NetLogSource()); ASSERT_THAT(client_socket.Connect(send_address), IsOk()); diff --git a/www/ungoogled-chromium/files/patch-net_third__party_quiche_BUILD.gn b/www/ungoogled-chromium/files/patch-net_third__party_quiche_BUILD.gn index b5ac639bab8b..ac6b6c078435 100644 --- a/www/ungoogled-chromium/files/patch-net_third__party_quiche_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-net_third__party_quiche_BUILD.gn @@ -1,4 +1,4 @@ ---- net/third_party/quiche/BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- net/third_party/quiche/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ net/third_party/quiche/BUILD.gn @@ -28,7 +28,7 @@ import("//build/config/chromeos/ui_mode.gni") import("//testing/libfuzzer/fuzzer_test.gni") @@ -7,5 +7,5 @@ -build_epoll_based_tools = is_linux || is_chromeos +build_epoll_based_tools = (is_linux && !is_bsd) || is_chromeos - # TODO(crbug.com/1344231): Set this to always true. At which point, this - # variable can go away and the conditionals below that depends on it can be + config("quiche_internal_config") { + cflags = [] diff --git a/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc index 011fdb18461f..c3a005fdde71 100644 --- a/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,6 +1,6 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2022-10-29 17:50:56 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2022-12-02 17:56:32 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -81,7 +81,7 @@ +@@ -82,7 +82,7 @@ #include "gin/public/cppgc.h" #endif @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -520,7 +520,7 @@ void InitializeSDK(bool enable_v8, FontMappingMode fon +@@ -521,7 +521,7 @@ void InitializeSDK(bool enable_v8, FontMappingMode fon FPDF_InitLibraryWithConfig(&config); diff --git a/www/ungoogled-chromium/files/patch-remoting_base_chromoting__event.cc b/www/ungoogled-chromium/files/patch-remoting_base_chromoting__event.cc index 0eae8455223d..46833fafcb71 100644 --- a/www/ungoogled-chromium/files/patch-remoting_base_chromoting__event.cc +++ b/www/ungoogled-chromium/files/patch-remoting_base_chromoting__event.cc @@ -1,6 +1,6 @@ ---- remoting/base/chromoting_event.cc.orig 2022-10-01 07:40:07 UTC +--- remoting/base/chromoting_event.cc.orig 2022-12-02 17:56:32 UTC +++ remoting/base/chromoting_event.cc -@@ -190,7 +190,7 @@ void ChromotingEvent::AddSystemInfo() { +@@ -192,7 +192,7 @@ void ChromotingEvent::AddSystemInfo() { SetString(kCpuKey, base::SysInfo::OperatingSystemArchitecture()); SetString(kOsVersionKey, base::SysInfo::OperatingSystemVersion()); SetString(kWebAppVersionKey, STRINGIZE(VERSION)); diff --git a/www/ungoogled-chromium/files/patch-remoting_host_basic__desktop__environment.cc b/www/ungoogled-chromium/files/patch-remoting_host_basic__desktop__environment.cc index d92349ebf7f3..7341c546b4cf 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_basic__desktop__environment.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_basic__desktop__environment.cc @@ -1,11 +1,11 @@ ---- remoting/host/basic_desktop_environment.cc.orig 2022-10-29 17:50:56 UTC +--- remoting/host/basic_desktop_environment.cc.orig 2022-12-02 17:56:32 UTC +++ remoting/host/basic_desktop_environment.cc -@@ -190,7 +190,7 @@ BasicDesktopEnvironment::CreateVideoCapturer() { +@@ -179,7 +179,7 @@ BasicDesktopEnvironment::CreateVideoCapturer() { scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner; #if BUILDFLAG(IS_CHROMEOS_ASH) capture_task_runner = ui_task_runner_; --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) && defined(REMOTING_USE_WAYLAND) ++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_WAYLAND) // Each capturer instance should get its own thread so the capturers don't // compete with each other in multistream mode. capture_task_runner = base::ThreadPool::CreateSingleThreadTaskRunner( diff --git a/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc b/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc index 6c11f711c375..98242e333ff1 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc @@ -1,15 +1,15 @@ ---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2022-10-01 07:40:07 UTC +--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2022-12-02 17:56:32 UTC +++ remoting/host/it2me/it2me_native_messaging_host_main.cc @@ -30,7 +30,7 @@ #include "remoting/host/resources.h" #include "remoting/host/usage_stats_consent.h" --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #if defined(REMOTING_USE_X11) || defined(REMOTING_USE_WAYLAND) #include <gtk/gtk.h> - #include "base/linux_util.h" -@@ -77,7 +77,7 @@ bool CurrentProcessHasUiAccess() { +@@ -80,7 +80,7 @@ bool CurrentProcessHasUiAccess() { // Creates a It2MeNativeMessagingHost instance, attaches it to stdin/stdout and // runs the task executor until It2MeNativeMessagingHost signals shutdown. int It2MeNativeMessagingHostMain(int argc, char** argv) { @@ -18,16 +18,16 @@ // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) x11::InitXlib(); -@@ -123,7 +123,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -126,7 +126,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv remoting::LoadResources(""); --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ + (defined(REMOTING_USE_X11) || defined(REMOTING_USE_WAYLAND)) // Required for any calls into GTK functions, such as the Disconnect and // Continue windows. Calling with nullptr arguments because we don't have - // any command line arguments for gtk to consume. -@@ -257,7 +257,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -261,7 +261,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv PolicyWatcher::CreateWithTaskRunner(context->file_task_runner(), context->management_service()); @@ -36,7 +36,7 @@ // Create an X11EventSource on all UI threads, so the global X11 connection // (x11::Connection::Get()) can dispatch X events. auto event_source = -@@ -280,7 +280,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -284,7 +284,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv // Run the loop until channel is alive. run_loop.Run(); diff --git a/www/ungoogled-chromium/files/patch-remoting_host_me2me__desktop__environment.cc b/www/ungoogled-chromium/files/patch-remoting_host_me2me__desktop__environment.cc index 51ad81dc8c14..cf8c8d014a37 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_me2me__desktop__environment.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_me2me__desktop__environment.cc @@ -1,24 +1,15 @@ ---- remoting/host/me2me_desktop_environment.cc.orig 2022-10-29 17:50:56 UTC +--- remoting/host/me2me_desktop_environment.cc.orig 2022-12-02 17:56:32 UTC +++ remoting/host/me2me_desktop_environment.cc -@@ -41,7 +41,7 @@ namespace remoting { - - namespace { - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - - constexpr char kUseXvfbEnvVar[] = "CHROME_REMOTE_DESKTOP_USE_XVFB"; - -@@ -114,7 +114,7 @@ std::string Me2MeDesktopEnvironment::GetCapabilities() +@@ -124,7 +124,7 @@ std::string Me2MeDesktopEnvironment::GetCapabilities() capabilities += protocol::kRemoteWebAuthnCapability; } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Multi-stream and client-controlled layout are only supported with - // Xorg+Dummy. - // TODO(crbug.com/1366595): Either just remove this check if the dependency -@@ -175,7 +175,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( + capabilities += " "; + capabilities += protocol::kMultiStreamCapability; + +@@ -183,7 +183,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/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc index eba233131336..26dfbc5a90cc 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,17 +1,17 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2022-10-29 17:50:56 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2022-12-02 17:56:32 UTC +++ remoting/host/remoting_me2me_host.cc @@ -125,7 +125,7 @@ #include "remoting/host/mac/permission_utils.h" #endif // BUILDFLAG(IS_APPLE) --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #if defined(REMOTING_USE_X11) || defined(REMOTING_USE_WAYLAND) #include <gtk/gtk.h> - - #include "ui/events/platform/x11/x11_event_source.h" -@@ -133,13 +133,13 @@ - #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && - // defined(REMOTING_USE_X11) + #endif // defined(REMOTING_USE_X11) || defined(REMOTING_USE_WAYLAND) +@@ -136,13 +136,13 @@ + #endif // defined(REMOTING_USE_X11) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) @@ -25,7 +25,7 @@ #include "remoting/host/host_utmp_logger.h" #endif -@@ -181,7 +181,7 @@ const char kApplicationName[] = "chromoting"; +@@ -184,7 +184,7 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -34,7 +34,7 @@ // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; -@@ -389,7 +389,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -392,7 +392,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; @@ -43,7 +43,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -455,7 +455,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -458,7 +458,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<HostStatusLogger> host_status_logger_; std::unique_ptr<HostEventLogger> host_event_logger_; @@ -52,7 +52,7 @@ std::unique_ptr<HostUTMPLogger> host_utmp_logger_; #endif std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_; -@@ -763,7 +763,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -767,7 +767,7 @@ void HostProcess::StartOnNetworkThread() { void HostProcess::ShutdownOnNetworkThread() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); config_watcher_.reset(); @@ -61,7 +61,7 @@ cert_watcher_.reset(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -822,7 +822,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -826,7 +826,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); @@ -70,7 +70,7 @@ if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -945,7 +945,7 @@ void HostProcess::StartOnUiThread() { +@@ -949,7 +949,7 @@ void HostProcess::StartOnUiThread() { WaylandManager::Get()->Init(context_->ui_task_runner()); #endif // defined(REMOTING_USE_WAYLAND @@ -79,7 +79,7 @@ // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()-> -@@ -1016,7 +1016,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1020,7 +1020,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -88,7 +88,7 @@ // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. -@@ -1024,7 +1024,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1028,7 +1028,7 @@ void HostProcess::ShutdownOnUiThread() { AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -97,7 +97,7 @@ context_->input_task_runner()->PostTask( FROM_HERE, base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); })); -@@ -1351,7 +1351,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V +@@ -1355,7 +1355,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V // Returns false: never restart the host after this policy update. DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); @@ -106,7 +106,7 @@ absl::optional<bool> host_username_match_required = policies.FindBool(policy::key::kRemoteAccessHostMatchUsername); if (!host_username_match_required.has_value()) -@@ -1737,7 +1737,7 @@ void HostProcess::StartHost() { +@@ -1741,7 +1741,7 @@ void HostProcess::StartHost() { // The feature is enabled for all Googlers using a supported platform. desktop_environment_options_.set_enable_remote_open_url(is_googler_); @@ -115,7 +115,7 @@ desktop_environment_options_.set_enable_remote_webauthn(is_googler_); #endif -@@ -1770,7 +1770,7 @@ void HostProcess::StartHost() { +@@ -1774,7 +1774,7 @@ void HostProcess::StartHost() { host_status_logger_ = std::make_unique<HostStatusLogger>( host_->status_monitor(), log_to_server_.get()); @@ -124,7 +124,7 @@ const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->HasSwitch(kEnableUtempter)) host_utmp_logger_ = -@@ -1939,7 +1939,7 @@ int HostProcessMain() { +@@ -1943,7 +1943,7 @@ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); @@ -133,7 +133,7 @@ #if defined(REMOTING_USE_X11) // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) -@@ -1985,7 +1985,7 @@ int HostProcessMain() { +@@ -1991,7 +1991,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); diff --git a/www/ungoogled-chromium/files/patch-remoting_protocol_webrtc__video__stream.cc b/www/ungoogled-chromium/files/patch-remoting_protocol_webrtc__video__stream.cc new file mode 100644 index 000000000000..690b308fe0ae --- /dev/null +++ b/www/ungoogled-chromium/files/patch-remoting_protocol_webrtc__video__stream.cc @@ -0,0 +1,11 @@ +--- remoting/protocol/webrtc_video_stream.cc.orig 2022-12-02 17:56:32 UTC ++++ remoting/protocol/webrtc_video_stream.cc +@@ -219,7 +219,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. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + core_task_runner_ = base::ThreadPool::CreateSingleThreadTaskRunner( + {base::TaskPriority::HIGHEST}, + base::SingleThreadTaskRunnerThreadMode::DEDICATED); diff --git a/www/ungoogled-chromium/files/patch-sandbox_linux_services_libc__interceptor.cc b/www/ungoogled-chromium/files/patch-sandbox_linux_services_libc__interceptor.cc index b1c2495cb562..8ada295aa2da 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_linux_services_libc__interceptor.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_linux_services_libc__interceptor.cc @@ -1,6 +1,6 @@ ---- sandbox/linux/services/libc_interceptor.cc.orig 2022-10-01 07:40:07 UTC +--- sandbox/linux/services/libc_interceptor.cc.orig 2022-12-02 17:56:32 UTC +++ sandbox/linux/services/libc_interceptor.cc -@@ -11,7 +11,9 @@ +@@ -12,7 +12,9 @@ #include <stddef.h> #include <stdint.h> #include <string.h> @@ -10,7 +10,7 @@ #include <sys/socket.h> #include <sys/types.h> #include <time.h> -@@ -94,7 +96,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, +@@ -161,7 +163,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, } else { base::AutoLock lock(g_timezones_lock.Get()); auto ret_pair = g_timezones.Get().insert(timezone); diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn b/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn index 8a22985b5044..f22916ce72f6 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn @@ -1,6 +1,6 @@ ---- sandbox/policy/BUILD.gn.orig 2022-10-01 07:40:07 UTC +--- sandbox/policy/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ sandbox/policy/BUILD.gn -@@ -36,7 +36,7 @@ component("policy") { +@@ -35,7 +35,7 @@ component("policy") { "//sandbox/policy/mojom", ] public_deps = [ "//sandbox:common" ] @@ -9,7 +9,7 @@ sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", -@@ -95,6 +95,27 @@ component("policy") { +@@ -94,6 +94,27 @@ component("policy") { "//sandbox/linux:sandbox_services", "//sandbox/linux:seccomp_bpf", "//sandbox/linux:suid_sandbox_client", diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_features.cc b/www/ungoogled-chromium/files/patch-sandbox_policy_features.cc index 89c2f4d1739a..5a455436d974 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_features.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_features.cc @@ -1,13 +1,13 @@ ---- sandbox/policy/features.cc.orig 2022-10-01 07:40:07 UTC +--- sandbox/policy/features.cc.orig 2022-12-02 17:56:32 UTC +++ sandbox/policy/features.cc -@@ -14,7 +14,11 @@ namespace sandbox::policy::features { - // Enables network service sandbox. +@@ -15,7 +15,11 @@ namespace sandbox::policy::features { // (Only causes an effect when feature kNetworkService is enabled.) - const base::Feature kNetworkServiceSandbox{"NetworkServiceSandbox", + BASE_FEATURE(kNetworkServiceSandbox, + "NetworkServiceSandbox", +#if BUILDFLAG(IS_BSD) -+ base::FEATURE_ENABLED_BY_DEFAULT}; ++ base::FEATURE_ENABLED_BY_DEFAULT); +#else - base::FEATURE_DISABLED_BY_DEFAULT}; + base::FEATURE_DISABLED_BY_DEFAULT); +#endif #endif // !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_FUCHSIA) diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.h b/www/ungoogled-chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.h index 499927a3dd2f..95d4bf168f16 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.h +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.h @@ -1,4 +1,4 @@ ---- sandbox/policy/freebsd/sandbox_freebsd.h.orig 2022-10-01 07:40:07 UTC +--- sandbox/policy/freebsd/sandbox_freebsd.h.orig 2022-12-02 17:56:32 UTC +++ sandbox/policy/freebsd/sandbox_freebsd.h @@ -0,0 +1,278 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. @@ -16,7 +16,7 @@ +#include "sandbox/policy/export.h" +#include "sandbox/policy/linux/sandbox_seccomp_bpf_linux.h" +#include "sandbox/policy/mojom/sandbox.mojom.h" -+#include "sandbox/policy/sanitizer_buildflags.h" ++#include "base/sanitizer_buildflags.h" + +#if BUILDFLAG(USING_SANITIZER) +#include <sanitizer/common_interface_defs.h> diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.h b/www/ungoogled-chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.h index d167f3f73eec..07842fb5cdf5 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.h +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.h @@ -1,4 +1,4 @@ ---- sandbox/policy/openbsd/sandbox_openbsd.h.orig 2022-10-01 07:40:07 UTC +--- sandbox/policy/openbsd/sandbox_openbsd.h.orig 2022-12-02 17:56:32 UTC +++ sandbox/policy/openbsd/sandbox_openbsd.h @@ -0,0 +1,282 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. @@ -16,7 +16,7 @@ +#include "sandbox/policy/export.h" +#include "sandbox/policy/linux/sandbox_seccomp_bpf_linux.h" +#include "sandbox/policy/mojom/sandbox.mojom.h" -+#include "sandbox/policy/sanitizer_buildflags.h" ++#include "base/sanitizer_buildflags.h" + +#if BUILDFLAG(USING_SANITIZER) +#include <sanitizer/common_interface_defs.h> diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox.cc b/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox.cc index 85211cbee8d2..fcbaa052b6dd 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/sandbox.cc.orig 2022-10-01 07:40:07 UTC +--- sandbox/policy/sandbox.cc.orig 2022-12-02 17:56:32 UTC +++ sandbox/policy/sandbox.cc -@@ -17,6 +17,10 @@ +@@ -18,6 +18,10 @@ #include "sandbox/policy/linux/sandbox_linux.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_MAC) #include "sandbox/mac/seatbelt.h" #endif // BUILDFLAG(IS_MAC) -@@ -30,7 +34,7 @@ +@@ -31,7 +35,7 @@ namespace sandbox { namespace policy { diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox__type.cc b/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox__type.cc index 1ad9d3b800d3..778fb381286e 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox__type.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox__type.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/sandbox_type.cc.orig 2022-10-01 07:40:07 UTC +--- sandbox/policy/sandbox_type.cc.orig 2022-12-02 17:56:32 UTC +++ sandbox/policy/sandbox_type.cc -@@ -39,7 +39,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -38,7 +38,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { #endif case Sandbox::kAudio: return false; @@ -9,7 +9,7 @@ case Sandbox::kVideoCapture: return false; #endif -@@ -62,7 +62,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -61,7 +61,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { case Sandbox::kMirroring: case Sandbox::kNaClLoader: #endif @@ -18,7 +18,7 @@ case Sandbox::kHardwareVideoDecoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -127,7 +127,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -126,7 +126,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi #endif case Sandbox::kPrintCompositor: case Sandbox::kAudio: @@ -27,7 +27,7 @@ case Sandbox::kVideoCapture: #endif #if BUILDFLAG(IS_WIN) -@@ -138,7 +138,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -137,7 +137,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kMediaFoundationCdm: case Sandbox::kWindowsSystemProxyResolver: #endif // BUILDFLAG(IS_WIN) @@ -36,7 +36,7 @@ case Sandbox::kHardwareVideoDecoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -257,7 +257,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -256,7 +256,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb return switches::kUtilitySandbox; case Sandbox::kAudio: return switches::kAudioSandbox; @@ -45,7 +45,7 @@ case Sandbox::kVideoCapture: return switches::kVideoCaptureSandbox; #endif -@@ -287,7 +287,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -286,7 +286,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb case Sandbox::kMirroring: return switches::kMirroringSandbox; #endif @@ -54,7 +54,7 @@ case Sandbox::kHardwareVideoDecoding: return switches::kHardwareVideoDecodingSandbox; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -375,11 +375,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( +@@ -374,11 +374,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( if (sandbox_string == switches::kScreenAISandbox) return Sandbox::kScreenAI; #endif diff --git a/www/ungoogled-chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc b/www/ungoogled-chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc index 3577ab3c08b6..6a41d18579ce 100644 --- a/www/ungoogled-chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc +++ b/www/ungoogled-chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc @@ -1,15 +1,15 @@ ---- services/cert_verifier/cert_verifier_creation.cc.orig 2022-10-29 17:50:56 UTC +--- services/cert_verifier/cert_verifier_creation.cc.orig 2022-12-02 17:56:32 UTC +++ services/cert_verifier/cert_verifier_creation.cc @@ -12,7 +12,7 @@ #include "net/cert_net/cert_net_fetcher_url_request.h" #include "net/net_buildflags.h" --#if BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) || \ -+#if BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) || BUILDFLAG(IS_BSD) || \ - BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +-#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "net/cert/cert_verify_proc_builtin.h" #include "net/cert/internal/system_trust_store.h" -@@ -90,7 +90,7 @@ class OldDefaultCertVerifyProcFactory : public net::Ce + #endif +@@ -89,7 +89,7 @@ class OldDefaultCertVerifyProcFactory : public net::Ce user_slot_restriction_ ? crypto::ScopedPK11Slot(PK11_ReferenceSlot( user_slot_restriction_.get())) : nullptr)); @@ -18,11 +18,11 @@ verify_proc = net::CreateCertVerifyProcBuiltin( std::move(cert_net_fetcher), net::CreateSslSystemTrustStore()); #else -@@ -242,6 +242,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr +@@ -212,6 +212,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr bool IsUsingCertNetFetcher() { #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ + BUILDFLAG(IS_BSD) || \ BUILDFLAG(TRIAL_COMPARISON_CERT_VERIFIER_SUPPORTED) || \ - BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) || \ BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED) + return true; diff --git a/www/ungoogled-chromium/files/patch-services_device_BUILD.gn b/www/ungoogled-chromium/files/patch-services_device_BUILD.gn new file mode 100644 index 000000000000..dd24c65f7064 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-services_device_BUILD.gn @@ -0,0 +1,11 @@ +--- services/device/BUILD.gn.orig 2022-12-02 17:56:32 UTC ++++ services/device/BUILD.gn +@@ -16,7 +16,7 @@ if (is_android) { + } + + is_serial_enabled_platform = +- is_win || ((is_linux || is_chromeos) && use_udev) || is_mac ++ is_win || ((!is_bsd && is_linux || is_chromeos) && use_udev) || is_mac + + source_set("lib") { + # This should be visible only to embedders of the Device Service, and the diff --git a/www/ungoogled-chromium/files/patch-services_device_compute__pressure_cpu__probe.cc b/www/ungoogled-chromium/files/patch-services_device_compute__pressure_cpu__probe.cc index bb3daf60b92f..f04aeb629198 100644 --- a/www/ungoogled-chromium/files/patch-services_device_compute__pressure_cpu__probe.cc +++ b/www/ungoogled-chromium/files/patch-services_device_compute__pressure_cpu__probe.cc @@ -1,10 +1,10 @@ ---- services/device/compute_pressure/cpu_probe.cc.orig 2022-10-01 07:40:07 UTC +--- services/device/compute_pressure/cpu_probe.cc.orig 2022-12-02 17:56:32 UTC +++ services/device/compute_pressure/cpu_probe.cc -@@ -63,6 +63,7 @@ std::unique_ptr<CpuProbe> CpuProbe::Create() { +@@ -29,6 +29,7 @@ std::unique_ptr<CpuProbe> CpuProbe::Create() { #elif BUILDFLAG(IS_MAC) return CpuProbeMac::Create(); #else + NOTIMPLEMENTED(); - return std::make_unique<NullCpuProbe>(); - #endif // BUILDFLAG(IS_ANDROID) + return nullptr; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } diff --git a/www/ungoogled-chromium/files/patch-services_device_hid_BUILD.gn b/www/ungoogled-chromium/files/patch-services_device_hid_BUILD.gn index ef81273b3312..d1e0ae6efcc6 100644 --- a/www/ungoogled-chromium/files/patch-services_device_hid_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_device_hid_BUILD.gn @@ -1,9 +1,10 @@ ---- services/device/hid/BUILD.gn.orig 2022-10-01 07:40:07 UTC +--- services/device/hid/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ services/device/hid/BUILD.gn -@@ -35,6 +35,25 @@ source_set("hid") { +@@ -35,7 +35,26 @@ source_set("hid") { "//services/device/public/mojom", ] +- if ((is_linux || is_chromeos) && use_udev) { + if (is_openbsd) { + sources += [ + "hid_connection_fido.cc", @@ -23,6 +24,7 @@ + ] + } + - if ((is_linux || is_chromeos) && use_udev) { ++ if ((is_linux || is_chromeos) && !is_bsd && use_udev) { sources += [ "hid_connection_linux.cc", + "hid_connection_linux.h", diff --git a/www/ungoogled-chromium/files/patch-services_device_hid_hid__service.cc b/www/ungoogled-chromium/files/patch-services_device_hid_hid__service.cc index 57a6461327af..b2d61e5a4e6d 100644 --- a/www/ungoogled-chromium/files/patch-services_device_hid_hid__service.cc +++ b/www/ungoogled-chromium/files/patch-services_device_hid_hid__service.cc @@ -1,6 +1,6 @@ ---- services/device/hid/hid_service.cc.orig 2022-10-29 17:50:56 UTC +--- services/device/hid/hid_service.cc.orig 2022-12-02 17:56:32 UTC +++ services/device/hid/hid_service.cc -@@ -19,6 +19,10 @@ +@@ -20,6 +20,10 @@ #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_UDEV) #include "services/device/hid/hid_service_linux.h" @@ -11,7 +11,7 @@ #elif BUILDFLAG(IS_MAC) #include "services/device/hid/hid_service_mac.h" #elif BUILDFLAG(IS_WIN) -@@ -64,6 +68,10 @@ constexpr base::TaskTraits HidService::kBlockingTaskTr +@@ -68,6 +72,10 @@ constexpr base::TaskTraits HidService::kBlockingTaskTr std::unique_ptr<HidService> HidService::Create() { #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_UDEV) return std::make_unique<HidServiceLinux>(); diff --git a/www/ungoogled-chromium/files/patch-services_device_hid_hid__service__fido.cc b/www/ungoogled-chromium/files/patch-services_device_hid_hid__service__fido.cc index 9058ced6c27a..80c32404c641 100644 --- a/www/ungoogled-chromium/files/patch-services_device_hid_hid__service__fido.cc +++ b/www/ungoogled-chromium/files/patch-services_device_hid_hid__service__fido.cc @@ -1,6 +1,6 @@ ---- services/device/hid/hid_service_fido.cc.orig 2022-10-29 17:50:56 UTC +--- services/device/hid/hid_service_fido.cc.orig 2022-12-02 17:56:32 UTC +++ services/device/hid/hid_service_fido.cc -@@ -0,0 +1,392 @@ +@@ -0,0 +1,399 @@ +// Copyright 2014 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -11,6 +11,7 @@ +#include <poll.h> +#include <stdint.h> + ++#include <dlfcn.h> +#include <fido.h> + +#include <limits> @@ -36,15 +37,10 @@ +#include "build/build_config.h" +#include "build/chromeos_buildflags.h" +#include "components/device_event_log/device_event_log.h" ++#include "device/udev_linux/scoped_udev.h" ++#include "device/udev_linux/udev_watcher.h" +#include "services/device/hid/hid_connection_fido.h" + -+// TODO(huangs): Enable for IS_CHROMEOS_LACROS. This will simplify crosapi so -+// that it won't need to pass HidManager around (crbug.com/1109621). -+#if BUILDFLAG(IS_CHROMEOS_ASH) -+#include "base/system/sys_info.h" -+#include "chromeos/dbus/permission_broker/permission_broker_client.h" // nogncheck -+#endif // BUILDFLAG(IS_CHROMEOS_ASH) -+ +namespace device { + +namespace { @@ -147,7 +143,7 @@ + base::ScopedFD fd; +}; + -+class HidServiceFido::BlockingTaskRunnerHelper { ++class HidServiceFido::BlockingTaskRunnerHelper : public UdevWatcher::Observer { + public: + BlockingTaskRunnerHelper(base::WeakPtr<HidServiceFido> service) + : service_(std::move(service)), @@ -158,97 +154,145 @@ + BlockingTaskRunnerHelper(const BlockingTaskRunnerHelper&) = delete; + BlockingTaskRunnerHelper& operator=(const BlockingTaskRunnerHelper&) = delete; + -+ ~BlockingTaskRunnerHelper() = default; ++ ~BlockingTaskRunnerHelper() override { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ } + + void Start() { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + ++ void *library = dlopen("libudev.so", RTLD_NOW | RTLD_LOCAL); ++ if (library) { ++ dlclose(library); ++ watcher_ = UdevWatcher::StartWatching(this); ++ watcher_->EnumerateExistingDevices(); ++ } else { ++ HID_LOG(ERROR) << "No udev available, failling back to single enumeration"; ++ WalkFidoDevices(nullptr); ++ } ++ ++ task_runner_->PostTask( ++ FROM_HERE, ++ base::BindOnce(&HidServiceFido::FirstEnumerationComplete, service_)); ++ } ++ ++ private: ++ void WalkFidoDevices(const char *name) { + fido_dev_info_t *devlist = NULL; + fido_dev_t *dev = NULL; + size_t devlist_len = 0, i; + const char *path; + int r; + const int MAX_FIDO_DEVICES = 256; -+ ++ + if ((devlist = fido_dev_info_new(MAX_FIDO_DEVICES)) == NULL) { + HID_LOG(ERROR) << "fido_dev_info_new failed"; + goto out; + } -+ if ((r = fido_dev_info_manifest(devlist, MAX_FIDO_DEVICES, &devlist_len)) != ++ if ((r = fido_dev_info_manifest(devlist, MAX_FIDO_DEVICES, &devlist_len)) != + FIDO_OK) { + HID_LOG(ERROR) << "fido_dev_info_manifest: " << fido_strerr(r); + goto out; + } -+ ++ + HID_LOG(EVENT) << "fido_dev_info_manifest found " << devlist_len + << " device(s)"; + + for (i = 0; i < devlist_len; i++) { + const fido_dev_info_t *di = fido_dev_info_ptr(devlist, i); ++ + if (di == NULL) { + HID_LOG(ERROR) << "fido_dev_info_ptr " << i << " failed"; + continue; + } -+ if ((path = fido_dev_info_path(di)) == NULL) { ++ ++ if ((path = fido_dev_info_path(di)) == NULL) { + HID_LOG(ERROR) << "fido_dev_info_path " << i << " failed"; + continue; + } ++ ++ if (name != nullptr && !strcmp(path, name)) { ++ HID_LOG(EVENT) << "hotplug device " << i << ": " << path; ++ OnFidoDeviceAdded(di); ++ break; ++ } ++ + HID_LOG(EVENT) << "trying device " << i << ": " << path; + if ((dev = fido_dev_new()) == NULL) { + HID_LOG(ERROR) << "fido_dev_new failed"; + continue; + } ++ + if ((r = fido_dev_open(dev, path)) != FIDO_OK) { + HID_LOG(ERROR) << "fido_dev_open failed " << path; + fido_dev_free(&dev); + continue; + } -+ OnDeviceAdded(di); ++ + fido_dev_close(dev); + fido_dev_free(&dev); -+ } + ++ OnFidoDeviceAdded(di); ++ } + out: + if (devlist != NULL) + fido_dev_info_free(&devlist, MAX_FIDO_DEVICES); -+ -+ task_runner_->PostTask( -+ FROM_HERE, -+ base::BindOnce(&HidServiceFido::FirstEnumerationComplete, service_)); + } + -+ private: -+ void OnDeviceAdded(const fido_dev_info_t *di) { -+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -+ base::ScopedBlockingCall scoped_blocking_call( -+ FROM_HERE, base::BlockingType::MAY_BLOCK); -+ ++ void OnFidoDeviceAdded(const fido_dev_info_t *di) { + auto null_as_empty = [](const char *r) -> std::string { + return (r != nullptr) ? r : ""; + }; + std::string device_node(null_as_empty(fido_dev_info_path(di))); + std::vector<uint8_t> report_descriptor( + kU2fReportDesc, kU2fReportDesc + sizeof(kU2fReportDesc)); -+ scoped_refptr<HidDeviceInfo> device_info(new HidDeviceInfo( -+ device_node, /*physical_device_id=*/"", fido_dev_info_vendor(di), ++ ++ auto device_info = base::MakeRefCounted<HidDeviceInfo>( ++ device_node, /*physical_device_id*/"", fido_dev_info_vendor(di), + fido_dev_info_product(di), null_as_empty(fido_dev_info_product_string(di)), + null_as_empty(fido_dev_info_manufacturer_string(di)), -+ device::mojom::HidBusType::kHIDBusTypeUSB, report_descriptor, -+ device_node)); -+ -+ task_runner_->PostTask(FROM_HERE, base::BindOnce(&HidServiceFido::AddDevice, -+ service_, device_info)); ++ device::mojom::HidBusType::kHIDBusTypeUSB, report_descriptor, ++ device_node); ++ ++ task_runner_->PostTask( ++ FROM_HERE, ++ base::BindOnce(&HidServiceFido::AddDevice, service_, device_info)); + } + -+ void OnDeviceRemoved(std::string device_node) { ++ // UdevWatcher::Observer ++ void OnDeviceAdded(ScopedUdevDevicePtr device) override { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + base::ScopedBlockingCall scoped_blocking_call( + FROM_HERE, base::BlockingType::MAY_BLOCK); -+ task_runner_->PostTask(FROM_HERE, base::BindOnce(&HidServiceFido::RemoveDevice, -+ service_, device_node)); ++ ++ const char* subsystem = udev_device_get_subsystem(device.get()); ++ if (!subsystem || strcmp(subsystem, "fido") != 0) ++ return; ++ ++ const char* device_path = udev_device_get_syspath(device.get()); ++ if (!device_path) ++ return; ++ ++ WalkFidoDevices(device_path); + } + ++ void OnDeviceRemoved(ScopedUdevDevicePtr device) override { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ base::ScopedBlockingCall scoped_blocking_call( ++ FROM_HERE, base::BlockingType::MAY_BLOCK); ++ ++ const char* device_path = udev_device_get_syspath(device.get()); ++ if (device_path) { ++ task_runner_->PostTask( ++ FROM_HERE, base::BindOnce(&HidServiceFido::RemoveDevice, service_, ++ std::string(device_path))); ++ } ++ } ++ ++ void OnDeviceChanged(ScopedUdevDevicePtr) override {} ++ + SEQUENCE_CHECKER(sequence_checker_); ++ std::unique_ptr<UdevWatcher> watcher_; + + // This weak pointer is only valid when checked on this task runner. + base::WeakPtr<HidServiceFido> service_; @@ -287,19 +331,6 @@ + } + scoped_refptr<HidDeviceInfo> device_info = map_entry->second; + -+// TODO(huangs): Enable for IS_CHROMEOS_LACROS for crbug.com/1223456. -+#if BUILDFLAG(IS_CHROMEOS_ASH) -+ auto split_callback = base::SplitOnceCallback(std::move(callback)); -+ chromeos::PermissionBrokerClient::Get()->OpenPath( -+ device_info->device_node(), -+ base::BindOnce(&HidServiceFido::OnPathOpenComplete, -+ std::make_unique<ConnectParams>( -+ device_info, allow_protected_reports, -+ allow_fido_reports, std::move(split_callback.first))), -+ base::BindOnce(&HidServiceFido::OnPathOpenError, -+ device_info->device_node(), -+ std::move(split_callback.second))); -+#else + auto params = + std::make_unique<ConnectParams>(device_info, allow_protected_reports, + allow_fido_reports, std::move(callback)); @@ -308,30 +339,8 @@ + blocking_task_runner->PostTask( + FROM_HERE, base::BindOnce(&HidServiceFido::OpenOnBlockingThread, + std::move(params))); -+#endif // BUILDFLAG(IS_CHROMEOS_ASH) +} + -+#if BUILDFLAG(IS_CHROMEOS_ASH) -+ -+// static -+void HidServiceFido::OnPathOpenComplete(std::unique_ptr<ConnectParams> params, -+ base::ScopedFD fd) { -+ params->fd = std::move(fd); -+ FinishOpen(std::move(params)); -+} -+ -+// static -+void HidServiceFido::OnPathOpenError(const std::string& device_path, -+ ConnectCallback callback, -+ const std::string& error_name, -+ const std::string& error_message) { -+ HID_LOG(EVENT) << "Permission broker failed to open '" << device_path -+ << "': " << error_name << ": " << error_message; -+ std::move(callback).Run(nullptr); -+} -+ -+#else -+ +// static +void HidServiceFido::OpenOnBlockingThread( + std::unique_ptr<ConnectParams> params) { @@ -373,8 +382,6 @@ + std::move(params))); +} + -+#endif // BUILDFLAG(IS_CHROMEOS_ASH) -+ +// static +void HidServiceFido::FinishOpen(std::unique_ptr<ConnectParams> params) { + DCHECK(params->fd.is_valid()); diff --git a/www/ungoogled-chromium/files/patch-services_device_public_mojom_BUILD.gn b/www/ungoogled-chromium/files/patch-services_device_public_mojom_BUILD.gn new file mode 100644 index 000000000000..7881362f7ff0 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-services_device_public_mojom_BUILD.gn @@ -0,0 +1,11 @@ +--- services/device/public/mojom/BUILD.gn.orig 2022-12-02 17:56:32 UTC ++++ services/device/public/mojom/BUILD.gn +@@ -88,7 +88,7 @@ mojom("device_service") { + disable_variants = true + + enabled_features = [] +- if ((is_linux || is_chromeos) && use_udev) { ++ if ((is_linux || is_chromeos) && !is_bsd && use_udev) { + enabled_features += [ "enable_input_device_manager" ] + } + diff --git a/www/ungoogled-chromium/files/patch-services_device_serial_BUILD.gn b/www/ungoogled-chromium/files/patch-services_device_serial_BUILD.gn index 347e50d5a182..b477cf49020e 100644 --- a/www/ungoogled-chromium/files/patch-services_device_serial_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_device_serial_BUILD.gn @@ -1,16 +1,11 @@ ---- services/device/serial/BUILD.gn.orig 2022-10-01 07:40:07 UTC +--- services/device/serial/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ services/device/serial/BUILD.gn -@@ -83,6 +83,13 @@ if (is_win || ((is_linux || is_chromeos) && use_udev) - ] - } +@@ -5,7 +5,7 @@ + import("//build/config/chromeos/ui_mode.gni") + import("//build/config/features.gni") -+ if (is_bsd) { -+ sources -= [ -+ "serial_device_enumerator_linux.cc", -+ "serial_device_enumerator_linux.h" -+ ] -+ } -+ - if (use_udev) { - deps += [ "//device/udev_linux" ] - } +-if (is_win || ((is_linux || is_chromeos) && use_udev) || is_mac) { ++if (is_win || ((!is_bsd && is_linux || is_chromeos) && use_udev) || is_mac) { + config("platform_support") { + visibility = [ ":serial" ] + if (is_win) { diff --git a/www/ungoogled-chromium/files/patch-services_device_usb_usb__service.cc b/www/ungoogled-chromium/files/patch-services_device_usb_usb__service.cc index 9202d8c81600..cae2369f2d8d 100644 --- a/www/ungoogled-chromium/files/patch-services_device_usb_usb__service.cc +++ b/www/ungoogled-chromium/files/patch-services_device_usb_usb__service.cc @@ -1,6 +1,14 @@ ---- services/device/usb/usb_service.cc.orig 2022-10-29 17:50:56 UTC +--- services/device/usb/usb_service.cc.orig 2022-12-02 17:56:32 UTC +++ services/device/usb/usb_service.cc -@@ -29,6 +29,10 @@ +@@ -22,13 +22,17 @@ + + #if BUILDFLAG(IS_ANDROID) + #include "services/device/usb/usb_service_android.h" +-#elif defined(USE_UDEV) ++#elif defined(USE_UDEV) && !BUILDFLAG(IS_BSD) + #include "services/device/usb/usb_service_linux.h" + #elif BUILDFLAG(IS_MAC) + #include "services/device/usb/usb_service_impl.h" #include "services/device/usb/usb_service_mac.h" #elif BUILDFLAG(IS_WIN) #include "services/device/usb/usb_service_win.h" @@ -11,6 +19,15 @@ #endif namespace device { +@@ -51,7 +55,7 @@ constexpr base::TaskTraits UsbService::kBlockingTaskTr + std::unique_ptr<UsbService> UsbService::Create() { + #if BUILDFLAG(IS_ANDROID) + return base::WrapUnique(new UsbServiceAndroid()); +-#elif defined(USE_UDEV) ++#elif defined(USE_UDEV) && !BUILDFLAG(IS_BSD) + return base::WrapUnique(new UsbServiceLinux()); + #elif BUILDFLAG(IS_WIN) + return base::WrapUnique(new UsbServiceWin()); @@ -60,6 +64,8 @@ std::unique_ptr<UsbService> UsbService::Create() { return base::WrapUnique(new UsbServiceMac()); else diff --git a/www/ungoogled-chromium/files/patch-services_network_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_BUILD.gn index 158b2c7e011a..c85caeb86b63 100644 --- a/www/ungoogled-chromium/files/patch-services_network_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_network_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- services/network/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ services/network/BUILD.gn -@@ -324,7 +324,6 @@ if (is_linux || is_chromeos) { +@@ -331,7 +331,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", diff --git a/www/ungoogled-chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/ungoogled-chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc index 904d8aff9ddb..a7b89742d497 100644 --- a/www/ungoogled-chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc +++ b/www/ungoogled-chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc @@ -1,6 +1,6 @@ ---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2022-10-01 07:40:07 UTC +--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2022-12-02 17:56:32 UTC +++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc -@@ -52,7 +52,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO +@@ -54,7 +54,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO uint32_t shared_resident_kb) { DCHECK(os_dump.platform_private_footprint); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -9,7 +9,7 @@ uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes; uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes; return (rss_anon_bytes + vm_swap_bytes) / 1024; -@@ -80,7 +80,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl +@@ -82,7 +82,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable; os_dump->private_footprint_kb = CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb); @@ -18,7 +18,7 @@ os_dump->private_footprint_swap_kb = internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024; #endif -@@ -259,7 +259,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -261,7 +261,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // On most platforms each process can dump data about their own process // so ask each process to do so Linux is special see below. @@ -27,7 +27,7 @@ request->pending_responses.insert({client_info.pid, ResponseType::kOSDump}); client->RequestOSMemoryDump(request->memory_map_option(), {base::kNullProcessId}, -@@ -274,7 +274,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -276,7 +276,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // In some cases, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -36,7 +36,7 @@ std::vector<base::ProcessId> pids; mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = base::kNullProcessId; -@@ -320,7 +320,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion +@@ -322,7 +322,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion const OsCallback& os_callback) { // On Linux, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -45,7 +45,7 @@ mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = 0; for (const auto& client_info : clients) { -@@ -371,7 +371,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( +@@ -372,7 +372,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( // each client process provides 1 OS dump, % the case where the client is // disconnected mid dump. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; @@ -54,7 +54,7 @@ for (auto& kv : extra_os_dumps) { auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first; DCHECK(results.find(pid) == results.end()); -@@ -433,7 +433,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* +@@ -434,7 +434,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* // crash). In the latter case (OS_LINUX) we expect the full map to come // from the browser process response. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; diff --git a/www/ungoogled-chromium/files/patch-services_video__capture_broadcasting__receiver.cc b/www/ungoogled-chromium/files/patch-services_video__capture_broadcasting__receiver.cc deleted file mode 100644 index 77c7e7f5d69a..000000000000 --- a/www/ungoogled-chromium/files/patch-services_video__capture_broadcasting__receiver.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- services/video_capture/broadcasting_receiver.cc.orig 2022-10-01 07:40:07 UTC -+++ services/video_capture/broadcasting_receiver.cc -@@ -234,7 +234,7 @@ void BroadcastingReceiver::BufferContext:: - ConvertRawFileDescriptorToUnsafeShmemRegion() { - DCHECK(buffer_handle_->is_shared_memory_via_raw_file_descriptor()); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const size_t handle_size = - buffer_handle_->get_shared_memory_via_raw_file_descriptor() - ->shared_memory_size_in_bytes; diff --git a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_config.h b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_config.h index 68b8e662813b..b27739a7e3a0 100644 --- a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_config.h +++ b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_config.h @@ -1,6 +1,6 @@ ---- third_party/abseil-cpp/absl/base/config.h.orig 2022-10-01 07:40:07 UTC +--- third_party/abseil-cpp/absl/base/config.h.orig 2022-12-02 17:56:32 UTC +++ third_party/abseil-cpp/absl/base/config.h -@@ -458,7 +458,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -460,7 +460,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != // POSIX.1-2001. #ifdef ABSL_HAVE_SCHED_YIELD #error ABSL_HAVE_SCHED_YIELD cannot be directly set @@ -10,7 +10,7 @@ #define ABSL_HAVE_SCHED_YIELD 1 #endif -@@ -473,7 +474,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -475,7 +476,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != // platforms. #ifdef ABSL_HAVE_SEMAPHORE_H #error ABSL_HAVE_SEMAPHORE_H cannot be directly set diff --git a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc index 4c9c3dab1dc3..81d79f535300 100644 --- a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc +++ b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc @@ -1,4 +1,4 @@ ---- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2022-10-01 07:40:07 UTC +--- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2022-12-02 17:56:32 UTC +++ third_party/abseil-cpp/absl/base/internal/sysinfo.cc @@ -30,7 +30,7 @@ #include <sys/syscall.h> @@ -9,7 +9,7 @@ #include <sys/sysctl.h> #endif -@@ -307,9 +307,11 @@ static double GetNominalCPUFrequency() { +@@ -310,9 +310,11 @@ static double GetNominalCPUFrequency() { // a new mode (turbo mode). Essentially, those frequencies cannot // always be relied upon. The same reasons apply to /proc/cpuinfo as // well. diff --git a/www/ungoogled-chromium/files/patch-third__party_angle_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_angle_BUILD.gn index 100a2af506f2..940f7bf2cce5 100644 --- a/www/ungoogled-chromium/files/patch-third__party_angle_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_angle_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/angle/BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- third_party/angle/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ third_party/angle/BUILD.gn @@ -265,7 +265,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -573,6 +572,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -574,6 +573,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] @@ -27,7 +27,7 @@ } if (angle_use_wayland && angle_has_build) { -@@ -1093,12 +1095,12 @@ if (angle_use_wayland) { +@@ -1094,12 +1096,12 @@ if (angle_use_wayland) { "wayland-client", "wayland-egl", ] diff --git a/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp b/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp index bc7b478d7c8b..6b501a7bd8a3 100644 --- a/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp +++ b/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/formatutils.cpp.orig 2022-10-29 17:50:56 UTC +--- third_party/angle/src/libANGLE/formatutils.cpp.orig 2022-12-02 17:56:32 UTC +++ third_party/angle/src/libANGLE/formatutils.cpp -@@ -1413,7 +1413,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa +@@ -1466,7 +1466,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa AddYUVFormat(&map, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported); AddYUVFormat(&map, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported); diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h b/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h index 4c09f3f58709..10783cf2f6ba 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h +++ b/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/platform/platform.h.orig 2022-10-29 17:50:56 UTC +--- third_party/blink/public/platform/platform.h.orig 2022-12-02 17:56:32 UTC +++ third_party/blink/public/platform/platform.h -@@ -341,7 +341,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -349,7 +349,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; } diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc index fd8b360355d1..16ebba87d9c1 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2022-10-01 07:40:07 UTC +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2022-12-02 17:56:32 UTC +++ third_party/blink/renderer/controller/blink_initializer.cc -@@ -74,12 +74,12 @@ +@@ -73,12 +73,12 @@ #include "third_party/blink/renderer/controller/oom_intervention_impl.h" #endif @@ -15,7 +15,7 @@ #include "third_party/blink/renderer/controller/highest_pmf_reporter.h" #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h" #endif -@@ -172,7 +172,7 @@ void InitializeCommon(Platform* platform, mojo::Binder +@@ -173,7 +173,7 @@ void InitializeCommon(Platform* platform, mojo::Binder #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -24,7 +24,7 @@ // Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring. if (UserLevelMemoryPressureSignalGenerator::Enabled()) UserLevelMemoryPressureSignalGenerator::Instance(); -@@ -253,7 +253,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder +@@ -244,7 +244,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder main_thread_task_runner); #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index 368fe4607bb1..637246b70b07 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-10-29 17:50:56 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-12-02 17:56:32 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -406,7 +406,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( +@@ -408,7 +408,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3273,7 +3273,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3278,7 +3278,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/ungoogled-chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc index 947d4582df68..0fcf7ca2cb50 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2022-10-29 17:50:56 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2022-12-02 17:56:32 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6410,7 +6410,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6414,7 +6414,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"); -@@ -6807,7 +6807,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc +@@ -6811,7 +6811,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) { RunTest("composited_selection_bounds_large_selection_noscroll.html"); } diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index 83a33cb704cf..35c5bc46861c 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2022-10-29 17:50:56 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2022-12-02 17:56:32 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -66,7 +66,7 @@ +@@ -68,7 +68,7 @@ #include "ui/display/screen_info.h" #include "ui/gfx/geometry/quad_f.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -365,7 +365,7 @@ void LayoutView::UpdateLayout() { +@@ -367,7 +367,7 @@ void LayoutView::UpdateLayout() { DCHECK(!layout_state_); LayoutState root_layout_state(*this); diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc index 2c6713e51206..e04c226ccb4e 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2022-10-29 17:50:56 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2022-12-02 17:56:32 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -111,7 +111,7 @@ namespace blink { +@@ -112,7 +112,7 @@ namespace blink { namespace { diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc index a3fea9217f68..b9f5d14fe9d8 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/media/audio/audio_device_factory.cc.orig 2022-10-01 07:40:07 UTC +--- third_party/blink/renderer/modules/media/audio/audio_device_factory.cc.orig 2022-12-02 17:56:32 UTC +++ third_party/blink/renderer/modules/media/audio/audio_device_factory.cc -@@ -34,7 +34,7 @@ namespace { +@@ -35,7 +35,7 @@ namespace { AudioDeviceFactory* g_factory_override = nullptr; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc index 75393cc41e79..9f76c3ba087f 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2022-10-29 17:50:56 UTC +--- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2022-12-02 17:56:32 UTC +++ third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc -@@ -708,7 +708,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten +@@ -722,7 +722,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten mixer->get_output_params_for_testing().sample_rate()); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc index e44ddf2d8921..4661bea19adf 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2022-10-29 17:50:56 UTC +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2022-12-02 17:56:32 UTC +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -277,7 +277,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar +@@ -278,7 +278,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar SetupRenderer(kDefaultOutputDeviceId); renderer_proxy_->Start(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index c4a474cf9bc8..8824fb21a5a7 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2022-10-29 17:50:56 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2022-12-02 17:56:32 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6149,7 +6149,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6150,7 +6150,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc index 847bd1fb458c..abc1ab8c5d5c 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig 2022-10-29 17:50:56 UTC +--- third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig 2022-12-02 17:56:32 UTC +++ third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc -@@ -102,7 +102,7 @@ bool WebGLWebCodecsVideoFrame::Supported(WebGLRenderin +@@ -101,7 +101,7 @@ bool WebGLWebCodecsVideoFrame::Supported(WebGLRenderin // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc index e3a18e4a64b9..87892227f4f6 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2022-10-01 07:40:07 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2022-12-02 17:56:32 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc -@@ -75,7 +75,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo +@@ -72,7 +72,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo SkFontMgr* FontCache::static_font_manager_ = nullptr; @@ -9,12 +9,12 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -142,7 +142,7 @@ FontCache::~FontCache() { +@@ -139,7 +139,7 @@ FontCache::~FontCache() { FontPlatformData* FontCache::SystemFontPlatformData( const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - if (family.IsEmpty() || family == font_family_names::kSystemUi) + if (family.empty() || family == font_family_names::kSystemUi) return nullptr; #else diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index 8555650bac90..d1f1d537ffac 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2022-10-01 07:40:07 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2022-12-02 17:56:32 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h -@@ -58,7 +58,7 @@ +@@ -57,7 +57,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" #include "third_party/skia/include/core/SkRefCnt.h" @@ -9,7 +9,7 @@ #include "ui/gfx/font_fallback_linux.h" #endif -@@ -184,7 +184,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -181,7 +181,7 @@ class PLATFORM_EXPORT FontCache final { static void PrewarmFamily(const AtomicString& family_name) {} #endif @@ -18,7 +18,7 @@ // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } -@@ -267,7 +267,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -265,7 +265,7 @@ class PLATFORM_EXPORT FontCache final { const char* locale_family_name); #endif // BUILDFLAG(IS_ANDROID) @@ -27,7 +27,7 @@ static bool GetFontForCharacter(UChar32, const char* preferred_locale, gfx::FallbackFontData*); -@@ -347,7 +347,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -345,7 +345,7 @@ class PLATFORM_EXPORT FontCache final { const FontFaceCreationParams&, std::string& name); @@ -36,7 +36,7 @@ static AtomicString GetFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, -@@ -389,7 +389,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -387,7 +387,7 @@ class PLATFORM_EXPORT FontCache final { std::unique_ptr<FallbackFamilyStyleCache> fallback_params_cache_; #endif // BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc index f8fc9eee2481..6f3a0132c405 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc +++ b/www/ungoogled-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-10-01 07:40:07 UTC +--- third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig 2022-12-02 17:56:32 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 -@@ -122,7 +122,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t +@@ -123,7 +123,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t style_ = WebFontRenderStyle::GetDefault(); #if !BUILDFLAG(IS_WIN) WebFontRenderStyle system_style; diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc index 7e8b2e5e1f18..5f7aa90dbdd9 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2022-10-29 17:50:56 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2022-12-02 17:56:32 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -346,7 +346,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -347,7 +347,7 @@ void VideoFrameSubmitter::OnBeginFrame( continue; auto& feedback = timing_details.find(frame_token)->value.presentation_feedback; diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 index 8da7fc7ad34f..1709a45d56ac 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2022-10-29 17:50:56 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2022-12-02 17:56:32 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 @@ -36,7 +36,7 @@ // shipped stable can have its runtime flag removed soon after. @@ -9,7 +9,7 @@ }, // "implied_by" or "depends_on" specifies relationship to other features: -@@ -1180,7 +1180,7 @@ +@@ -1205,7 +1205,7 @@ depends_on: ["FileSystemAccessLocal"], status: {"Android": "test", "default": "stable"}, origin_trial_feature_name: "FileHandling", @@ -18,7 +18,7 @@ base_feature: "FileHandlingAPI", }, { -@@ -2642,7 +2642,7 @@ +@@ -2680,7 +2680,7 @@ { name: "U2FSecurityKeyAPI", origin_trial_feature_name: "U2FSecurityKeyAPI", @@ -27,7 +27,7 @@ origin_trial_type: "deprecation", }, { -@@ -2657,7 +2657,7 @@ +@@ -2695,7 +2695,7 @@ { name: "UnrestrictedSharedArrayBuffer", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -36,7 +36,7 @@ }, { name: "URLPatternCompareComponent", -@@ -2677,7 +2677,7 @@ +@@ -2715,7 +2715,7 @@ origin_trial_feature_name: "UserAgentReduction", origin_trial_allows_third_party: true, // iOS not included as it should not send a reduced User-Agent string. @@ -45,7 +45,7 @@ base_feature: "ReduceUserAgent", }, { -@@ -2802,12 +2802,12 @@ +@@ -2843,12 +2843,12 @@ name: "WebAppUrlHandling", status: "experimental", origin_trial_feature_name: "WebAppUrlHandling", diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc index 3a9b6f9bff82..d627dea2344c 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc.orig 2022-10-29 17:50:56 UTC +--- third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc.orig 2022-12-02 17:56:32 UTC +++ third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc -@@ -240,7 +240,7 @@ void CategorizedWorkerPoolImpl::Start(int max_concurre +@@ -241,7 +241,7 @@ void CategorizedWorkerPoolImpl::Start(int max_concurre "CompositorTileWorkerBackground", thread_options, this, background_thread_prio_categories, &has_task_for_background_priority_thread_cv_); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) thread->SetBackgroundingCallback( - Thread::MainThread()->GetDeprecatedTaskRunner(), + Thread::MainThread()->GetTaskRunner(MainThreadTaskRunnerRestricted()), base::BindOnce([](base::PlatformThreadId thread_id) { diff --git a/www/ungoogled-chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h b/www/ungoogled-chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h index a50757c07bfa..a5bf579b1733 100644 --- a/www/ungoogled-chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h +++ b/www/ungoogled-chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h @@ -1,6 +1,6 @@ ---- third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2022-10-01 07:40:07 UTC +--- third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2022-12-02 17:56:32 UTC +++ third_party/dawn/include/dawn/native/VulkanBackend.h -@@ -70,7 +70,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport +@@ -82,7 +82,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport }; // Can't use DAWN_PLATFORM_IS(LINUX) since header included in both Dawn and Chrome diff --git a/www/ungoogled-chromium/files/patch-third__party_leveldatabase_env__chromium.cc b/www/ungoogled-chromium/files/patch-third__party_leveldatabase_env__chromium.cc index e17145b3c511..ca50d171c874 100644 --- a/www/ungoogled-chromium/files/patch-third__party_leveldatabase_env__chromium.cc +++ b/www/ungoogled-chromium/files/patch-third__party_leveldatabase_env__chromium.cc @@ -1,6 +1,6 @@ ---- third_party/leveldatabase/env_chromium.cc.orig 2022-10-01 07:40:07 UTC +--- third_party/leveldatabase/env_chromium.cc.orig 2022-12-02 17:56:32 UTC +++ third_party/leveldatabase/env_chromium.cc -@@ -317,7 +317,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std:: +@@ -319,7 +319,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std:: Status ChromiumWritableFile::SyncParent() { TRACE_EVENT0("leveldb", "SyncParent"); diff --git a/www/ungoogled-chromium/files/patch-third__party_libusb_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_libusb_BUILD.gn index 7a8fdd429b86..aa41052a86db 100644 --- a/www/ungoogled-chromium/files/patch-third__party_libusb_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_libusb_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/libusb/BUILD.gn.orig 2022-10-01 07:40:07 UTC +--- third_party/libusb/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ third_party/libusb/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. @@ -18,7 +18,7 @@ sources += [ "src/libusb/os/linux_usbfs.c", "src/libusb/os/linux_usbfs.h", -@@ -127,6 +127,16 @@ static_library("libusb") { +@@ -127,11 +127,21 @@ static_library("libusb") { ] } @@ -35,6 +35,12 @@ if (is_chromeos_ash) { defines += [ "USBI_TIMERFD_AVAILABLE" ] } + +- if (use_udev) { ++ if (use_udev && !is_bsd) { + sources += [ "src/libusb/os/linux_udev.cc" ] + defines += [ + "HAVE_LIBUDEV=1", @@ -140,7 +150,7 @@ static_library("libusb") { deps += [ "//build/linux/libudev" ] } diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h b/www/ungoogled-chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h index 1e29776a3b24..9ccfa6662961 100644 --- a/www/ungoogled-chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h +++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h @@ -1,6 +1,6 @@ ---- third_party/perfetto/include/perfetto/base/thread_utils.h.orig 2022-10-01 07:40:07 UTC +--- third_party/perfetto/include/perfetto/base/thread_utils.h.orig 2022-12-02 17:56:32 UTC +++ third_party/perfetto/include/perfetto/base/thread_utils.h -@@ -34,6 +34,7 @@ __declspec(dllimport) unsigned long __stdcall GetCurre +@@ -35,6 +35,7 @@ __declspec(dllimport) unsigned long __stdcall GetCurre #include <sys/syscall.h> #include <sys/types.h> #include <unistd.h> @@ -8,7 +8,7 @@ #else #include <pthread.h> #endif -@@ -45,6 +46,11 @@ namespace base { +@@ -46,6 +47,11 @@ namespace base { using PlatformThreadId = pid_t; inline PlatformThreadId GetThreadId() { return gettid(); diff --git a/www/ungoogled-chromium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn index bf9e62318de2..37db1d1ce6bb 100644 --- a/www/ungoogled-chromium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn @@ -1,11 +1,11 @@ ---- third_party/swiftshader/src/WSI/BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- third_party/swiftshader/src/WSI/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ third_party/swiftshader/src/WSI/BUILD.gn @@ -87,7 +87,7 @@ swiftshader_source_set("WSI") { "../Vulkan:swiftshader_libvulkan_headers", ] -- if (is_linux && !use_system_libwayland) { -+ if (is_linux && !use_system_libwayland && !is_openbsd) { +- 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/ungoogled-chromium/files/patch-third__party_tflite_features.gni b/www/ungoogled-chromium/files/patch-third__party_tflite_features.gni index c7d336bd83f5..c6c8251f3286 100644 --- a/www/ungoogled-chromium/files/patch-third__party_tflite_features.gni +++ b/www/ungoogled-chromium/files/patch-third__party_tflite_features.gni @@ -1,11 +1,11 @@ ---- third_party/tflite/features.gni.orig 2022-10-01 07:40:07 UTC +--- third_party/tflite/features.gni.orig 2022-12-02 17:56:32 UTC +++ third_party/tflite/features.gni @@ -7,7 +7,7 @@ import("//build/config/chrome_build.gni") declare_args() { # This enables building TFLite with XNNPACK. Currently only available for - # Linux x64. -- build_tflite_with_xnnpack = is_linux && current_cpu == "x64" -+ build_tflite_with_xnnpack = (is_linux && target_cpu == "x64") && !is_bsd + # Linux or Windows on x64. +- build_tflite_with_xnnpack = (is_win || is_linux) && current_cpu == "x64" ++ build_tflite_with_xnnpack = ((is_win || is_linux) && current_cpu == "x64") && !is_bsd # Turns on TFLITE_WITH_RUY, using ruy as the gemm backend instead of gemmlowp. build_tflite_with_ruy = true diff --git a/www/ungoogled-chromium/files/patch-third__party_wayland_features.gni b/www/ungoogled-chromium/files/patch-third__party_wayland_features.gni index c647796cb2d9..d6aa5e072a00 100644 --- a/www/ungoogled-chromium/files/patch-third__party_wayland_features.gni +++ b/www/ungoogled-chromium/files/patch-third__party_wayland_features.gni @@ -1,17 +1,20 @@ ---- third_party/wayland/features.gni.orig 2022-10-29 17:50:56 UTC +--- third_party/wayland/features.gni.orig 2022-12-02 17:56:32 UTC +++ third_party/wayland/features.gni -@@ -17,8 +17,12 @@ declare_args() { - use_system_libwayland_server = false +@@ -21,12 +21,15 @@ declare_args() { - # Path to wayland-scanner. Has effect only when the system libwayland is used. + declare_args() { + # Path to the wayland-scanner in the sysroot. - assert(host_os == "linux") -- system_wayland_scanner_path = "/usr/bin/wayland-scanner" -+ assert(host_os == "linux" || host_os == "freebsd") -+ if (is_bsd) { -+ system_wayland_scanner_path = "/usr/local/bin/wayland-scanner" -+ } else { -+ system_wayland_scanner_path = "/usr/bin/wayland-scanner" -+ } - - # This may be set by Chromium packagers who do not wish to use the bundled - # wayland scanner. + 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/ungoogled-chromium/files/patch-third__party_webrtc_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_webrtc_BUILD.gn index e73247068c6a..b57a983ae9fc 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- third_party/webrtc/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ third_party/webrtc/BUILD.gn -@@ -206,6 +206,9 @@ config("common_inherited_config") { +@@ -205,6 +205,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn index 815b9dd853fa..31cab28a4f4a 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ third_party/webrtc/modules/audio_device/BUILD.gn -@@ -298,7 +298,7 @@ rtc_library("audio_device_impl") { +@@ -299,7 +299,7 @@ rtc_library("audio_device_impl") { if (rtc_use_dummy_audio_file_devices) { defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] } else { diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn index 74b635c7adeb..149a0ede47a9 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- third_party/webrtc/rtc_base/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ third_party/webrtc/rtc_base/BUILD.gn -@@ -1257,7 +1257,7 @@ rtc_library("rtc_base") { +@@ -1244,7 +1244,7 @@ rtc_library("rtc_base") { sources += [ "mac_ifaddrs_converter.cc" ] } diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_network.cc index 0332b6618632..ab9db7344069 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_network.cc +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_rtc__base_network.cc @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/network.cc.orig 2022-10-29 17:50:56 UTC +--- third_party/webrtc/rtc_base/network.cc.orig 2022-12-02 17:56:32 UTC +++ third_party/webrtc/rtc_base/network.cc -@@ -285,7 +285,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n +@@ -286,7 +286,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n } #endif diff --git a/www/ungoogled-chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/www/ungoogled-chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn index 93a55e076ed4..097145796f5c 100644 --- a/www/ungoogled-chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn @@ -1,4 +1,4 @@ ---- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2022-10-01 07:40:07 UTC +--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ tools/perf/chrome_telemetry_build/BUILD.gn @@ -45,7 +45,7 @@ group("telemetry_chrome_test") { data_deps += [ "//chrome:reorder_imports" ] @@ -9,7 +9,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] # CrOS currently has issues with the locally compiled version of -@@ -212,7 +212,7 @@ group("telemetry_chrome_test_without_chrome") { +@@ -186,7 +186,7 @@ group("telemetry_chrome_test_without_chrome") { ] # Cr-Fuchsia doesn't support breakpad. diff --git a/www/ungoogled-chromium/files/patch-ui_base_ime_text__input__client.h b/www/ungoogled-chromium/files/patch-ui_base_ime_text__input__client.h index f6c8b85ab496..b2b12936f46c 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ime_text__input__client.h +++ b/www/ungoogled-chromium/files/patch-ui_base_ime_text__input__client.h @@ -1,6 +1,6 @@ ---- ui/base/ime/text_input_client.h.orig 2022-10-01 07:40:07 UTC +--- ui/base/ime/text_input_client.h.orig 2022-12-02 17:56:32 UTC +++ ui/base/ime/text_input_client.h -@@ -240,7 +240,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient { +@@ -242,7 +242,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient // fields that are considered 'private' (e.g. in incognito tabs). virtual bool ShouldDoLearning() = 0; diff --git a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc index 11cbf179fc35..9bdc24255594 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc @@ -1,20 +1,20 @@ ---- ui/base/ui_base_features.cc.orig 2022-10-01 07:40:07 UTC +--- ui/base/ui_base_features.cc.orig 2022-12-02 17:56:32 UTC +++ ui/base/ui_base_features.cc -@@ -185,7 +185,7 @@ const base::Feature kExperimentalFlingAnimation { +@@ -205,7 +205,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, + "ExperimentalFlingAnimation", + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. - #if BUILDFLAG(IS_WIN) || \ +-#if BUILDFLAG(IS_WIN) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) || \ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ -- !BUILDFLAG(IS_CHROMEOS_LACROS)) -+ !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -283,7 +283,7 @@ bool IsForcedColorsEnabled() { + !BUILDFLAG(IS_CHROMEOS_LACROS)) + base::FEATURE_ENABLED_BY_DEFAULT +@@ -310,7 +310,7 @@ bool IsForcedColorsEnabled() { // milestones. - const base::Feature kEyeDropper { - "EyeDropper", + BASE_FEATURE(kEyeDropper, + "EyeDropper", -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT + base::FEATURE_ENABLED_BY_DEFAULT #else - base::FEATURE_DISABLED_BY_DEFAULT + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/ungoogled-chromium/files/patch-ui_base_ui__base__types.h b/www/ungoogled-chromium/files/patch-ui_base_ui__base__types.h index 940e05a42eac..fc22e5af0a0a 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ui__base__types.h +++ b/www/ungoogled-chromium/files/patch-ui_base_ui__base__types.h @@ -1,6 +1,6 @@ ---- ui/base/ui_base_types.h.orig 2022-10-29 17:50:56 UTC +--- ui/base/ui_base_types.h.orig 2022-12-02 17:56:32 UTC +++ ui/base/ui_base_types.h -@@ -37,7 +37,7 @@ enum WindowShowState { +@@ -32,7 +32,7 @@ enum WindowShowState { SHOW_STATE_END = 6 // The end of show state enum. }; diff --git a/www/ungoogled-chromium/files/patch-ui_base_webui_web__ui__util.cc b/www/ungoogled-chromium/files/patch-ui_base_webui_web__ui__util.cc index 6fff40ae2aa1..9290127d22e4 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_webui_web__ui__util.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_webui_web__ui__util.cc @@ -1,6 +1,6 @@ ---- ui/base/webui/web_ui_util.cc.orig 2022-10-29 17:50:56 UTC +--- ui/base/webui/web_ui_util.cc.orig 2022-12-02 17:56:32 UTC +++ ui/base/webui/web_ui_util.cc -@@ -220,7 +220,7 @@ std::string GetFontFamily() { +@@ -218,7 +218,7 @@ std::string GetFontFamily() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-ui_color_color__id.h b/www/ungoogled-chromium/files/patch-ui_color_color__id.h index 68b05390b51d..4bbe45e4a30f 100644 --- a/www/ungoogled-chromium/files/patch-ui_color_color__id.h +++ b/www/ungoogled-chromium/files/patch-ui_color_color__id.h @@ -1,6 +1,6 @@ ---- ui/color/color_id.h.orig 2022-10-29 17:50:56 UTC +--- ui/color/color_id.h.orig 2022-12-02 17:56:32 UTC +++ ui/color/color_id.h -@@ -320,7 +320,7 @@ +@@ -351,7 +351,7 @@ E_CPONLY(kColorNativeColor6) \ E_CPONLY(kColorNativeBaseColor) \ E_CPONLY(kColorNativeSecondaryColor) diff --git a/www/ungoogled-chromium/files/patch-ui_color_system__theme.h b/www/ungoogled-chromium/files/patch-ui_color_system__theme.h index 52b1b58b1239..af3ba92679b2 100644 --- a/www/ungoogled-chromium/files/patch-ui_color_system__theme.h +++ b/www/ungoogled-chromium/files/patch-ui_color_system__theme.h @@ -1,4 +1,4 @@ ---- ui/color/system_theme.h.orig 2022-10-29 17:50:56 UTC +--- ui/color/system_theme.h.orig 2022-12-02 17:56:32 UTC +++ ui/color/system_theme.h @@ -15,7 +15,7 @@ namespace ui { enum class SystemTheme { @@ -8,4 +8,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) kGtk = 1, kQt = 2, - #endif + kMaxValue = kQt, diff --git a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc index e488a4dfd744..3b2f8fd94253 100644 --- a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc +++ b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.cc.orig 2022-10-29 17:50:56 UTC +--- ui/compositor/compositor.cc.orig 2022-12-02 17:56:32 UTC +++ ui/compositor/compositor.cc -@@ -854,7 +854,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/ungoogled-chromium/files/patch-ui_compositor_compositor.h b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.h index 42bddb2e9ae8..6d11aaf5c104 100644 --- a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.h +++ b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.h @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.h.orig 2022-10-29 17:50:56 UTC +--- ui/compositor/compositor.h.orig 2022-12-02 17:56:32 UTC +++ ui/compositor/compositor.h -@@ -419,7 +419,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe +@@ -420,7 +420,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/ungoogled-chromium/files/patch-ui_events_event.cc b/www/ungoogled-chromium/files/patch-ui_events_event.cc index cd69ea15bf6c..c1d260b3972f 100644 --- a/www/ungoogled-chromium/files/patch-ui_events_event.cc +++ b/www/ungoogled-chromium/files/patch-ui_events_event.cc @@ -1,6 +1,6 @@ ---- ui/events/event.cc.orig 2022-10-29 17:50:56 UTC +--- ui/events/event.cc.orig 2022-12-02 17:56:32 UTC +++ ui/events/event.cc -@@ -425,7 +425,7 @@ std::string LocatedEvent::ToString() const { +@@ -419,7 +419,7 @@ std::string LocatedEvent::ToString() const { MouseEvent::MouseEvent(const PlatformEvent& native_event) : LocatedEvent(native_event), changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)), @@ -9,7 +9,7 @@ movement_(GetMouseMovementFromNative(native_event)), #endif pointer_details_(GetMousePointerDetailsFromNative(native_event)) { -@@ -924,7 +924,7 @@ void KeyEvent::InitializeNative() { +@@ -918,7 +918,7 @@ void KeyEvent::InitializeNative() { if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent())) set_flags(flags() | EF_IS_REPEAT); diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn index 8c895bcfcebd..039213c192d3 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gfx/BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- ui/gfx/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ ui/gfx/BUILD.gn -@@ -590,7 +590,7 @@ source_set("memory_buffer_sources") { +@@ -593,7 +593,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h b/www/ungoogled-chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h deleted file mode 100644 index 7dbb17db0aee..000000000000 --- a/www/ungoogled-chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h +++ /dev/null @@ -1,44 +0,0 @@ ---- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2022-10-01 07:40:07 UTC -+++ ui/gfx/ipc/gfx_param_traits_macros.h -@@ -18,7 +18,7 @@ - #include "ui/gfx/selection_bound.h" - #include "ui/gfx/swap_result.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "ui/gfx/native_pixmap_handle.h" - #endif - -@@ -48,7 +48,7 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle) - IPC_STRUCT_TRAITS_MEMBER(region) - IPC_STRUCT_TRAITS_MEMBER(offset) - IPC_STRUCT_TRAITS_MEMBER(stride) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle) - #elif BUILDFLAG(IS_APPLE) - IPC_STRUCT_TRAITS_MEMBER(io_surface) -@@ -63,12 +63,12 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId) - IPC_STRUCT_TRAITS_MEMBER(id) - IPC_STRUCT_TRAITS_END() - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapPlane) - IPC_STRUCT_TRAITS_MEMBER(stride) - IPC_STRUCT_TRAITS_MEMBER(offset) - IPC_STRUCT_TRAITS_MEMBER(size) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - IPC_STRUCT_TRAITS_MEMBER(fd) - #elif BUILDFLAG(IS_FUCHSIA) - IPC_STRUCT_TRAITS_MEMBER(vmo) -@@ -77,7 +77,7 @@ IPC_STRUCT_TRAITS_END() - - IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapHandle) - IPC_STRUCT_TRAITS_MEMBER(planes) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - IPC_STRUCT_TRAITS_MEMBER(modifier) - #endif - #if BUILDFLAG(IS_FUCHSIA) diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_native__pixmap__handle.cc b/www/ungoogled-chromium/files/patch-ui_gfx_native__pixmap__handle.cc index 03a0102c9da6..da0a889807f1 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_native__pixmap__handle.cc +++ b/www/ungoogled-chromium/files/patch-ui_gfx_native__pixmap__handle.cc @@ -1,15 +1,15 @@ ---- ui/gfx/native_pixmap_handle.cc.orig 2022-10-01 07:40:07 UTC +--- ui/gfx/native_pixmap_handle.cc.orig 2022-12-02 17:56:32 UTC +++ ui/gfx/native_pixmap_handle.cc -@@ -9,7 +9,7 @@ - #include "base/logging.h" - #include "build/build_config.h" +@@ -11,7 +11,7 @@ + #include "ui/gfx/buffer_format_util.h" + #include "ui/gfx/geometry/size.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include <drm_fourcc.h> #include <unistd.h> -@@ -21,9 +21,13 @@ +@@ -23,9 +23,13 @@ #include "base/fuchsia/fuchsia_logging.h" #endif @@ -24,7 +24,7 @@ static_assert(NativePixmapHandle::kNoModifier == DRM_FORMAT_MOD_INVALID, "gfx::NativePixmapHandle::kNoModifier should be an alias for" "DRM_FORMAT_MOD_INVALID"); -@@ -34,7 +38,7 @@ NativePixmapPlane::NativePixmapPlane() : stride(0), of +@@ -36,7 +40,7 @@ NativePixmapPlane::NativePixmapPlane() : stride(0), of NativePixmapPlane::NativePixmapPlane(int stride, int offset, uint64_t size @@ -33,7 +33,7 @@ , base::ScopedFD fd #elif BUILDFLAG(IS_FUCHSIA) -@@ -45,7 +49,7 @@ NativePixmapPlane::NativePixmapPlane(int stride, +@@ -47,7 +51,7 @@ NativePixmapPlane::NativePixmapPlane(int stride, : stride(stride), offset(offset), size(size) @@ -42,7 +42,7 @@ , fd(std::move(fd)) #elif BUILDFLAG(IS_FUCHSIA) -@@ -73,7 +77,7 @@ NativePixmapHandle& NativePixmapHandle::operator=(Nati +@@ -75,7 +79,7 @@ NativePixmapHandle& NativePixmapHandle::operator=(Nati NativePixmapHandle CloneHandleForIPC(const NativePixmapHandle& handle) { NativePixmapHandle clone; for (auto& plane : handle.planes) { @@ -51,7 +51,7 @@ DCHECK(plane.fd.is_valid()); // Combining the HANDLE_EINTR and ScopedFD's constructor causes the compiler // to emit some very strange assembly that tends to cause FD ownership -@@ -103,7 +107,7 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma +@@ -113,7 +117,7 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma #endif } diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_native__pixmap__handle.h b/www/ungoogled-chromium/files/patch-ui_gfx_native__pixmap__handle.h index a0d3c335affe..46a565eb8495 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_native__pixmap__handle.h +++ b/www/ungoogled-chromium/files/patch-ui_gfx_native__pixmap__handle.h @@ -1,7 +1,7 @@ ---- ui/gfx/native_pixmap_handle.h.orig 2022-10-01 07:40:07 UTC +--- ui/gfx/native_pixmap_handle.h.orig 2022-12-02 17:56:32 UTC +++ ui/gfx/native_pixmap_handle.h -@@ -15,7 +15,7 @@ - #include "third_party/abseil-cpp/absl/types/optional.h" +@@ -16,7 +16,7 @@ + #include "ui/gfx/buffer_types.h" #include "ui/gfx/gfx_export.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -9,7 +9,7 @@ #include "base/files/scoped_file.h" #endif -@@ -32,7 +32,7 @@ struct GFX_EXPORT NativePixmapPlane { +@@ -35,7 +35,7 @@ struct GFX_EXPORT NativePixmapPlane { NativePixmapPlane(int stride, int offset, uint64_t size @@ -18,7 +18,7 @@ , base::ScopedFD fd #elif BUILDFLAG(IS_FUCHSIA) -@@ -53,7 +53,7 @@ struct GFX_EXPORT NativePixmapPlane { +@@ -56,7 +56,7 @@ struct GFX_EXPORT NativePixmapPlane { // This is necessary to map the buffers. uint64_t size; @@ -27,7 +27,7 @@ // File descriptor for the underlying memory object (usually dmabuf). base::ScopedFD fd; #elif BUILDFLAG(IS_FUCHSIA) -@@ -82,7 +82,7 @@ struct GFX_EXPORT NativePixmapHandle { +@@ -85,7 +85,7 @@ struct GFX_EXPORT NativePixmapHandle { std::vector<NativePixmapPlane> planes; diff --git a/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn index 8faaf884983e..ae7a5b9775e6 100644 --- a/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn @@ -1,4 +1,4 @@ ---- ui/gl/BUILD.gn.orig 2022-10-01 07:40:07 UTC +--- ui/gl/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ ui/gl/BUILD.gn @@ -166,8 +166,6 @@ component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] @@ -17,7 +17,7 @@ "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -422,7 +419,6 @@ component("gl") { +@@ -416,7 +413,6 @@ component("gl") { data_deps += [ "//third_party/angle:libEGL", "//third_party/angle:libGLESv2", @@ -25,7 +25,7 @@ ] if (enable_swiftshader) { data_deps += [ -@@ -641,7 +637,6 @@ test("gl_unittests") { +@@ -638,7 +634,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", diff --git a/www/ungoogled-chromium/files/patch-ui_gl_generate__bindings.py b/www/ungoogled-chromium/files/patch-ui_gl_generate__bindings.py index f2c40ebab1c0..369200db7cad 100644 --- a/www/ungoogled-chromium/files/patch-ui_gl_generate__bindings.py +++ b/www/ungoogled-chromium/files/patch-ui_gl_generate__bindings.py @@ -1,6 +1,6 @@ ---- ui/gl/generate_bindings.py.orig 2022-10-01 07:40:07 UTC +--- ui/gl/generate_bindings.py.orig 2022-12-02 17:56:32 UTC +++ ui/gl/generate_bindings.py -@@ -2933,6 +2933,9 @@ GLX_FUNCTIONS = [ +@@ -2934,6 +2934,9 @@ GLX_FUNCTIONS = [ 'arguments': 'Display* dpy, GLXDrawable drawable, int32_t* numerator, ' 'int32_t* denominator' }, diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__context.cc b/www/ungoogled-chromium/files/patch-ui_gl_gl__context.cc index b1aad0b9e9b6..74435c991503 100644 --- a/www/ungoogled-chromium/files/patch-ui_gl_gl__context.cc +++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__context.cc @@ -1,6 +1,6 @@ ---- ui/gl/gl_context.cc.orig 2022-10-01 07:40:07 UTC +--- ui/gl/gl_context.cc.orig 2022-12-02 17:56:32 UTC +++ ui/gl/gl_context.cc -@@ -419,7 +419,7 @@ bool GLContext::MakeVirtuallyCurrent( +@@ -414,7 +414,7 @@ bool GLContext::MakeVirtuallyCurrent( DCHECK(virtual_context->IsCurrent(surface)); if (switched_real_contexts || virtual_context != current_virtual_context_) { diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__features.cc b/www/ungoogled-chromium/files/patch-ui_gl_gl__features.cc index 691c4312365b..73c98acf302a 100644 --- a/www/ungoogled-chromium/files/patch-ui_gl_gl__features.cc +++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__features.cc @@ -1,11 +1,11 @@ ---- ui/gl/gl_features.cc.orig 2022-10-01 07:40:07 UTC +--- ui/gl/gl_features.cc.orig 2022-12-02 17:56:32 UTC +++ ui/gl/gl_features.cc -@@ -85,7 +85,7 @@ const base::Feature kDefaultPassthroughCommandDecoder - "DefaultPassthroughCommandDecoder", +@@ -86,7 +86,7 @@ BASE_FEATURE(kDefaultPassthroughCommandDecoder, + "DefaultPassthroughCommandDecoder", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || \ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_MAC) + BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT + base::FEATURE_ENABLED_BY_DEFAULT #else - base::FEATURE_DISABLED_BY_DEFAULT + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc b/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc new file mode 100644 index 000000000000..3c5dbdae5c4d --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc @@ -0,0 +1,20 @@ +--- ui/gl/gl_switches.cc.orig 2022-12-02 17:56:32 UTC ++++ ui/gl/gl_switches.cc +@@ -11,7 +11,7 @@ + #include "base/android/build_info.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include <vulkan/vulkan_core.h> + #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck + #endif +@@ -282,7 +282,7 @@ bool IsDefaultANGLEVulkan() { + base::android::SDK_VERSION_Q) + return false; + #endif // BUILDFLAG(IS_ANDROID) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + angle::SystemInfo system_info; + if (!angle::GetSystemInfoVulkan(&system_info)) + return false; diff --git a/www/ungoogled-chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc b/www/ungoogled-chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc index fa7d5dc3dffd..135da24d04ac 100644 --- a/www/ungoogled-chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc +++ b/www/ungoogled-chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc @@ -1,6 +1,6 @@ ---- ui/gtk/printing/print_dialog_gtk.cc.orig 2022-10-01 07:40:07 UTC +--- ui/gtk/printing/print_dialog_gtk.cc.orig 2022-12-02 17:56:32 UTC +++ ui/gtk/printing/print_dialog_gtk.cc -@@ -398,7 +398,7 @@ void PrintDialogGtk::ShowDialog( +@@ -400,7 +400,7 @@ void PrintDialogGtk::ShowDialog( GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>( GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET | GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc index a12787a70113..77881ee592ce 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig 2022-10-01 07:40:07 UTC +--- ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig 2022-12-02 17:56:32 UTC +++ ui/ozone/platform/headless/vulkan_implementation_headless.cc -@@ -154,7 +154,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory +@@ -155,7 +155,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT; auto tiling = VK_IMAGE_TILING_OPTIMAL; diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc index 18472705d8ba..bde17ca90159 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2022-10-01 07:40:07 UTC +--- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2022-12-02 17:56:32 UTC +++ ui/ozone/platform/x11/ozone_platform_x11.cc -@@ -196,7 +196,7 @@ class OzonePlatformX11 : public OzonePlatform, +@@ -195,7 +195,7 @@ class OzonePlatformX11 : public OzonePlatform, properties->supports_global_application_menus = true; properties->app_modal_dialogs_use_event_blocker = true; properties->fetch_buffer_formats_for_gmb_on_gpu = true; diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_public_ozone__platform.h b/www/ungoogled-chromium/files/patch-ui_ozone_public_ozone__platform.h index 6ff752041f09..7bfd2d19c484 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_public_ozone__platform.h +++ b/www/ungoogled-chromium/files/patch-ui_ozone_public_ozone__platform.h @@ -1,6 +1,6 @@ ---- ui/ozone/public/ozone_platform.h.orig 2022-10-01 07:40:07 UTC +--- ui/ozone/public/ozone_platform.h.orig 2022-12-02 17:56:32 UTC +++ ui/ozone/public/ozone_platform.h -@@ -148,7 +148,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { +@@ -144,7 +144,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { // back via gpu extra info. bool fetch_buffer_formats_for_gmb_on_gpu = false; diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_test_mock__platform__window__delegate.h b/www/ungoogled-chromium/files/patch-ui_ozone_test_mock__platform__window__delegate.h index b466941e0b1b..6d368ba68b7c 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_test_mock__platform__window__delegate.h +++ b/www/ungoogled-chromium/files/patch-ui_ozone_test_mock__platform__window__delegate.h @@ -1,6 +1,6 @@ ---- ui/ozone/test/mock_platform_window_delegate.h.orig 2022-10-29 17:50:56 UTC +--- ui/ozone/test/mock_platform_window_delegate.h.orig 2022-12-02 17:56:32 UTC +++ ui/ozone/test/mock_platform_window_delegate.h -@@ -31,7 +31,7 @@ class MockPlatformWindowDelegate : public PlatformWind +@@ -32,7 +32,7 @@ class MockPlatformWindowDelegate : public PlatformWind MOCK_METHOD2(OnWindowStateChanged, void(PlatformWindowState old_state, PlatformWindowState new_state)); diff --git a/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.cc b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.cc index cf5b1559ec92..a017e5b8f610 100644 --- a/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.cc +++ b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.cc @@ -1,6 +1,6 @@ ---- ui/platform_window/platform_window_delegate.cc.orig 2022-10-29 17:50:56 UTC +--- ui/platform_window/platform_window_delegate.cc.orig 2022-12-02 17:56:32 UTC +++ ui/platform_window/platform_window_delegate.cc -@@ -15,7 +15,7 @@ PlatformWindowDelegate::PlatformWindowDelegate() = def +@@ -16,7 +16,7 @@ PlatformWindowDelegate::PlatformWindowDelegate() = def PlatformWindowDelegate::~PlatformWindowDelegate() = default; diff --git a/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.h b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.h index 001ded4b8745..399312bc4db9 100644 --- a/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.h +++ b/www/ungoogled-chromium/files/patch-ui_platform__window_platform__window__delegate.h @@ -1,6 +1,6 @@ ---- ui/platform_window/platform_window_delegate.h.orig 2022-10-29 17:50:56 UTC +--- ui/platform_window/platform_window_delegate.h.orig 2022-12-02 17:56:32 UTC +++ ui/platform_window/platform_window_delegate.h -@@ -95,7 +95,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow +@@ -96,7 +96,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow virtual void OnWindowStateChanged(PlatformWindowState old_state, PlatformWindowState new_state) = 0; diff --git a/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.h b/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.h index 7457e778a136..9b3438a0846e 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.h +++ b/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.h @@ -1,4 +1,4 @@ ---- ui/views/controls/textfield/textfield.h.orig 2022-10-01 07:40:07 UTC +--- ui/views/controls/textfield/textfield.h.orig 2022-12-02 17:56:32 UTC +++ ui/views/controls/textfield/textfield.h @@ -42,7 +42,7 @@ #include "ui/views/view.h" @@ -9,7 +9,7 @@ #include <vector> #endif -@@ -449,7 +449,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -448,7 +448,7 @@ class VIEWS_EXPORT Textfield : public View, // Set whether the text should be used to improve typing suggestions. void SetShouldDoLearning(bool value) { should_do_learning_ = value; } diff --git a/www/ungoogled-chromium/files/patch-ui_views_corewm_tooltip__aura.cc b/www/ungoogled-chromium/files/patch-ui_views_corewm_tooltip__aura.cc index c19d99d7f51a..7c197fcb7bcc 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_corewm_tooltip__aura.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_corewm_tooltip__aura.cc @@ -1,6 +1,6 @@ ---- ui/views/corewm/tooltip_aura.cc.orig 2022-10-01 07:40:07 UTC +--- ui/views/corewm/tooltip_aura.cc.orig 2022-12-02 17:56:32 UTC +++ ui/views/corewm/tooltip_aura.cc -@@ -50,7 +50,7 @@ constexpr int kVerticalPaddingBottom = 5; +@@ -53,7 +53,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/ungoogled-chromium/files/patch-ui_views_focus_focus__manager.cc b/www/ungoogled-chromium/files/patch-ui_views_focus_focus__manager.cc index 015b2ed7e423..e86b1168f6f3 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_focus_focus__manager.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_focus_focus__manager.cc @@ -1,6 +1,6 @@ ---- ui/views/focus/focus_manager.cc.orig 2022-10-01 07:40:07 UTC +--- ui/views/focus/focus_manager.cc.orig 2022-12-02 17:56:32 UTC +++ ui/views/focus/focus_manager.cc -@@ -623,7 +623,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -622,7 +622,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Processing an accelerator can delete things. Because we // need these objects afterwards on Linux, save widget_ as weak pointer and // save the close_on_deactivate property value of widget_delegate in a -@@ -640,7 +640,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -639,7 +639,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index 1808acf70b19..34925b7f6f67 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/ungoogled-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 2022-10-29 17:50:56 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2022-12-02 17:56:32 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -40,7 +40,7 @@ +@@ -41,7 +41,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 -@@ -256,7 +256,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget: +@@ -257,7 +257,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; -@@ -328,7 +328,7 @@ std::unique_ptr<aura::client::DragDropClient> +@@ -329,7 +329,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 +@@ -1017,7 +1017,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc b/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc index 4c974c07bd0c..aca8584bd2c6 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc @@ -1,4 +1,4 @@ ---- ui/views/widget/widget.cc.orig 2022-10-29 17:50:56 UTC +--- ui/views/widget/widget.cc.orig 2022-12-02 17:56:32 UTC +++ ui/views/widget/widget.cc @@ -50,7 +50,7 @@ #include "ui/views/window/custom_frame_view.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -1854,7 +1854,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -1871,7 +1871,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const if (parent_) return parent_->GetNativeTheme(); diff --git a/www/ungoogled-chromium/files/patch-ui_webui_resources_js_cr.js b/www/ungoogled-chromium/files/patch-ui_webui_resources_js_cr.js deleted file mode 100644 index 01846d7fb613..000000000000 --- a/www/ungoogled-chromium/files/patch-ui_webui_resources_js_cr.js +++ /dev/null @@ -1,14 +0,0 @@ ---- ui/webui/resources/js/cr.js.orig 2022-10-01 07:40:07 UTC -+++ ui/webui/resources/js/cr.js -@@ -438,6 +438,11 @@ var cr = cr || function(global) { - return returnValue; - }, - -+ /** Whether this is on *BSD. */ -+ get isBSD() { -+ return /BSD/.test(navigator.userAgent); -+ }, -+ - /** Whether this is on vanilla Linux (not chromeOS). */ - get isLinux() { - return /Linux/.test(navigator.userAgent); diff --git a/www/ungoogled-chromium/files/patch-v8_BUILD.gn b/www/ungoogled-chromium/files/patch-v8_BUILD.gn index fbacd3682e33..ee73cab23b50 100644 --- a/www/ungoogled-chromium/files/patch-v8_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2022-10-29 17:50:56 UTC +--- v8/BUILD.gn.orig 2022-12-02 17:56:32 UTC +++ v8/BUILD.gn -@@ -1255,6 +1255,14 @@ config("toolchain") { +@@ -1242,6 +1242,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. -@@ -5467,7 +5475,7 @@ v8_component("v8_libbase") { +@@ -5481,7 +5489,7 @@ v8_component("v8_libbase") { } } @@ -24,7 +24,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -5478,6 +5486,18 @@ v8_component("v8_libbase") { +@@ -5492,6 +5500,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/ungoogled-chromium/files/patch-v8_src_api_api.cc b/www/ungoogled-chromium/files/patch-v8_src_api_api.cc index d0f4abaa96bd..f7df551b93e4 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_api_api.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_api_api.cc @@ -1,4 +1,4 @@ ---- v8/src/api/api.cc.orig 2022-10-29 17:50:56 UTC +--- v8/src/api/api.cc.orig 2022-12-02 17:56:32 UTC +++ v8/src/api/api.cc @@ -140,7 +140,7 @@ #include "src/wasm/wasm-serialization.h" @@ -9,7 +9,7 @@ #include <signal.h> #if V8_ENABLE_WEBASSEMBLY -@@ -6175,7 +6175,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6206,7 +6206,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/ungoogled-chromium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc b/www/ungoogled-chromium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc index 433737b5bbcc..c90311580f79 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc @@ -1,6 +1,6 @@ ---- v8/src/compiler/backend/ia32/instruction-selector-ia32.cc.orig 2022-10-29 17:50:56 UTC +--- v8/src/compiler/backend/ia32/instruction-selector-ia32.cc.orig 2022-12-02 17:56:32 UTC +++ v8/src/compiler/backend/ia32/instruction-selector-ia32.cc -@@ -3033,6 +3033,7 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node +@@ -3034,6 +3034,7 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node Emit(opcode, 1, &dst, input_count, inputs, temp_count, temps); } @@ -8,7 +8,7 @@ void InstructionSelector::VisitI8x16Swizzle(Node* node) { InstructionCode op = kIA32I8x16Swizzle; -@@ -3086,6 +3087,9 @@ void VisitMinOrMax(InstructionSelector* selector, Node +@@ -3087,6 +3088,9 @@ void VisitMinOrMax(InstructionSelector* selector, Node void InstructionSelector::VisitF32x4Pmin(Node* node) { VisitMinOrMax(this, node, kIA32Minps, true); } diff --git a/www/ungoogled-chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc b/www/ungoogled-chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc index a2dbd1718e4b..121e08b1082d 100644 --- a/www/ungoogled-chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc +++ b/www/ungoogled-chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc @@ -1,6 +1,6 @@ ---- weblayer/browser/browser_main_parts_impl.cc.orig 2022-10-01 07:40:07 UTC +--- weblayer/browser/browser_main_parts_impl.cc.orig 2022-12-02 17:56:32 UTC +++ weblayer/browser/browser_main_parts_impl.cc -@@ -79,7 +79,7 @@ +@@ -80,7 +80,7 @@ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif -@@ -195,7 +195,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { +@@ -197,7 +197,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. |