diff --git a/www/iridium/Makefile b/www/iridium/Makefile index eea103f7ce5a3..a148702eb483a 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -1,6 +1,5 @@ PORTNAME= iridium -PORTVERSION= 2022.12.108.1 -PORTREVISION= 1 +PORTVERSION= 2023.01.109 CATEGORIES= www wayland MASTER_SITES= https://downloads.iridiumbrowser.de/source/ PKGNAMESUFFIX= -browser @@ -16,7 +15,7 @@ LICENSE_COMB= multi ONLY_FOR_ARCHS= aarch64 amd64 i386 PATCH_SITES= https://nerd.hu/distfiles/ -PATCHFILES+= disable-privacy-sandbox-352a8844b01a05a786ba76da599d106487f1533f.patch:-p1 +PATCHFILES+= disable-privacy-sandbox-7f49edb924b6d2b38fcc9a2c76d4e5e1f857e7b9.patch:-p1 BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ @@ -98,6 +97,7 @@ BINARY_ALIAS= python3=${PYTHON_CMD} \ # OS "target_os == is_bsd", like libusb, libpci. GN_ARGS+= clang_use_chrome_plugins=false \ chrome_pgo_phase=0 \ + enable_backup_ref_ptr_support=false \ enable_hangout_services_extension=true \ enable_js_type_check=false \ enable_nacl=false \ @@ -108,19 +108,19 @@ GN_ARGS+= clang_use_chrome_plugins=false \ optimize_webui=true \ toolkit_views=true \ treat_warnings_as_errors=false \ - use_allocator="none" \ use_allocator_shim=false \ use_aura=true \ use_custom_libcxx=false \ use_gnome_keyring=false \ use_lld=true \ + use_partition_alloc=true \ + use_partition_alloc_as_malloc=false \ use_sysroot=false \ use_system_freetype=false \ use_system_harfbuzz=true \ use_system_libjpeg=true \ use_system_libwayland=true \ use_system_wayland_scanner=true \ - use_system_libwayland_server=true \ use_udev=false \ extra_cxxflags="${CXXFLAGS}" \ extra_ldflags="${LDFLAGS}" diff --git a/www/iridium/distinfo b/www/iridium/distinfo index 42e8429c0b34a..c328a5d3594d2 100644 --- a/www/iridium/distinfo +++ b/www/iridium/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1670314377 -SHA256 (iridium-browser-2022.12.108.1.tar.xz) = bc8e923f3003a601a51daa0c5aa6d846742e000f86c7187c55369909bb7ce227 -SIZE (iridium-browser-2022.12.108.1.tar.xz) = 1641474124 -SHA256 (disable-privacy-sandbox-352a8844b01a05a786ba76da599d106487f1533f.patch) = 643103d1d8d8d57a0403a5f048cbbc15422e539f8334cde158e83530aa67257d -SIZE (disable-privacy-sandbox-352a8844b01a05a786ba76da599d106487f1533f.patch) = 4702 +TIMESTAMP = 1673979574 +SHA256 (iridium-browser-2023.01.109.tar.xz) = fb7612c88d0b997c51d427691f55d284369f2155d1a97ebca872c94ea8c93ac0 +SIZE (iridium-browser-2023.01.109.tar.xz) = 1497700992 +SHA256 (disable-privacy-sandbox-7f49edb924b6d2b38fcc9a2c76d4e5e1f857e7b9.patch) = 946f281504f7ce775a288f7d82371c2479d39e2e6c238f779aeeba1b821cbf07 +SIZE (disable-privacy-sandbox-7f49edb924b6d2b38fcc9a2c76d4e5e1f857e7b9.patch) = 4702 diff --git a/www/iridium/files/patch-BUILD.gn b/www/iridium/files/patch-BUILD.gn index 282d2e412a114..0a950495a8b90 100644 --- a/www/iridium/files/patch-BUILD.gn +++ b/www/iridium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ BUILD.gn -@@ -59,7 +59,7 @@ declare_args() { +@@ -60,7 +60,7 @@ declare_args() { root_extra_deps = [] } @@ -9,7 +9,7 @@ # An official (maximally optimized!) component (optimized for build times) # build doesn't make sense and usually doesn't work. assert(!is_component_build) -@@ -89,7 +89,6 @@ group("gn_all") { +@@ -90,7 +90,6 @@ group("gn_all") { "//codelabs", "//components:components_unittests", "//components/gwp_asan:gwp_asan_unittests", @@ -17,7 +17,7 @@ "//net:net_unittests", "//sandbox:sandbox_unittests", "//services:services_unittests", -@@ -430,7 +429,7 @@ group("gn_all") { +@@ -434,7 +433,7 @@ group("gn_all") { ] } @@ -26,7 +26,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -632,6 +631,15 @@ group("gn_all") { +@@ -637,6 +636,15 @@ group("gn_all") { deps += [ "//gpu/tools/compositor_model_bench" ] } @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:crash_inspector", -@@ -680,7 +688,7 @@ group("gn_all") { +@@ -685,7 +693,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)" ] } -@@ -1107,7 +1115,7 @@ if (!is_ios) { +@@ -1115,7 +1123,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") { -@@ -1202,7 +1210,7 @@ if (!is_ios) { +@@ -1211,7 +1219,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)" ] } -@@ -1211,7 +1219,7 @@ if (!is_ios) { +@@ -1220,7 +1228,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)" ] } -@@ -1655,7 +1663,7 @@ group("chromium_builder_perf") { +@@ -1660,7 +1668,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/www/iridium/files/patch-base_BUILD.gn b/www/iridium/files/patch-base_BUILD.gn index 7ea6428a19d0a..51e6d1c603b02 100644 --- a/www/iridium/files/patch-base_BUILD.gn +++ b/www/iridium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- base/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ base/BUILD.gn -@@ -163,7 +163,7 @@ buildflag_header("ios_cronet_buildflags") { +@@ -167,7 +167,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" -@@ -1048,7 +1048,7 @@ mixed_component("base") { +@@ -1059,7 +1059,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", -@@ -1059,6 +1059,14 @@ mixed_component("base") { +@@ -1070,6 +1070,14 @@ mixed_component("base") { "profiler/thread_delegate_posix.h", ] } @@ -33,7 +33,7 @@ } if (is_win) { -@@ -1559,11 +1567,23 @@ mixed_component("base") { +@@ -1569,11 +1577,23 @@ mixed_component("base") { # Needed for 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", -@@ -1591,7 +1611,7 @@ mixed_component("base") { +@@ -1601,7 +1621,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", -@@ -1645,7 +1665,7 @@ mixed_component("base") { +@@ -1655,7 +1675,7 @@ mixed_component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -76,14 +76,13 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2218,6 +2238,42 @@ mixed_component("base") { +@@ -2238,6 +2258,41 @@ mixed_component("base") { } } + if (is_bsd) { + sources -= [ + "files/file_path_watcher_inotify.cc", -+ "files/file_util_linux.cc", + "files/scoped_file_linux.cc", + "process/memory_linux.cc", + "process/process_linux.cc", @@ -119,7 +118,7 @@ # iOS if (is_ios) { sources -= [ -@@ -2315,7 +2371,7 @@ mixed_component("base") { +@@ -2335,7 +2390,7 @@ mixed_component("base") { } if (dep_libevent) { @@ -128,7 +127,7 @@ } if (use_libevent) { -@@ -3583,7 +3639,7 @@ test("base_unittests") { +@@ -3605,7 +3660,7 @@ test("base_unittests") { } } @@ -137,7 +136,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3629,7 +3685,7 @@ test("base_unittests") { +@@ -3651,7 +3706,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -146,7 +145,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3640,7 +3696,7 @@ test("base_unittests") { +@@ -3662,7 +3717,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -155,7 +154,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3832,7 +3888,7 @@ test("base_unittests") { +@@ -3869,7 +3924,7 @@ test("base_unittests") { } } diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h index 2ea09f1476ac3..27cc5254df40f 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/iridium/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-12-06 08:09:13 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-01-17 19:19:00 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -356,8 +356,12 @@ bool TryRecommitSystemPagesInternal( +@@ -370,8 +370,12 @@ bool TryRecommitSystemPagesInternal( void DiscardSystemPagesInternal(uintptr_t address, size_t length) { void* ptr = reinterpret_cast(address); diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__address__space.cc b/www/iridium/files/patch-base_allocator_partition__allocator_partition__address__space.cc index c2bc4d1b0e66a..94938325934fa 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__address__space.cc +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__address__space.cc @@ -1,8 +1,8 @@ ---- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-12-06 08:09:13 UTC +--- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-01-17 19:19:00 UTC +++ base/allocator/partition_allocator/partition_address_space.cc -@@ -294,7 +294,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT - setup_.configurable_pool_base_mask_ = 0; +@@ -432,7 +432,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting() } + #endif -#if BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni new file mode 100644 index 0000000000000..3a1491c7daa8c --- /dev/null +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni @@ -0,0 +1,11 @@ +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-01-17 19:19:00 UTC ++++ base/allocator/partition_allocator/partition_alloc.gni +@@ -121,7 +121,7 @@ assert( + "Missing dangling pointer checks feature for its performance experiment") + + declare_args() { +- enable_pkeys = is_linux && target_cpu == "x64" ++ enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64" + } + assert(!enable_pkeys || (is_linux && target_cpu == "x64"), + "Pkeys are only supported on x64 linux") diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h index 560917f3801b2..c39f37a5bf4b6 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-12-01 10:35:46 UTC +--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-01-17 19:19:00 UTC +++ base/allocator/partition_allocator/partition_alloc_config.h -@@ -76,7 +76,7 @@ static_assert(sizeof(void*) != 8, ""); +@@ -84,7 +84,7 @@ static_assert(sizeof(void*) != 8, ""); // POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific // features such as futex(2). @@ -9,7 +9,7 @@ #define PA_HAS_LINUX_KERNEL #endif -@@ -197,7 +197,7 @@ constexpr bool kUseLazyCommit = false; +@@ -216,7 +216,7 @@ constexpr bool kUseLazyCommit = false; // On these platforms, lock all the partitions before fork(), and unlock after. // This may be required on more platforms in the future. @@ -18,7 +18,7 @@ #define PA_HAS_ATFORK_HANDLER #endif -@@ -238,7 +238,7 @@ constexpr bool kUseLazyCommit = false; +@@ -257,7 +257,7 @@ constexpr bool kUseLazyCommit = false; // // Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to // larger slot spans. diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h index 1e0d5165916f7..7a3886aa985dd 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-12-06 08:09:13 UTC +--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-01-17 19:19:00 UTC +++ base/allocator/partition_allocator/partition_alloc_constants.h @@ -91,7 +91,7 @@ PartitionPageShift() { return 18; // 256 KiB @@ -9,7 +9,7 @@ PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t PartitionPageShift() { return PageAllocationGranularityShift() + 2; -@@ -270,7 +270,7 @@ constexpr size_t kNumPools = 3; +@@ -274,7 +274,7 @@ constexpr size_t kNumPools = 3; // Special-case Android and iOS, which incur test failures with larger // pools. Regardless, allocating >8GiB with malloc() on these platforms is // unrealistic as of 2022. diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc b/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc index 3efecadd5033c..77eb2accd264a 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_root.cc.orig 2022-12-01 10:35:46 UTC +--- base/allocator/partition_allocator/partition_root.cc.orig 2023-01-17 19:19:00 UTC +++ base/allocator/partition_allocator/partition_root.cc -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ #include "wow64apiset.h" #endif @@ -9,7 +9,7 @@ #include #endif -@@ -238,7 +238,7 @@ void PartitionAllocMallocInitOnce() { +@@ -239,7 +239,7 @@ void PartitionAllocMallocInitOnce() { if (!g_global_init_called.compare_exchange_strong(expected, true)) return; @@ -18,7 +18,7 @@ // When fork() is called, only the current thread continues to execute in the // child process. If the lock is held, but *not* by this thread when fork() is // called, we have a deadlock. -@@ -331,7 +331,7 @@ static size_t PartitionPurgeSlotSpan( +@@ -332,7 +332,7 @@ static size_t PartitionPurgeSlotSpan( constexpr size_t kMaxSlotCount = (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) / MinPurgeableSlotSize(); @@ -27,7 +27,7 @@ // It's better for slot_usage to be stack-allocated and fixed-size, which // demands that its size be constexpr. On IS_APPLE and Linux on arm64, // PartitionPageSize() is always SystemPageSize() << 2, so regardless of -@@ -734,7 +734,7 @@ void PartitionRoot::Init(PartitionOptions +@@ -789,7 +789,7 @@ void PartitionRoot::Init(PartitionOptions // apple OSes. PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || (internal::SystemPageSize() == (size_t{1} << 14))); diff --git a/www/iridium/files/patch-base_cpu.h b/www/iridium/files/patch-base_cpu.h deleted file mode 100644 index 2a9efeb30eb64..0000000000000 --- a/www/iridium/files/patch-base_cpu.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/cpu.h.orig 2022-12-06 08:09:13 UTC -+++ base/cpu.h -@@ -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) || \ -- BUILDFLAG(IS_AIX) -+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) - enum class CoreType { - kUnknown = 0, - kOther, diff --git a/www/iridium/files/patch-base_files_file__util__unittest.cc b/www/iridium/files/patch-base_files_file__util__unittest.cc index 88a9844ce4486..b380b6ad38318 100644 --- a/www/iridium/files/patch-base_files_file__util__unittest.cc +++ b/www/iridium/files/patch-base_files_file__util__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_unittest.cc.orig 2022-12-01 10:35:46 UTC +--- base/files/file_util_unittest.cc.orig 2023-01-17 19:19:00 UTC +++ base/files/file_util_unittest.cc -@@ -3549,7 +3549,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3558,7 +3558,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { } #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { FilePath file_path("/proc/cpuinfo"); std::string data = "temp"; -@@ -4272,7 +4272,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles +@@ -4281,7 +4281,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles NULL); #else size_t bytes_written = diff --git a/www/iridium/files/patch-base_process_memory.cc b/www/iridium/files/patch-base_process_memory.cc index 10a5e5425971e..6d4798bff6fb2 100644 --- a/www/iridium/files/patch-base_process_memory.cc +++ b/www/iridium/files/patch-base_process_memory.cc @@ -1,9 +1,9 @@ ---- base/process/memory.cc.orig 2022-12-01 10:35:46 UTC +--- base/process/memory.cc.orig 2023-01-17 19:19:00 UTC +++ base/process/memory.cc @@ -28,7 +28,7 @@ namespace base { - // Defined in memory_mac.mm for macOS + use_allocator="none". In case of - // USE_PARTITION_ALLOC_AS_MALLOC, no need to route the call to the system - // default calloc of macOS. + // Defined in memory_mac.mm for macOS + use_partition_alloc_as_malloc=false. + // In case of use_partition_alloc_as_malloc=true, no need to route the call to + // the system default calloc of macOS. -#if !BUILDFLAG(IS_APPLE) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) +#if (!BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) diff --git a/www/iridium/files/patch-base_process_process__metrics.cc b/www/iridium/files/patch-base_process_process__metrics.cc index 6a119d9b8e963..425a1d44a1264 100644 --- a/www/iridium/files/patch-base_process_process__metrics.cc +++ b/www/iridium/files/patch-base_process_process__metrics.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics.cc.orig 2022-12-01 10:35:46 UTC +--- base/process/process_metrics.cc.orig 2023-01-17 19:19:00 UTC +++ base/process/process_metrics.cc @@ -17,7 +17,7 @@ namespace base { namespace { @@ -35,7 +35,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( TimeDelta cumulative_cpu) { TimeTicks time = TimeTicks::Now(); -@@ -126,7 +125,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( +@@ -125,7 +124,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( double ProcessMetrics::GetPlatformIndependentCPUUsage() { return GetPlatformIndependentCPUUsage(GetCumulativeCPUUsage()); } @@ -43,7 +43,7 @@ #if BUILDFLAG(IS_WIN) double ProcessMetrics::GetPreciseCPUUsage(TimeDelta cumulative_cpu) { -@@ -157,7 +155,7 @@ double ProcessMetrics::GetPreciseCPUUsage() { +@@ -156,7 +154,7 @@ double ProcessMetrics::GetPreciseCPUUsage() { #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-base_process_process__metrics.h b/www/iridium/files/patch-base_process_process__metrics.h index 3afa15a7a9fba..2c4491df02753 100644 --- a/www/iridium/files/patch-base_process_process__metrics.h +++ b/www/iridium/files/patch-base_process_process__metrics.h @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2022-12-06 08:09:13 UTC +--- base/process/process_metrics.h.orig 2023-01-17 19:19:00 UTC +++ base/process/process_metrics.h @@ -36,7 +36,7 @@ #endif @@ -9,7 +9,7 @@ #include #include #include -@@ -52,7 +52,7 @@ class Value; +@@ -51,7 +51,7 @@ class Value; // Full declaration is in process_metrics_iocounters.h. struct IoCounters; @@ -18,7 +18,7 @@ // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // -@@ -107,7 +107,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -106,7 +106,7 @@ class BASE_EXPORT ProcessMetrics { // convenience wrapper for CreateProcessMetrics(). static std::unique_ptr CreateCurrentProcessMetrics(); @@ -27,7 +27,7 @@ // Resident Set Size is a Linux/Android specific memory concept. Do not // attempt to extend this to other platforms. BASE_EXPORT size_t GetResidentSetSize() const; -@@ -165,7 +165,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -164,7 +164,7 @@ class BASE_EXPORT ProcessMetrics { #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -36,7 +36,7 @@ // Emits the cumulative CPU usage for all currently active threads since they // were started into the output parameter (replacing its current contents). // Threads that have already terminated will not be reported. Thus, the sum of -@@ -248,7 +248,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -224,7 +224,7 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // BUILDFLAG(IS_POSIX) @@ -45,7 +45,7 @@ // Bytes of swap as reported by /proc/[pid]/status. uint64_t GetVmSwapBytes() const; -@@ -269,7 +269,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -245,7 +245,7 @@ class BASE_EXPORT ProcessMetrics { #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -54,16 +54,7 @@ int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if BUILDFLAG(IS_APPLE) -@@ -280,7 +280,7 @@ class BASE_EXPORT ProcessMetrics { - #endif - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ -- BUILDFLAG(IS_AIX) -+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) - CPU::CoreType GetCoreType(uint32_t core_index); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || - // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) -@@ -294,9 +294,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -264,9 +264,7 @@ class BASE_EXPORT ProcessMetrics { // Used to store the previous times and CPU usage counts so we can // compute the CPU usage between calls. TimeTicks last_cpu_time_; @@ -73,7 +64,7 @@ #if BUILDFLAG(IS_WIN) TimeTicks last_cpu_time_for_precise_cpu_usage_; -@@ -304,7 +302,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -274,7 +272,7 @@ class BASE_EXPORT ProcessMetrics { #endif #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -82,7 +73,7 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -347,7 +345,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -317,7 +315,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \ @@ -91,7 +82,7 @@ // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -382,7 +380,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -352,7 +350,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -100,7 +91,7 @@ // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -397,7 +395,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -367,7 +365,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -109,7 +100,7 @@ int buffers = 0; int cached = 0; int active_anon = 0; -@@ -434,7 +432,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK +@@ -404,7 +402,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -118,7 +109,7 @@ // Parse the data found in /proc//stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. -@@ -622,7 +620,7 @@ class BASE_EXPORT SystemMetrics { +@@ -592,7 +590,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; diff --git a/www/iridium/files/patch-base_system_sys__info__posix.cc b/www/iridium/files/patch-base_system_sys__info__posix.cc index a3ec2d7b5903a..e349d3e1d6275 100644 --- a/www/iridium/files/patch-base_system_sys__info__posix.cc +++ b/www/iridium/files/patch-base_system_sys__info__posix.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_posix.cc.orig 2022-12-06 08:09:13 UTC +--- base/system/sys_info_posix.cc.orig 2023-01-17 19:19:00 UTC +++ base/system/sys_info_posix.cc -@@ -182,12 +182,12 @@ absl::optional NumberOfPhysicalProcessors() { +@@ -154,12 +154,12 @@ int NumberOfProcessors() { } // namespace internal @@ -15,7 +15,7 @@ // static uint64_t SysInfo::AmountOfVirtualMemory() { -@@ -277,6 +277,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -249,6 +249,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; @@ -24,10 +24,3 @@ } 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/iridium/files/patch-base_test_launcher_test__launcher.cc b/www/iridium/files/patch-base_test_launcher_test__launcher.cc index 0a84917716cb5..044f50973517d 100644 --- a/www/iridium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/iridium/files/patch-base_test_launcher_test__launcher.cc @@ -1,6 +1,6 @@ ---- base/test/launcher/test_launcher.cc.orig 2022-10-05 07:34:01 UTC +--- base/test/launcher/test_launcher.cc.orig 2023-01-17 19:19:00 UTC +++ base/test/launcher/test_launcher.cc -@@ -65,6 +65,7 @@ +@@ -67,6 +67,7 @@ #include "third_party/libxml/chromium/libxml_utils.h" #if BUILDFLAG(IS_POSIX) diff --git a/www/iridium/files/patch-base_threading_platform__thread__unittest.cc b/www/iridium/files/patch-base_threading_platform__thread__unittest.cc index ff2ce9c6629e9..9f5d18daebd54 100644 --- a/www/iridium/files/patch-base_threading_platform__thread__unittest.cc +++ b/www/iridium/files/patch-base_threading_platform__thread__unittest.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_unittest.cc.orig 2022-10-05 07:34:01 UTC +--- base/threading/platform_thread_unittest.cc.orig 2023-01-17 19:19:00 UTC +++ base/threading/platform_thread_unittest.cc @@ -31,7 +31,7 @@ #include "base/time/time.h" @@ -18,15 +18,6 @@ // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be // able to increase priority to any level. constexpr bool kCanIncreasePriority = false; -@@ -523,7 +523,7 @@ TEST(PlatformThreadTest, SetHugeThreadName) { - TEST(PlatformThreadTest, GetDefaultThreadStackSize) { - size_t stack_size = PlatformThread::GetDefaultThreadStackSize(); - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || \ -- ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ - !defined(THREAD_SANITIZER)) || \ - (BUILDFLAG(IS_ANDROID) && !defined(ADDRESS_SANITIZER)) - EXPECT_EQ(0u, stack_size); @@ -684,12 +684,16 @@ INSTANTIATE_TEST_SUITE_P( #endif // BUILDFLAG(IS_APPLE) diff --git a/www/iridium/files/patch-build_config_BUILDCONFIG.gn b/www/iridium/files/patch-build_config_BUILDCONFIG.gn index 5cc6d67c416e9..2d36b7b2a6073 100644 --- a/www/iridium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/iridium/files/patch-build_config_BUILDCONFIG.gn @@ -1,4 +1,4 @@ ---- build/config/BUILDCONFIG.gn.orig 2022-10-05 07:34:01 UTC +--- build/config/BUILDCONFIG.gn.orig 2023-01-17 19:19:00 UTC +++ build/config/BUILDCONFIG.gn @@ -136,7 +136,8 @@ declare_args() { is_official_build = false @@ -10,7 +10,7 @@ (current_cpu != "s390x" && current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64" && -@@ -220,6 +221,10 @@ if (host_toolchain == "") { +@@ -225,6 +226,10 @@ if (host_toolchain == "") { host_toolchain = "//build/toolchain/aix:$host_cpu" } else if (host_os == "zos") { host_toolchain = "//build/toolchain/zos:$host_cpu" @@ -21,7 +21,7 @@ } else { assert(false, "Unsupported host_os: $host_os") } -@@ -264,6 +269,8 @@ if (target_os == "android") { +@@ -268,6 +273,8 @@ if (target_os == "android") { _default_toolchain = "//build/toolchain/aix:$target_cpu" } else if (target_os == "zos") { _default_toolchain = "//build/toolchain/zos:$target_cpu" @@ -30,7 +30,7 @@ } else { assert(false, "Unsupported target_os: $target_os") } -@@ -298,7 +305,11 @@ is_android = current_os == "android" +@@ -302,7 +309,11 @@ is_android = current_os == "android" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" diff --git a/www/iridium/files/patch-build_config_compiler_BUILD.gn b/www/iridium/files/patch-build_config_compiler_BUILD.gn index c29bd80d919b2..2dc1e1f59c72e 100644 --- a/www/iridium/files/patch-build_config_compiler_BUILD.gn +++ b/www/iridium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- build/config/compiler/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ build/config/compiler/BUILD.gn -@@ -219,13 +219,16 @@ config("default_include_dirs") { +@@ -224,13 +224,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 --------------------------------------------------------------------- -@@ -271,7 +274,9 @@ config("compiler") { +@@ -276,7 +279,9 @@ config("compiler") { configs += [ # See the definitions below. @@ -28,7 +28,7 @@ ":compiler_codegen", ":compiler_deterministic", ] -@@ -447,6 +452,10 @@ config("compiler") { +@@ -452,6 +457,10 @@ config("compiler") { } } @@ -39,7 +39,7 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_gold) { -@@ -890,7 +899,7 @@ config("compiler_cpu_abi") { +@@ -912,7 +921,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -48,7 +48,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -905,7 +914,7 @@ config("compiler_cpu_abi") { +@@ -927,7 +936,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -57,7 +57,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1254,6 +1263,27 @@ config("compiler_deterministic") { +@@ -1272,6 +1281,27 @@ config("compiler_deterministic") { } } @@ -85,7 +85,7 @@ config("rustc_revision") { if (enable_rust && defined(rustc_version)) { # Similar to the above config, this is here so that all files get -@@ -1475,7 +1505,7 @@ config("default_warnings") { +@@ -1493,7 +1523,7 @@ config("default_warnings") { "-Wno-ignored-pragma-optimize", ] @@ -94,7 +94,7 @@ cflags += [ # TODO(crbug.com/1343975) Evaluate and possibly enable. "-Wno-deprecated-builtins", -@@ -1640,7 +1670,7 @@ config("no_chromium_code") { +@@ -1658,7 +1688,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] @@ -103,7 +103,7 @@ cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -1952,8 +1982,7 @@ config("default_stack_frames") { +@@ -1970,8 +2000,7 @@ config("default_stack_frames") { } # Default "optimization on" config. @@ -113,7 +113,7 @@ if (is_win) { if (chrome_pgo_phase != 2) { # Favor size over speed, /O1 must be before the common flags. -@@ -1998,8 +2027,7 @@ config("xoptimize") { +@@ -2016,8 +2045,7 @@ config("xoptimize") { } # Turn off optimizations. @@ -123,7 +123,7 @@ if (is_win) { cflags = [ "/Od", # Disable optimization. -@@ -2039,8 +2067,7 @@ config("xno_optimize") { +@@ -2057,8 +2085,7 @@ config("xno_optimize") { # Turns up the optimization level. On Windows, this implies whole program # optimization and link-time code generation which is very expensive and should # be used sparingly. @@ -133,7 +133,7 @@ if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2073,8 +2100,7 @@ config("xoptimize_max") { +@@ -2091,8 +2118,7 @@ config("xoptimize_max") { # # TODO(crbug.com/621335) - rework how all of these configs are related # so that we don't need this disclaimer. @@ -143,7 +143,7 @@ if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2100,8 +2126,7 @@ config("xoptimize_speed") { +@@ -2118,8 +2144,7 @@ config("xoptimize_speed") { } } @@ -153,7 +153,7 @@ cflags = [ "-O1" ] + common_optimize_on_cflags rustflags = [ "-Copt-level=1" ] ldflags = common_optimize_on_ldflags -@@ -2167,7 +2192,7 @@ config("afdo_optimize_size") { +@@ -2185,7 +2210,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") { @@ -162,7 +162,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2183,7 +2208,7 @@ config("afdo") { +@@ -2201,7 +2226,7 @@ config("afdo") { cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ] inputs = [ _clang_sample_profile ] } @@ -171,7 +171,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2221,8 +2246,7 @@ config("win_pdbaltpath") { +@@ -2239,8 +2264,7 @@ config("win_pdbaltpath") { } # Full symbols. @@ -181,7 +181,7 @@ if (is_win) { if (is_clang) { cflags = [ "/Z7" ] # Debug information in the .obj files. -@@ -2333,7 +2357,8 @@ config("xsymbols") { +@@ -2349,7 +2373,8 @@ config("xsymbols") { configs += [ "//build/config:compress_debug_sections" ] } @@ -191,7 +191,7 @@ if (is_apple) { # TODO(https://crbug.com/1050118): Investigate missing debug info on mac. # Make sure we don't use constructor homing on mac. -@@ -2356,8 +2381,7 @@ config("xsymbols") { +@@ -2372,8 +2397,7 @@ config("xsymbols") { # Minimal symbols. # This config guarantees to hold symbol for stack trace which are shown to user # when crash happens in unittests running on buildbot. @@ -201,7 +201,7 @@ if (is_win) { # Functions, files, and line tables only. cflags = [] -@@ -2429,8 +2453,7 @@ config("xminimal_symbols") { +@@ -2446,8 +2470,7 @@ config("xminimal_symbols") { # This configuration contains function names only. That is, the compiler is # told to not generate debug information and the linker then just puts function # names in the final debug information. diff --git a/www/iridium/files/patch-build_gn__run__binary.py b/www/iridium/files/patch-build_gn__run__binary.py index 04b6fbb174d17..1e69b9ec61661 100644 --- a/www/iridium/files/patch-build_gn__run__binary.py +++ b/www/iridium/files/patch-build_gn__run__binary.py @@ -1,11 +1,11 @@ ---- build/gn_run_binary.py.orig 2022-03-28 18:11:04 UTC +--- build/gn_run_binary.py.orig 2023-01-17 19:19:00 UTC +++ build/gn_run_binary.py @@ -24,7 +24,7 @@ if not os.path.isabs(path): # The rest of the arguments are passed directly to the executable. args = [path] + sys.argv[2:] -ret = subprocess.call(args) -+ret = subprocess.call(args, env={"IRIDIUM_EXE_PATH":"${WRKSRC}/out/Release/chrome","LD_LIBRARY_PATH":"${WRKSRC}/out/Release"}) ++ret = subprocess.call(args, env={"CHROME_EXE_PATH":"${WRKSRC}/out/Release/chrome","LD_LIBRARY_PATH":"${WRKSRC}/out/Release"}) if ret != 0: if ret <= -100: # Windows error codes such as 0xC0000005 and 0xC0000409 are much easier to diff --git a/www/iridium/files/patch-build_linux_unbundle_openh264.gn b/www/iridium/files/patch-build_linux_unbundle_openh264.gn new file mode 100644 index 0000000000000..abd6f584421c3 --- /dev/null +++ b/www/iridium/files/patch-build_linux_unbundle_openh264.gn @@ -0,0 +1,21 @@ +--- build/linux/unbundle/openh264.gn.orig 2023-01-17 19:19:00 UTC ++++ build/linux/unbundle/openh264.gn +@@ -2,6 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/buildflag_header.gni") + import("//build/config/linux/pkg_config.gni") + import("//build/shim_headers.gni") + +@@ -33,4 +34,10 @@ source_set("processing") { + source_set("encoder") { + deps = [ ":openh264_shim" ] + public_configs = [ ":config" ] ++} ++ ++buildflag_header("buildflags") { ++ header = "buildflags.h" ++ header_dir = "third_party/openh264" ++ flags = [ "OPENH264_API_WELS=1" ] + } diff --git a/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni index 450d35ba5c66c..97e41012ba1c9 100644 --- a/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2022-10-05 07:34:01 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2023-01-17 19:19:00 UTC +++ build/toolchain/gcc_toolchain.gni @@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -14,7 +14,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -786,22 +793,12 @@ template("gcc_toolchain") { +@@ -799,22 +806,12 @@ template("gcc_toolchain") { # use_gold too. template("clang_toolchain") { gcc_toolchain(target_name) { diff --git a/www/iridium/files/patch-cc_BUILD.gn b/www/iridium/files/patch-cc_BUILD.gn index ea223d4df9d01..8cdd693299de3 100644 --- a/www/iridium/files/patch-cc_BUILD.gn +++ b/www/iridium/files/patch-cc_BUILD.gn @@ -1,4 +1,4 @@ ---- cc/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- cc/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ cc/BUILD.gn @@ -666,7 +666,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -894,7 +894,6 @@ cc_test("cc_unittests") { +@@ -893,7 +893,6 @@ cc_test("cc_unittests") { data = [ "//components/viz/test/data/" ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/iridium/files/patch-chrome_app_chrome__main.cc b/www/iridium/files/patch-chrome_app_chrome__main.cc index c08821e823b78..e5f8fb938bd9e 100644 --- a/www/iridium/files/patch-chrome_app_chrome__main.cc +++ b/www/iridium/files/patch-chrome_app_chrome__main.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/app/chrome_main.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/app/chrome_main.cc -@@ -26,7 +26,7 @@ +@@ -25,7 +25,7 @@ #include "chrome/app/notification_metrics.h" #endif @@ -9,12 +9,12 @@ #include "base/base_switches.h" #endif -@@ -152,7 +152,7 @@ int ChromeMain(int argc, const char** argv) { +@@ -151,7 +151,7 @@ int ChromeMain(int argc, const char** argv) { headless::SetUpCommandLine(command_line); } else { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - if (command_line->HasSwitch(switches::kHeadless)) { + if (headless::IsOldHeadlessMode()) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) command_line->AppendSwitch(::headless::switches::kEnableCrashReporter); diff --git a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc index 389a15cd16670..19c80a3b88a7e 100644 --- a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -135,7 +135,7 @@ +@@ -136,7 +136,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 -@@ -179,16 +179,16 @@ +@@ -180,16 +180,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 -@@ -344,7 +344,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -348,7 +348,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 -@@ -429,7 +429,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -433,7 +433,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) || -@@ -518,7 +518,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -540,7 +540,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. -@@ -601,7 +601,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -629,7 +629,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -65,7 +65,7 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::RecordStartupProcessCreationTime( -@@ -848,6 +848,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() { +@@ -911,6 +911,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() { // not always enabled on ChromeOS. #if BUILDFLAG(IS_CHROMEOS) bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled(); @@ -74,7 +74,7 @@ #else bool enable_gwp_asan = true; #endif -@@ -908,7 +910,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { +@@ -971,7 +973,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { base::internal::TimerBase::InitializeFeatures(); base::InitializeCpuReductionExperiment(); base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures(); @@ -83,7 +83,7 @@ base::MessagePumpLibevent::InitializeFeatures(); #elif BUILDFLAG(IS_MAC) base::PlatformThread::InitFeaturesPostFieldTrial(); -@@ -1017,7 +1019,7 @@ absl::optional ChromeMainDelegate::BasicStartupCo +@@ -1080,7 +1082,7 @@ absl::optional 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 -@@ -1047,7 +1049,7 @@ absl::optional ChromeMainDelegate::BasicStartupCo +@@ -1110,7 +1112,7 @@ absl::optional ChromeMainDelegate::BasicStartupCo #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -101,7 +101,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1437,7 +1439,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1492,7 +1494,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)) { -@@ -1517,7 +1519,7 @@ absl::variant Chrome +@@ -1572,7 +1574,7 @@ absl::variant Chrome // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. diff --git a/www/iridium/files/patch-chrome_app_generated__resources.grd b/www/iridium/files/patch-chrome_app_generated__resources.grd index 532bc1c91b8ee..a4dc04d03f30a 100644 --- a/www/iridium/files/patch-chrome_app_generated__resources.grd +++ b/www/iridium/files/patch-chrome_app_generated__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/generated_resources.grd.orig 2022-12-06 08:09:13 UTC +--- chrome/app/generated_resources.grd.orig 2023-01-17 19:19:00 UTC +++ chrome/app/generated_resources.grd @@ -2,7 +2,7 @@ @@ -27,7 +27,7 @@ Read information about your browser, OS, device, installed software and files -@@ -5487,7 +5487,7 @@ Keep your key file in a safe place. You will need it t +@@ -5493,7 +5493,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. @@ -36,7 +36,7 @@ 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. -@@ -5515,7 +5515,7 @@ Keep your key file in a safe place. You will need it t +@@ -5521,7 +5521,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. @@ -45,7 +45,7 @@ Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available. -@@ -9106,7 +9106,7 @@ Check your passwords anytime in @@ -54,7 +54,7 @@ Use system title bar and borders -@@ -10404,7 +10404,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -10501,7 +10501,7 @@ Please help our engineers fix this problem. Tell us wh Set as default @@ -63,7 +63,7 @@ Minimize -@@ -12500,7 +12500,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -12597,7 +12597,7 @@ Please help our engineers fix this problem. Tell us wh Open Anyway diff --git a/www/iridium/files/patch-chrome_app_settings__strings.grdp b/www/iridium/files/patch-chrome_app_settings__strings.grdp index 4003d891af74f..67bf42e66cc15 100644 --- a/www/iridium/files/patch-chrome_app_settings__strings.grdp +++ b/www/iridium/files/patch-chrome_app_settings__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/settings_strings.grdp.orig 2022-12-06 08:09:13 UTC +--- chrome/app/settings_strings.grdp.orig 2023-01-17 19:19:00 UTC +++ chrome/app/settings_strings.grdp -@@ -142,7 +142,7 @@ +@@ -151,7 +151,7 @@ Theme @@ -9,7 +9,7 @@ GTK -@@ -162,7 +162,7 @@ +@@ -171,7 +171,7 @@ Use Classic diff --git a/www/iridium/files/patch-chrome_browser_about__flags.cc b/www/iridium/files/patch-chrome_browser_about__flags.cc index 5f80058f2794a..71b6fb9ae4945 100644 --- a/www/iridium/files/patch-chrome_browser_about__flags.cc +++ b/www/iridium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/about_flags.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/about_flags.cc -@@ -215,7 +215,7 @@ +@@ -217,7 +217,7 @@ #include "ui/native_theme/native_theme_features.h" #include "ui/ui_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -291,7 +291,7 @@ +@@ -293,7 +293,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) -@@ -398,7 +398,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -401,7 +401,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, -@@ -1322,7 +1322,7 @@ const FeatureEntry::FeatureVariation +@@ -1394,7 +1394,7 @@ const FeatureEntry::FeatureVariation kTabGroupsSaveVar }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -36,16 +36,7 @@ const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, {"DocumentUseClientScore", "false"}, -@@ -4182,7 +4182,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(base::kOneGroupPerRenderer)}, - #endif // BUILDFLAG(IS_CHROMEOS) - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - { - "enable-accelerated-video-decode", - flag_descriptions::kAcceleratedVideoDecodeName, -@@ -4784,7 +4784,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4810,7 +4810,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -54,7 +45,7 @@ {"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName, flag_descriptions::kOzonePlatformHintDescription, kOsLinux, MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)}, -@@ -4803,7 +4803,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4823,7 +4823,7 @@ const FeatureEntry kFeatureEntries[] = { password_manager::features::kForceInitialSyncWhenDecryptionFails)}, #endif // BUILDFLAG(IS_LINUX) @@ -63,7 +54,7 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -5063,7 +5063,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5090,7 +5090,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 +63,7 @@ {"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName, flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop, FEATURE_VALUE_TYPE(feed::kWebUiFeed)}, -@@ -5633,7 +5633,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5699,7 +5699,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -81,7 +72,7 @@ {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -6213,7 +6213,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6335,7 +6335,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kPointerLockOptionsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kPointerLockOptions)}, @@ -90,7 +81,7 @@ {"enable-async-dns", flag_descriptions::kAsyncDnsName, flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, FEATURE_VALUE_TYPE(features::kAsyncDns)}, -@@ -7186,7 +7186,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7337,7 +7337,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -99,7 +90,7 @@ {"global-media-controls-modern-ui", flag_descriptions::kGlobalMediaControlsModernUIName, flag_descriptions::kGlobalMediaControlsModernUIDescription, -@@ -8059,7 +8059,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8174,7 +8174,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -108,7 +99,7 @@ {"quick-commands", flag_descriptions::kQuickCommandsName, flag_descriptions::kQuickCommandsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kQuickCommands)}, -@@ -8350,7 +8350,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8439,7 +8439,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -117,7 +108,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -8968,7 +8968,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9056,7 +9056,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc b/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc index f1d83589da289..87afe784d0823 100644 --- a/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc +++ b/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/background/background_mode_manager.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/background/background_mode_manager.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/background/background_mode_manager.cc -@@ -894,7 +894,7 @@ gfx::ImageSkia GetStatusTrayIcon() { +@@ -892,7 +892,7 @@ gfx::ImageSkia GetStatusTrayIcon() { return gfx::ImageSkia(); return family->CreateExact(size).AsImageSkia(); diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc index e0c45b03fd21b..3a0774dea704e 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -114,13 +114,13 @@ +@@ -113,13 +113,13 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -16,7 +16,7 @@ #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h" #endif -@@ -190,7 +190,7 @@ +@@ -191,7 +191,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" -@@ -807,7 +807,7 @@ void PopulateChromeFrameBinders( +@@ -809,7 +809,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( base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed)); -@@ -815,7 +815,7 @@ void PopulateChromeFrameBinders( +@@ -817,7 +817,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 -@@ -880,14 +880,14 @@ void PopulateChromeWebUIFrameBinders( +@@ -882,14 +882,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 -@@ -1271,7 +1271,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1289,7 +1289,7 @@ void PopulateChromeWebUIFrameBinders( #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc index 3f4c413df80ef..cb308e2a01c65 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -239,11 +239,11 @@ +@@ -240,11 +240,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -14,7 +14,7 @@ #include "components/crash/core/app/crashpad.h" #endif -@@ -278,7 +278,7 @@ +@@ -279,7 +279,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -23,7 +23,7 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h" #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" -@@ -1048,7 +1048,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -987,7 +987,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -32,7 +32,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -1096,7 +1096,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1035,7 +1035,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/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc index 2c670f35fa065..868a5d13b5166 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -393,7 +393,7 @@ +@@ -395,7 +395,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" -@@ -478,12 +478,12 @@ +@@ -480,12 +480,12 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -24,7 +24,7 @@ #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -492,13 +492,13 @@ +@@ -494,13 +494,13 @@ #include "components/crash/content/browser/crash_handler_host_linux.h" #endif @@ -40,7 +40,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -527,11 +527,11 @@ +@@ -529,11 +529,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -52,9 +52,9 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" - #elif defined(USE_OZONE) + #elif BUILDFLAG(IS_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -1537,7 +1537,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1623,7 +1623,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique( is_integration_test, &startup_data_); @@ -63,7 +63,7 @@ main_parts = std::make_unique( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1576,7 +1576,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1662,7 +1662,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo std::make_unique()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -72,16 +72,16 @@ main_parts->AddParts( std::make_unique()); #else -@@ -1597,7 +1597,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1683,7 +1683,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique()); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) main_parts->AddParts(std::make_unique()); - #elif defined(USE_OZONE) + #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique()); -@@ -1616,7 +1616,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1702,7 +1702,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -90,7 +90,7 @@ main_parts->AddParts( std::make_unique< chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2395,6 +2395,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2507,6 +2507,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin #elif BUILDFLAG(IS_POSIX) #if BUILDFLAG(IS_ANDROID) bool enable_crash_reporter = true; @@ -99,7 +99,7 @@ #elif BUILDFLAG(IS_CHROMEOS) bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { -@@ -2759,7 +2761,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2902,7 +2904,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); @@ -108,7 +108,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4206,7 +4208,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4352,7 +4354,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -117,7 +117,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4655,14 +4657,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4872,14 +4874,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -134,7 +134,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -4697,7 +4699,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4914,7 +4916,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati handle)); } diff --git a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h index 78351f057d5ca..997b4f9709539 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -439,7 +439,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -442,7 +442,7 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; diff --git a/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index 8423840d4d182..572754e79a626 100644 --- a/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1551,7 +1551,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1567,7 +1567,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); } -@@ -1667,7 +1667,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1683,7 +1683,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow content::CheckDownloadAllowedCallback check_download_allowed_cb) { DCHECK_CURRENTLY_ON(BrowserThread::UI); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +18,7 @@ // Don't download pdf if it is a file URL, as that might cause an infinite // download loop if Chrome is not the system pdf viewer. if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) { -@@ -1713,7 +1713,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl +@@ -1729,7 +1729,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl DCHECK(download_item->IsSavePackageDownload()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc b/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc index d65eb7f2d2f94..b7e8c9e921097 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_file_picker.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/download/download_file_picker.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/download/download_file_picker.cc -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ #include "content/public/browser/download_manager.h" #include "content/public/browser/web_contents.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "ui/aura/window.h" -@@ -85,7 +85,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl +@@ -86,7 +86,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/iridium/files/patch-chrome_browser_download_download__item__model.cc b/www/iridium/files/patch-chrome_browser_download_download__item__model.cc index 9bda6c9839429..2c18ac2be2a03 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_item_model.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/download/download_item_model.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/download/download_item_model.cc -@@ -756,7 +756,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -787,7 +787,7 @@ bool DownloadItemModel::IsCommandChecked( download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); -@@ -799,7 +799,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -830,7 +830,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand base::UmaHistogramBoolean("Download.SetAlwaysOpenTo", !is_checked); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +18,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); -@@ -1217,7 +1217,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1232,7 +1232,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe return; } diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc index 50bca0d5d638c..8f526b73c4654 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc @@ -1,17 +1,17 @@ ---- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc -@@ -18,7 +18,7 @@ - #include "chrome/browser/profiles/profile.h" - #include "components/policy/core/common/management/management_service.h" +@@ -22,7 +22,7 @@ + #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/win/win_signals_decorator.h" + #endif // BUILDFLAG(IS_WIN) -#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/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" -@@ -54,7 +54,7 @@ std::unique_ptr CreateSignalsService(P - enterprise_signals::ContextInfoFetcher::CreateInstance( - profile, ConnectorsServiceFactory::GetForBrowserContext(profile)))); +@@ -62,7 +62,7 @@ std::unique_ptr CreateSignalsService(P + decorators.push_back(std::make_unique()); + #endif // BUILDFLAG(IS_WIN) -#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/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h index 04f8c0f2b3500..226deaa6955eb 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h" @@ -18,9 +18,9 @@ void OnCloudReportingLaunched( enterprise_reporting::ReportScheduler* report_scheduler) override; void UploadToReportingServer( -@@ -41,7 +41,7 @@ class BrowserCrashEventRouter - nullptr; - raw_ptr controller_ = nullptr; +@@ -42,7 +42,7 @@ class BrowserCrashEventRouter + raw_ptr + controller_ = nullptr; -#if !BUILDFLAG(IS_FUCHSIA) +#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-chrome_browser_enterprise_identifiers_profile__id__delegate__impl.cc b/www/iridium/files/patch-chrome_browser_enterprise_identifiers_profile__id__delegate__impl.cc new file mode 100644 index 0000000000000..25eeed851e205 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_enterprise_identifiers_profile__id__delegate__impl.cc @@ -0,0 +1,20 @@ +--- chrome/browser/enterprise/identifiers/profile_id_delegate_impl.cc.orig 2023-01-17 19:19:00 UTC ++++ chrome/browser/enterprise/identifiers/profile_id_delegate_impl.cc +@@ -12,7 +12,7 @@ + #include "components/enterprise/browser/identifiers/identifiers_prefs.h" + #include "components/prefs/pref_service.h" + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + #include "components/enterprise/browser/controller/browser_dm_token_storage.h" + #if BUILDFLAG(IS_WIN) + #include "base/strings/utf_string_conversions.h" +@@ -36,7 +36,7 @@ void CreateProfileGUID(PrefService* prefs) { + } + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + // Gets the device ID from the BrowserDMTokenStorage. + std::string GetId() { + std::string device_id = diff --git a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn index aa7d0baecc4dc..0befda092a232 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1328,6 +1328,10 @@ static_library("extensions") { +@@ -1332,6 +1332,10 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc index 7237b36ac0957..8a86503c6f802 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc -@@ -32,7 +32,7 @@ +@@ -31,7 +31,7 @@ #include "components/reporting/util/statusor.h" #endif @@ -27,7 +27,7 @@ EnterpriseReportingPrivateGetPersistentSecretFunction:: EnterpriseReportingPrivateGetPersistentSecretFunction() = default; -@@ -634,7 +634,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: +@@ -636,7 +636,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: } #endif diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/www/iridium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc index 9af4046f061a2..c18b7bae5b497 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc +++ b/www/iridium/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-12-06 08:09:13 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -508,7 +508,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall( +@@ -533,7 +533,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall( } void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() { diff --git a/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc index f34367be8b169..d888e00270e9a 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -828,7 +828,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -826,7 +826,7 @@ void ExternalProviderImpl::CreateExternalProviders( if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ provider_list->push_back(std::make_unique( service, base::MakeRefCounted( -@@ -856,7 +856,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -854,7 +854,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. diff --git a/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc index 1357d4947b84d..f4a17074f8695 100644 --- a/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc +++ b/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -256,7 +256,7 @@ const struct { +@@ -252,7 +252,7 @@ const struct { {base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"), kDontBlockChildren}, #endif diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc index 977e3a4da3ac8..c9e4b0ea477b8 100644 --- a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/flag_descriptions.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/flag_descriptions.cc -@@ -6600,7 +6600,7 @@ const char kSearchWebInSidePanelDescription[] = +@@ -6417,7 +6417,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."; -@@ -6609,7 +6609,7 @@ const char kQuickCommandsDescription[] = +@@ -6426,7 +6426,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."; -@@ -6623,7 +6623,7 @@ const char kWebShareDescription[] = +@@ -6440,7 +6440,7 @@ const char kWebShareDescription[] = "platforms."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -27,16 +27,16 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -6643,7 +6643,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -6460,7 +6460,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const char kCleanUndecryptablePasswordsLinuxName[] = - "Cleanup local undecryptable passwords during initial sync flow"; - const char kCleanUndecryptablePasswordsLinuxDescription[] = -@@ -6656,7 +6656,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail + const char kForcePasswordInitialSyncWhenDecryptionFailsName[] = + "Force initial sync to clean local undecryptable passwords during startup"; + const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[] = +@@ -6468,7 +6468,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail "storage and requests initial sync."; #endif // BUILDFLAG(IS_LINUX) @@ -45,7 +45,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -6665,7 +6665,7 @@ const char kSkipUndecryptablePasswordsDescription[] = +@@ -6477,7 +6477,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) -@@ -6770,7 +6770,7 @@ const char kElasticOverscrollDescription[] = +@@ -6577,7 +6577,7 @@ const char kElasticOverscrollDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.h b/www/iridium/files/patch-chrome_browser_flag__descriptions.h index 926c45007a1ae..66170653f1d3f 100644 --- a/www/iridium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.h @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.h.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/flag_descriptions.h.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/flag_descriptions.h -@@ -3779,7 +3779,7 @@ extern const char kSearchWebInSidePanelDescription[]; +@@ -3693,7 +3693,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[]; -@@ -3796,7 +3796,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -3710,7 +3710,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[]; -@@ -3812,18 +3812,18 @@ extern const char kForcePasswordInitialSyncWhenDecrypt +@@ -3723,18 +3723,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) || -@@ -3900,7 +3900,7 @@ extern const char kElasticOverscrollDescription[]; +@@ -3809,7 +3809,7 @@ extern const char kElasticOverscrollDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ diff --git a/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc b/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc index 57ba54fe29dec..3cdf8238d7b25 100644 --- a/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc +++ b/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc @@ -1,29 +1,25 @@ ---- chrome/browser/headless/headless_mode_util.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/headless/headless_mode_util.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/headless/headless_mode_util.cc -@@ -9,7 +9,7 @@ - // Native headless is currently available on Linux, Windows and Mac platforms. - // More platforms will be added later, so avoid function level clutter by - // providing stub implementations at the end of the file. +@@ -10,11 +10,11 @@ + // New headless mode is available on Linux, Windows and Mac platforms. + // More platforms will be added later, so avoid function level clutter + // by providing stub implementations at the end of the file. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #include - #include -@@ -17,7 +17,7 @@ #include "base/base_switches.h" - #include "ui/gfx/switches.h" -#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) -@@ -52,7 +52,7 @@ void SetUpCommandLine(const base::CommandLine* command +@@ -64,7 +64,7 @@ void SetUpCommandLine(const base::CommandLine* command base::CommandLine::ForCurrentProcess()->AppendSwitch( ::switches::kNoErrorDialogs); } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Native headless chrome on Linux relies on ozone/headless platform. + // Headless mode on Linux relies on ozone/headless platform. base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( ::switches::kOzonePlatform, switches::kHeadless); diff --git a/www/iridium/files/patch-chrome_browser_media_audio__service__util.cc b/www/iridium/files/patch-chrome_browser_media_audio__service__util.cc index dbd5900ac03f8..ebb76a3598ac1 100644 --- a/www/iridium/files/patch-chrome_browser_media_audio__service__util.cc +++ b/www/iridium/files/patch-chrome_browser_media_audio__service__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/audio_service_util.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/media/audio_service_util.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/media/audio_service_util.cc @@ -21,7 +21,7 @@ @@ -7,9 +7,9 @@ -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) - bool GetPolicyOrFeature(const char* policy_name, const base::Feature& feature) { + const base::Value* GetPolicy(const char* policy_name) { const policy::PolicyMap& policies = -@@ -40,7 +40,7 @@ bool GetPolicyOrFeature(const char* policy_name, const +@@ -43,7 +43,7 @@ bool GetPolicyOrFeature(const char* policy_name, const bool IsAudioServiceSandboxEnabled() { // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. diff --git a/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc index 3a312a433e6b3..a5617c82b3d4b 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,4 +1,4 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc @@ -176,7 +176,7 @@ #include "chrome/notification_helper/notification_helper_constants.h" @@ -9,7 +9,7 @@ #include "components/metrics/motherboard_metrics_provider.h" #endif -@@ -731,7 +731,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -735,7 +735,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic metrics_service_->RegisterMetricsProvider( std::make_unique()); @@ -18,7 +18,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique()); #endif -@@ -810,7 +810,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -814,7 +814,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()); -@@ -908,7 +908,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -912,7 +912,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique()); #endif @@ -36,7 +36,7 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1093,7 +1093,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1097,7 +1097,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/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc index 9419554229b55..2d258e601a14b 100644 --- a/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -91,7 +91,7 @@ +@@ -92,7 +92,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ #include "chrome/common/chrome_paths_internal.h" #include "chrome/grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" -@@ -173,7 +173,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -174,7 +174,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -18,7 +18,7 @@ auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -451,7 +451,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -452,7 +452,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -27,7 +27,7 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -523,7 +523,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -524,7 +524,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index c21fae2333086..b1084630e082d 100644 --- a/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,6 +1,105 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -1747,7 +1747,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -193,12 +193,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 + +@@ -727,14 +727,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + prefs::kManagedDefaultGeolocationSetting, + base::Value::Type::INTEGER }, + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ +- || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC) ++ || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + { key::kRequireOnlineRevocationChecksForLocalAnchors, + prefs::kCertRevocationCheckingRequiredLocalAnchors, + base::Value::Type::BOOLEAN }, + #endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) + // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC) + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ +- || BUILDFLAG(IS_FUCHSIA) ++ || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + { key::kFullscreenAllowed, + prefs::kFullscreenAllowed, + base::Value::Type::BOOLEAN }, +@@ -1358,7 +1358,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::BOOLEAN }, + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + { key::kGSSAPILibraryName, + prefs::kGSSAPILibraryName, + base::Value::Type::STRING }, +@@ -1428,18 +1428,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 }, +@@ -1452,7 +1452,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 }, +@@ -1562,7 +1562,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::BOOLEAN }, + #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + { key::kAlternativeBrowserPath, + browser_switcher::prefs::kAlternativeBrowserPath, + base::Value::Type::STRING }, +@@ -1649,7 +1649,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 }, +@@ -1696,7 +1696,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 }, +@@ -1756,7 +1756,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { key::kPrefixedStorageInfoEnabled, storage::kPrefixedStorageInfoEnabled, base::Value::Type::BOOLEAN }, @@ -9,3 +108,48 @@ { key::kHighEfficiencyModeEnabled, performance_manager::user_tuning::prefs::kHighEfficiencyModeEnabled, base::Value::Type::BOOLEAN }, +@@ -2062,7 +2062,7 @@ std::unique_ptr 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()); + handlers->AddHandler(std::make_unique()); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +@@ -2097,7 +2097,7 @@ std::unique_ptr BuildH + std::vector> + signin_legacy_policies; + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + signin_legacy_policies.push_back(std::make_unique( + key::kForceBrowserSignin, prefs::kForceBrowserSignin, + base::Value::Type::BOOLEAN)); +@@ -2435,7 +2435,7 @@ std::unique_ptr 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(chrome_schema)); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +@@ -2448,7 +2448,7 @@ std::unique_ptr 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()); + handlers->AddHandler( + std::make_unique( +@@ -2456,7 +2456,7 @@ std::unique_ptr 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( + key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, + base::Value::Type::BOOLEAN)); diff --git a/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc index 460668393c354..edf2dad2e0bf1 100644 --- a/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -446,14 +446,14 @@ +@@ -449,14 +449,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 -@@ -481,7 +481,7 @@ +@@ -489,7 +489,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -26,7 +26,7 @@ #include "ui/color/system_theme.h" #endif -@@ -978,7 +978,7 @@ void RegisterProfilePrefsForMigration( +@@ -1008,7 +1008,7 @@ void RegisterProfilePrefsForMigration( registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0); #endif @@ -35,7 +35,7 @@ // Deprecated 08/2022. registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false); #endif -@@ -1212,7 +1212,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1259,7 +1259,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) -@@ -1537,11 +1537,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1586,11 +1586,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry); #endif @@ -58,7 +58,7 @@ browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif -@@ -1938,7 +1938,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { +@@ -1974,7 +1974,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { profile_prefs->ClearPref(kProfileAvatarTutorialShown); #endif diff --git a/www/iridium/files/patch-chrome_browser_printing_print__backend__service__manager.cc b/www/iridium/files/patch-chrome_browser_printing_print__backend__service__manager.cc index e70f88886f80a..8a6adda92e2a6 100644 --- a/www/iridium/files/patch-chrome_browser_printing_print__backend__service__manager.cc +++ b/www/iridium/files/patch-chrome_browser_printing_print__backend__service__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/printing/print_backend_service_manager.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/printing/print_backend_service_manager.cc -@@ -481,7 +481,7 @@ absl::optional PrintBackendServiceManager::R +@@ -493,7 +493,7 @@ absl::optional PrintBackendServiceManager::R query_clients_.insert(client_id); break; case ClientType::kQueryWithUi: @@ -9,7 +9,7 @@ if (!query_with_ui_clients_.empty()) return absl::nullopt; #endif -@@ -706,7 +706,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate +@@ -729,7 +729,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate break; case ClientType::kQueryWithUi: @@ -18,7 +18,7 @@ // No need to update if there were other query with UI clients. if (query_with_ui_clients_.size() > 1) return absl::nullopt; -@@ -763,7 +763,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate +@@ -786,7 +786,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate return kNoClientsRegisteredResetOnIdleTimeout; case ClientType::kQueryWithUi: diff --git a/www/iridium/files/patch-chrome_browser_printing_print__job__worker.cc b/www/iridium/files/patch-chrome_browser_printing_print__job__worker.cc index d7c98e82f6693..7764730069618 100644 --- a/www/iridium/files/patch-chrome_browser_printing_print__job__worker.cc +++ b/www/iridium/files/patch-chrome_browser_printing_print__job__worker.cc @@ -1,6 +1,6 @@ ---- chrome/browser/printing/print_job_worker.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/printing/print_job_worker.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/printing/print_job_worker.cc -@@ -195,7 +195,7 @@ void PrintJobWorker::SetSettings(base::Value::Dict new +@@ -206,7 +206,7 @@ void PrintJobWorker::SetSettings(base::Value::Dict new crash_key = std::make_unique( print_backend->GetPrinterDriverInfo(printer_name)); diff --git a/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index 636645208e9ce..c6ef7a57c8b21 100644 --- a/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/iridium/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-12-06 08:09:13 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -258,7 +258,7 @@ +@@ -261,7 +261,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 -@@ -439,11 +439,11 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -448,11 +448,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/iridium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc index 8a3286b078a45..6d9511dff3a8a 100644 --- a/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc +++ b/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/profiles/profile_impl.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/profiles/profile_impl.cc @@ -258,6 +258,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" @@ -11,7 +11,7 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -839,7 +843,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -846,7 +850,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts index 10f7fdc7604b5..fd76348811bac 100644 --- a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts +++ b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts @@ -1,4 +1,4 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts @@ -16,7 +16,7 @@ export interface AppearanceBrowserProxy { @@ -9,7 +9,7 @@ useGtkTheme(): void; useQtTheme(): void; // -@@ -45,7 +45,7 @@ export class AppearanceBrowserProxyImpl implements App +@@ -41,7 +41,7 @@ export class AppearanceBrowserProxyImpl implements App chrome.send('useDefaultTheme'); } diff --git a/www/iridium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html b/www/iridium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html index 3e5aa2db0b8e4..9a2156c07de2e 100644 --- a/www/iridium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html +++ b/www/iridium/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-12-06 08:09:13 UTC +--- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html -@@ -336,7 +336,7 @@ +@@ -395,7 +395,7 @@ consent-confirmation autofocus> $i18n{syncConfirmationConfirmLabel} @@ -9,7 +9,7 @@ $i18n{syncConfirmationSettingsLabel} -@@ -346,7 +346,7 @@ +@@ -405,7 +405,7 @@ disabled="[[anyButtonClicked_]]"> $i18n{syncConfirmationUndoLabel} @@ -18,7 +18,7 @@ $i18n{syncConfirmationSettingsLabel} -@@ -389,7 +389,7 @@ +@@ -448,7 +448,7 @@ consent-confirmation> $i18n{syncConfirmationConfirmLabel} @@ -27,7 +27,7 @@ $i18n{syncConfirmationSettingsLabel} -@@ -399,7 +399,7 @@ +@@ -458,7 +458,7 @@ disabled="[[anyButtonClicked_]]"> $i18n{syncConfirmationUndoLabel} diff --git a/www/iridium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc b/www/iridium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc index a2259c77d5e4f..ef4f5e42a218e 100644 --- a/www/iridium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc +++ b/www/iridium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc @@ -18,7 +18,7 @@ #include "net/base/url_util.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" #endif -@@ -321,7 +321,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil +@@ -364,7 +364,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil Profile* profile, const enterprise_connectors::AnalysisSettings& settings) { // Local content analysis is supported only on desktop platforms. diff --git a/www/iridium/files/patch-chrome_browser_shutdown__signal__handlers__posix.cc b/www/iridium/files/patch-chrome_browser_shutdown__signal__handlers__posix.cc deleted file mode 100644 index cb85f7a323913..0000000000000 --- a/www/iridium/files/patch-chrome_browser_shutdown__signal__handlers__posix.cc +++ /dev/null @@ -1,21 +0,0 @@ ---- chrome/browser/shutdown_signal_handlers_posix.cc.orig 2022-03-28 18:11:04 UTC -+++ chrome/browser/shutdown_signal_handlers_posix.cc -@@ -187,12 +187,18 @@ void InstallShutdownSignalHandlers( - g_pipe_pid = getpid(); - g_shutdown_pipe_read_fd = pipefd[0]; - g_shutdown_pipe_write_fd = pipefd[1]; -+#if defined(OS_BSD) -+ // PTHREAD_STACK_MIN causes chromium to crash under *BSD, -+ // we request the default pthread stack size by specifying 0 here. -+ const size_t kShutdownDetectorThreadStackSize = 0; -+#else - #if !defined(ADDRESS_SANITIZER) - const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2; - #else - // ASan instrumentation bloats the stack frames, so we need to increase the - // stack size to avoid hitting the guard page. - const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4; -+#endif - #endif - ShutdownDetector* detector = new ShutdownDetector( - g_shutdown_pipe_read_fd, std::move(shutdown_callback), task_runner); diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc index 26482d7054d71..057ac59579081 100644 --- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc +++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/task_manager/sampling/task_group.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/task_manager/sampling/task_group.cc -@@ -37,7 +37,7 @@ const int kBackgroundRefreshTypesMask = +@@ -38,7 +38,7 @@ const int kBackgroundRefreshTypesMask = #if BUILDFLAG(IS_WIN) REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ REFRESH_TYPE_FD_COUNT | #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) #if BUILDFLAG(ENABLE_NACL) -@@ -122,7 +122,7 @@ TaskGroup::TaskGroup( +@@ -123,7 +123,7 @@ TaskGroup::TaskGroup( #if BUILDFLAG(ENABLE_NACL) nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown), #endif // BUILDFLAG(ENABLE_NACL) @@ -18,7 +18,7 @@ open_fd_count_(-1), #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) idle_wakeups_per_second_(-1), -@@ -141,7 +141,7 @@ TaskGroup::TaskGroup( +@@ -142,7 +142,7 @@ TaskGroup::TaskGroup( weak_ptr_factory_.GetWeakPtr()), base::BindRepeating(&TaskGroup::OnIdleWakeupsRefreshDone, weak_ptr_factory_.GetWeakPtr()), @@ -27,7 +27,7 @@ base::BindRepeating(&TaskGroup::OnOpenFdCountRefreshDone, weak_ptr_factory_.GetWeakPtr()), #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -321,7 +321,7 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac +@@ -322,7 +322,7 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac } #endif // BUILDFLAG(ENABLE_NACL) diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__view__prefs.cc b/www/iridium/files/patch-chrome_browser_ui_browser__view__prefs.cc index b3eb2329128f6..d51ef839434a8 100644 --- a/www/iridium/files/patch-chrome_browser_ui_browser__view__prefs.cc +++ b/www/iridium/files/patch-chrome_browser_ui_browser__view__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/browser_view_prefs.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/browser_view_prefs.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/ui/browser_view_prefs.cc @@ -17,7 +17,7 @@ namespace { @@ -7,8 +7,8 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) bool GetCustomFramePrefDefault() { - #if defined(USE_OZONE) - return ui::OzonePlatform::GetInstance() + #if BUILDFLAG(IS_OZONE) + return ui::OzonePlatform::GetInstance() @@ -35,7 +35,7 @@ void RegisterBrowserViewProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch diff --git a/www/iridium/files/patch-chrome_browser_ui_sad__tab.cc b/www/iridium/files/patch-chrome_browser_ui_sad__tab.cc index b8bff13204d74..ec646ce9fa898 100644 --- a/www/iridium/files/patch-chrome_browser_ui_sad__tab.cc +++ b/www/iridium/files/patch-chrome_browser_ui_sad__tab.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/sad_tab.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/sad_tab.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/ui/sad_tab.cc -@@ -175,7 +175,7 @@ std::vector SadTab::GetSubMessages() { +@@ -176,7 +176,7 @@ std::vector SadTab::GetSubMessages() { // Only show Incognito suggestion if not already in Incognito mode. if (!web_contents_->GetBrowserContext()->IsOffTheRecord()) message_ids.insert(message_ids.begin(), IDS_SAD_TAB_RELOAD_INCOGNITO); diff --git a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index bb37ded0c1bef..e3986d4c3b3f3 100644 --- a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -129,7 +129,7 @@ +@@ -132,7 +132,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 -@@ -1007,7 +1007,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1011,7 +1011,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) && -@@ -1197,7 +1197,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1203,7 +1203,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/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc index b816e9138ee17..38cc412c92cb7 100644 --- a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc +++ b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/ui/startup/startup_browser_creator_impl.cc @@ -257,7 +257,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( // at the state of the MessageLoop. @@ -6,6 +6,6 @@ params.creation_source = Browser::CreationSource::kStartupCreator; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - params.startup_id = command_line_.GetSwitchValueASCII("desktop-startup-id"); + params.startup_id = + command_line_->GetSwitchValueASCII("desktop-startup-id"); #endif - browser = Browser::Create(params); diff --git a/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc index 643f67b9d0b25..4aae2320cc21f 100644 --- a/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -207,7 +207,7 @@ +@@ -206,7 +206,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" -@@ -551,13 +551,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -547,13 +547,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) || -@@ -580,7 +580,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -576,7 +576,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc index 32fc2384a2d0c..5d0093be1f60a 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/ui/views/accelerator_table.cc @@ -61,11 +61,11 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, @@ -27,12 +27,12 @@ IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK}, {ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD}, {ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME}, -@@ -236,7 +236,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -237,7 +237,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, IDC_TOGGLE_QUICK_COMMANDS}, #endif // !BUILDFLAG(IS_CHROMEOS) #endif // !BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-chrome_browser_ui_views_download_download__item__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_download_download__item__view.cc deleted file mode 100644 index 3331f3f6728a5..0000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_views_download_download__item__view.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/ui/views/download/download_item_view.cc.orig 2022-12-06 08:09:13 UTC -+++ chrome/browser/ui/views/download/download_item_view.cc -@@ -190,7 +190,7 @@ bool UseNewWarnings() { - } - - int GetFilenameStyle(const views::Label& label) { --#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) - if (UseNewWarnings()) - return views::style::STYLE_EMPHASIZED; - #endif -@@ -198,7 +198,7 @@ int GetFilenameStyle(const views::Label& label) { - } - - int GetFilenameStyle(const views::StyledLabel& label) { --#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) - if (UseNewWarnings()) - return views::style::STYLE_EMPHASIZED; - #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc index 6c6ad04977d7f..c5f1e6aecb38b 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc -@@ -157,7 +157,7 @@ EyeDropperView::EyeDropperView(content::RenderFrameHos +@@ -159,7 +159,7 @@ EyeDropperView::EyeDropperView(content::RenderFrameHos // EyeDropper/WidgetDelegate. set_owned_by_client(); SetPreferredSize(GetSize()); diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc index 55b7c63e1116b..f0c079daa2dbd 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc @@ -46,7 +46,7 @@ #include "components/user_manager/user_manager.h" @@ -18,7 +18,7 @@ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -269,7 +269,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -270,7 +270,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace()); chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(), IsVisibleOnAllWorkspaces()); @@ -27,7 +27,7 @@ // If the window was sent to a different workspace, prioritize it if // it was sent to the current workspace and deprioritize it // otherwise. This is done by MoveBrowsersInWorkspaceToFront() -@@ -392,7 +392,7 @@ void BrowserFrame::SelectNativeTheme() { +@@ -393,7 +393,7 @@ void BrowserFrame::SelectNativeTheme() { return; } @@ -36,7 +36,7 @@ const auto* linux_ui_theme = ui::LinuxUiTheme::GetForWindow(GetNativeWindow()); // Ignore the system theme for web apps with window-controls-overlay as the -@@ -409,7 +409,7 @@ void BrowserFrame::SelectNativeTheme() { +@@ -410,7 +410,7 @@ void BrowserFrame::SelectNativeTheme() { bool BrowserFrame::RegenerateFrameOnThemeChange( BrowserThemeChangeType theme_change_type) { bool need_regenerate = false; diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.h b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.h index 3637038abd330..71ae5b99ffa8d 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.h +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_frame.h.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/ui/views/frame/browser_frame.h @@ -12,7 +12,7 @@ #include "ui/views/context_menu_controller.h" @@ -18,7 +18,7 @@ // Returns which edges of the frame are tiled. const ui::WindowTiledEdges& tiled_edges() const { return tiled_edges_; } void set_tiled_edges(ui::WindowTiledEdges tiled_edges) { -@@ -206,7 +206,7 @@ class BrowserFrame : public views::Widget, public view +@@ -210,7 +210,7 @@ class BrowserFrame : public views::Widget, public view // contents for smoother dragging. TabDragKind tab_drag_kind_ = TabDragKind::kNone; diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc index 9eff14034086e..d4342ca80280d 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc @@ -16,7 +16,7 @@ #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" @@ -25,5 +25,5 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (browser_view->browser()->is_type_picture_in_picture()) { - return std::make_unique(frame, - browser_view); + auto view = + std::make_unique(frame, browser_view); diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index d98f701c44067..111df78295429 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2069,7 +2069,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2103,7 +2103,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/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h index 38005251967aa..be5ca891b2629 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h -@@ -114,7 +114,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient +@@ -113,7 +113,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient const gfx::Rect& bounding_rect) const override; bool IsTranslucentWindowOpacitySupported() const override; bool ShouldDrawRestoredFrameShadow() const override; @@ -9,7 +9,7 @@ ui::WindowTiledEdges GetTiledEdges() const override; #endif -@@ -230,7 +230,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient +@@ -229,7 +229,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient // Background painter for the window frame. std::unique_ptr frame_background_; diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc new file mode 100644 index 0000000000000..6a4fbd43016a3 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc @@ -0,0 +1,56 @@ +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-01-17 19:19:00 UTC ++++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc +@@ -32,7 +32,7 @@ + #include "ui/aura/window.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h" + #endif + +@@ -256,7 +256,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( + for (ContentSettingImageView* view : content_setting_views_) + view->SetIconColor(color_provider->GetColor(kColorOmniboxResultsIcon)); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // If the top bar background is already drawn by window_frame_provider_, skip + // drawing it again below. + if (window_frame_provider_) { +@@ -292,7 +292,7 @@ void PictureInPictureBrowserFrameView::AddedToWidget() + BrowserNonClientFrameView::AddedToWidget(); + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets() + const { + auto border = FrameBorderInsets(); +@@ -494,7 +494,7 @@ void PictureInPictureBrowserFrameView::OnMouseEvent(ui + /////////////////////////////////////////////////////////////////////////////// + // views::View implementations: + void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (window_frame_provider_) { + // Draw the PiP window frame borders and shadows, including the top bar + // background. +@@ -562,7 +562,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie + } + + gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (window_frame_provider_) { + const auto insets = window_frame_provider_->GetFrameThicknessDip(); + const auto tiled_edges = frame()->tiled_edges(); +@@ -582,7 +582,7 @@ int PictureInPictureBrowserFrameView::GetTopAreaHeight + return FrameBorderInsets().top() + kTopControlsHeight; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void PictureInPictureBrowserFrameView::SetWindowFrameProvider( + ui::WindowFrameProvider* window_frame_provider) { + window_frame_provider_ = window_frame_provider; diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h new file mode 100644 index 0000000000000..00c945b6d52eb --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h @@ -0,0 +1,38 @@ +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-01-17 19:19:00 UTC ++++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h +@@ -20,7 +20,7 @@ + #include "ui/views/layout/box_layout_view.h" + #include "ui/views/widget/widget_observer.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/window_frame_provider.h" + #endif + +@@ -67,7 +67,7 @@ class PictureInPictureBrowserFrameView + void OnThemeChanged() override; + void Layout() override; + void AddedToWidget() override; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + gfx::Insets MirroredFrameBorderInsets() const override; + gfx::Insets GetInputInsets() const override; + SkRRect GetRestoredClipRegion() const override; +@@ -145,7 +145,7 @@ class PictureInPictureBrowserFrameView + // Returns the height of the top bar area, including the window top border. + int GetTopAreaHeight() const; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Sets the window frame provider so that it will be used for drawing. + void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider); + +@@ -177,7 +177,7 @@ class PictureInPictureBrowserFrameView + widget_observation_{this}; + bool mouse_inside_window_ = false; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Used to draw window frame borders and shadow on Linux when GTK theme is + // enabled. + raw_ptr window_frame_provider_ = nullptr; diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc index 398b3f88b9a03..c696e8c33b4ef 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc @@ -76,7 +76,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser ui::SimpleMenuModel* model) { @@ -17,7 +17,7 @@ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) model->AddSeparator(ui::NORMAL_SEPARATOR); bool supports_server_side_decorations = true; - #if defined(USE_OZONE) && !BUILDFLAG(IS_CHROMEOS) + #if BUILDFLAG(IS_OZONE) && !BUILDFLAG(IS_CHROMEOS) @@ -144,7 +144,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc b/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc index 3e4a252979e01..7a2d1cfcf72dd 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -570,7 +570,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -571,7 +571,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index 3c9c2b78002cd..4d851b7410b37 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc @@ -1,6 +1,24 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -487,7 +487,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -82,7 +82,7 @@ + #include "components/remote_cocoa/browser/window.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/aura/client/drag_drop_client.h" + #endif + +@@ -254,7 +254,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { + + void UpdateSystemDnDDragImage(TabDragContext* attached_context, + const gfx::ImageSkia& image) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + aura::Window* root_window = + attached_context->GetWidget()->GetNativeWindow()->GetRootWindow(); + if (aura::client::GetDragDropClient(root_window)) { +@@ -506,7 +506,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 +27,7 @@ can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); -@@ -1049,7 +1049,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -1106,7 +1106,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +36,7 @@ // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -1987,7 +1987,7 @@ void TabDragController::CompleteDrag() { +@@ -2097,7 +2097,7 @@ void TabDragController::CompleteDrag() { } // If source window was maximized - maximize the new window as well. @@ -27,7 +45,7 @@ // Keeping maximized state breaks snap to Grid on Windows when dragging // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in -@@ -2378,7 +2378,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2488,7 +2488,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/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc index 72a566dc9ef7b..0b4acf1e5cf3c 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/ui/webui/about_ui.cc -@@ -621,7 +621,7 @@ std::string ChromeURLs() { +@@ -620,7 +620,7 @@ std::string ChromeURLs() { return html; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, -@@ -679,7 +679,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -678,7 +678,7 @@ void AboutUIHTMLSource::StartDataRequest( response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr); } diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index 69a65bbbaaf61..7bb370cd1eddc 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/iridium/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-12-06 08:09:13 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -317,7 +317,7 @@ +@@ -319,7 +319,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 -@@ -343,17 +343,17 @@ +@@ -345,17 +345,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 -@@ -710,7 +710,7 @@ bool IsAboutUI(const GURL& url) { +@@ -716,7 +716,7 @@ bool IsAboutUI(const GURL& url) { #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -39,16 +39,16 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1147,7 +1147,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we - #endif // !defined(USE_REAL_DBUS_CLIENTS) - #endif // !defined(OFFICIAL_BUILD) +@@ -1024,7 +1024,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we + return &NewWebUI; + } #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI; #endif -@@ -1208,7 +1208,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1085,7 +1085,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI; #endif @@ -57,7 +57,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -1268,27 +1268,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1145,27 +1145,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc b/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc index 1239c0da508a6..a63b2a90eb2e5 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc @@ -6,7 +6,7 @@ @@ -18,7 +18,7 @@ connectors_internals::mojom::KeyTrustLevel ParseTrustLevel( BPKUR::KeyTrustLevel trust_level) { -@@ -63,7 +63,7 @@ std::string HashAndEncodeString(const std::string& spk +@@ -70,7 +70,7 @@ connectors_internals::mojom::Int32ValuePtr ToMojomValu } // namespace connectors_internals::mojom::KeyInfoPtr GetKeyInfo() { diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc index 6303f2e52a11f..ca3a23719f4e4 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc -@@ -325,7 +325,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI +@@ -326,7 +326,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI bool is_deprecated_app = false; auto* context = extension_service_->GetBrowserContext(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ is_deprecated_app = extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id()); #endif -@@ -1427,7 +1427,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: +@@ -1444,7 +1444,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: options.os_hooks[web_app::OsHookType::kUninstallationViaOsSettings] = web_app->CanUserUninstallWebApp(); diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index b436d9f939202..67afe3ef44ae4 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc +++ b/www/iridium/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-12-06 08:09:13 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -120,7 +120,7 @@ +@@ -122,7 +122,7 @@ #include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h" #endif @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -141,7 +141,7 @@ +@@ -143,7 +143,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 -@@ -227,7 +227,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s +@@ -229,7 +229,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; -@@ -373,7 +373,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -382,7 +382,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}, -@@ -383,7 +383,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -392,7 +392,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) -@@ -407,7 +407,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -416,7 +416,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/iridium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc b/www/iridium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc index 4edc830a2bbfe..e93180eb7ff21 100644 --- a/www/iridium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc +++ b/www/iridium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/window_sizer/window_sizer.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/window_sizer/window_sizer.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/ui/window_sizer/window_sizer.cc -@@ -173,7 +173,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( +@@ -205,7 +205,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( browser, window_bounds, show_state); } diff --git a/www/iridium/files/patch-chrome_browser_web__applications_extension__status__utils.h b/www/iridium/files/patch-chrome_browser_web__applications_extension__status__utils.h index 41464555af5f4..6d000eb1946c5 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_extension__status__utils.h +++ b/www/iridium/files/patch-chrome_browser_web__applications_extension__status__utils.h @@ -1,7 +1,7 @@ ---- chrome/browser/web_applications/extension_status_utils.h.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/web_applications/extension_status_utils.h.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/web_applications/extension_status_utils.h -@@ -43,7 +43,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo - const std::string& extension_id); +@@ -48,7 +48,7 @@ bool ClearExternalExtensionUninstalled(content::Browse + const std::string& extension_id); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) diff --git a/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc b/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc index f4df8b66db0c5..8e7fe819dc435 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc +++ b/www/iridium/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-12-06 08:09:13 UTC +--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/web_applications/extensions/extension_status_utils.cc @@ -26,7 +26,7 @@ namespace { const char* g_preinstalled_app_for_testing = nullptr; @@ -9,7 +9,7 @@ const char kMobilityPrintExtensionId[] = "alhngdkjgnedakdlnamimgfihgkmenbh"; BASE_FEATURE(kChromeAppsDeprecationExcludeForceInstalls, -@@ -102,7 +102,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo +@@ -108,7 +108,7 @@ bool ClearExternalExtensionUninstalled(content::Browse } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h index 3e3941c8e3ea1..20ce17fab01b9 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h +++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut.h @@ -21,7 +21,7 @@ #include "ui/gfx/image/image_family.h" @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h" #endif // BUILDFLAG(IS_LINUX) -@@ -35,7 +35,7 @@ class ImageSkia; +@@ -39,7 +39,7 @@ class ImageSkia; namespace web_app { @@ -18,7 +18,7 @@ struct LinuxFileRegistration { std::string xdg_command; std::string file_contents; -@@ -85,7 +85,7 @@ struct ShortcutOverrideForTesting +@@ -89,7 +89,7 @@ struct ShortcutOverrideForTesting #elif BUILDFLAG(IS_MAC) base::ScopedTempDir chrome_apps_folder; std::map startup_enabled; @@ -27,7 +27,7 @@ base::ScopedTempDir desktop; base::ScopedTempDir startup; std::vector linux_file_registration; -@@ -132,7 +132,7 @@ struct ShortcutInfo { +@@ -136,7 +136,7 @@ struct ShortcutInfo { std::set file_handler_extensions; std::set file_handler_mime_types; std::set protocol_handlers; diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc index 58662228ac947..27644a327bd6e 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc +++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc -@@ -391,7 +391,7 @@ std::unique_ptr WebAppShortcutManager::B +@@ -449,7 +449,7 @@ std::unique_ptr WebAppShortcutManager::B } } diff --git a/www/iridium/files/patch-chrome_browser_web__applications_web__app__provider.cc b/www/iridium/files/patch-chrome_browser_web__applications_web__app__provider.cc index 22508469a342f..d48eed82b7c7e 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_web__app__provider.cc +++ b/www/iridium/files/patch-chrome_browser_web__applications_web__app__provider.cc @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/web_app_provider.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/web_applications/web_app_provider.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/web_applications/web_app_provider.cc -@@ -277,7 +277,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile +@@ -283,7 +283,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile protocol_handler_manager.get()); std::unique_ptr url_handler_manager; --#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) url_handler_manager = std::make_unique(profile); #endif + diff --git a/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc index ac9cde88294e1..7a6a2d41920e2 100644 --- a/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc +++ b/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -667,7 +667,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl +@@ -679,7 +679,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl g_observer->ConfiguringCable(request_type); } diff --git a/www/iridium/files/patch-chrome_common_chrome__features.cc b/www/iridium/files/patch-chrome_common_chrome__features.cc index 263974dbc3562..a55cfa5080178 100644 --- a/www/iridium/files/patch-chrome_common_chrome__features.cc +++ b/www/iridium/files/patch-chrome_common_chrome__features.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/common/chrome_features.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/common/chrome_features.cc -@@ -107,7 +107,7 @@ BASE_FEATURE(kAsyncDns, +@@ -108,7 +108,7 @@ BASE_FEATURE(kAsyncDns, ); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // Enables or disables the Autofill survey triggered by opening a prompt to // save address info. BASE_FEATURE(kAutofillAddressSurvey, -@@ -125,7 +125,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, +@@ -126,7 +126,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, base::FEATURE_DISABLED_BY_DEFAULT); #endif @@ -18,7 +18,7 @@ // Enables the Restart background mode optimization. When all Chrome UI is // closed and it goes in the background, allows to restart the browser to // discard memory. -@@ -304,7 +304,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, +@@ -310,7 +310,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, // Enables or disables Desktop PWAs to be auto-started on OS login. BASE_FEATURE(kDesktopPWAsRunOnOsLogin, "DesktopPWAsRunOnOsLogin", @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -328,7 +328,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles, +@@ -334,7 +334,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles, base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ // Controls whether Chrome Apps are supported. See https://crbug.com/1221251. // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome // Apps will not launch and will be marked in the UI as deprecated. -@@ -352,7 +352,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati +@@ -358,7 +358,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati BASE_FEATURE(kDnsOverHttps, "DnsOverHttps", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -45,7 +45,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -368,7 +368,7 @@ const base::FeatureParam kDnsOverHttpsFallbackPa +@@ -374,7 +374,7 @@ const base::FeatureParam kDnsOverHttpsFallbackPa const base::FeatureParam kDnsOverHttpsShowUiParam { &kDnsOverHttps, "ShowUi", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -54,7 +54,7 @@ true #else false -@@ -744,7 +744,7 @@ BASE_FEATURE(kUpdateHistoryEntryPointsInIncognito, +@@ -750,7 +750,7 @@ BASE_FEATURE(kUpdateHistoryEntryPointsInIncognito, "UpdateHistoryEntryPointsInIncognito", base::FEATURE_ENABLED_BY_DEFAULT); @@ -63,7 +63,7 @@ BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -757,7 +757,7 @@ constexpr base::FeatureParam kLinuxLowMemoryMonit +@@ -763,7 +763,7 @@ constexpr base::FeatureParam kLinuxLowMemoryMonit &kLinuxLowMemoryMonitor, "critical_level", 255}; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_common_chrome__switches.cc b/www/iridium/files/patch-chrome_common_chrome__switches.cc index b4f2c6acda3da..8806bc555496f 100644 --- a/www/iridium/files/patch-chrome_common_chrome__switches.cc +++ b/www/iridium/files/patch-chrome_common_chrome__switches.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/common/chrome_switches.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/common/chrome_switches.cc -@@ -831,14 +831,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -839,14 +839,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_common_chrome__switches.h b/www/iridium/files/patch-chrome_common_chrome__switches.h index 795f625c904d0..b1a80b3917aa8 100644 --- a/www/iridium/files/patch-chrome_common_chrome__switches.h +++ b/www/iridium/files/patch-chrome_common_chrome__switches.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.h.orig 2022-12-06 08:09:13 UTC +--- chrome/common/chrome_switches.h.orig 2023-01-17 19:19:00 UTC +++ chrome/common/chrome_switches.h -@@ -260,12 +260,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -263,12 +263,12 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_common_pref__names.cc b/www/iridium/files/patch-chrome_common_pref__names.cc index 7edbecbf3dbfc..7a7b82a5fb2bb 100644 --- a/www/iridium/files/patch-chrome_common_pref__names.cc +++ b/www/iridium/files/patch-chrome_common_pref__names.cc @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/common/pref_names.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/common/pref_names.cc -@@ -1267,7 +1267,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox +@@ -1268,7 +1268,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"; -@@ -1381,7 +1381,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1382,7 +1382,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"; -@@ -1886,7 +1886,7 @@ const char kDownloadDirUpgraded[] = "download.director +@@ -1893,7 +1893,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 -@@ -2190,7 +2190,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i +@@ -2197,7 +2197,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"; -@@ -2290,7 +2290,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled +@@ -2297,7 +2297,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[] = -@@ -3307,7 +3307,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto +@@ -3300,7 +3300,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto const char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; diff --git a/www/iridium/files/patch-chrome_common_pref__names.h b/www/iridium/files/patch-chrome_common_pref__names.h index 650b08dc64c72..e249498778042 100644 --- a/www/iridium/files/patch-chrome_common_pref__names.h +++ b/www/iridium/files/patch-chrome_common_pref__names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2022-12-06 08:09:13 UTC +--- chrome/common/pref_names.h.orig 2023-01-17 19:19:00 UTC +++ chrome/common/pref_names.h -@@ -397,7 +397,7 @@ extern const char kUseAshProxy[]; +@@ -398,7 +398,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[]; -@@ -424,7 +424,7 @@ extern const char kShowUpdatePromotionInfoBar[]; +@@ -425,7 +425,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) -@@ -611,7 +611,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[ +@@ -616,7 +616,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) -@@ -723,7 +723,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps +@@ -728,7 +728,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 -@@ -854,7 +854,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] +@@ -859,7 +859,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) -@@ -1123,7 +1123,7 @@ extern const char kBlockAutoplayEnabled[]; +@@ -1128,7 +1128,7 @@ extern const char kBlockAutoplayEnabled[]; #endif extern const char kSandboxExternalProtocolBlocked[]; diff --git a/www/iridium/files/patch-chrome_common_webui__url__constants.cc b/www/iridium/files/patch-chrome_common_webui__url__constants.cc index 9bc6c8eda04cf..e5b7074e258f3 100644 --- a/www/iridium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/iridium/files/patch-chrome_common_webui__url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/common/webui_url_constants.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/common/webui_url_constants.cc -@@ -480,18 +480,18 @@ const char kOsUIScanningAppURL[] = "os://scanning"; +@@ -487,18 +487,18 @@ const char kOsUIScanningAppURL[] = "os://scanning"; const char kOsUIVersionURL[] = "os://version"; #endif @@ -22,7 +22,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -@@ -506,14 +506,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr +@@ -513,14 +513,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -39,7 +39,7 @@ const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; const char kChromeUIEnterpriseProfileWelcomeHost[] = -@@ -529,7 +529,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro +@@ -537,7 +537,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif @@ -48,7 +48,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; -@@ -605,7 +605,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan +@@ -613,7 +613,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -57,7 +57,7 @@ const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; const char kChromeUIWebAppSettingsHost[] = "app-settings"; #endif -@@ -813,7 +813,7 @@ const char* const kChromeDebugURLs[] = { +@@ -827,7 +827,7 @@ const char* const kChromeDebugURLs[] = { blink::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif diff --git a/www/iridium/files/patch-chrome_common_webui__url__constants.h b/www/iridium/files/patch-chrome_common_webui__url__constants.h index 10a5cc0dea195..d056d3aa10182 100644 --- a/www/iridium/files/patch-chrome_common_webui__url__constants.h +++ b/www/iridium/files/patch-chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.h.orig 2022-12-01 10:35:46 UTC +--- chrome/common/webui_url_constants.h.orig 2023-01-17 19:19:00 UTC +++ chrome/common/webui_url_constants.h -@@ -409,24 +409,24 @@ extern const char kOsUIScanningAppURL[]; +@@ -414,24 +414,24 @@ extern const char kOsUIScanningAppURL[]; extern const char kOsUIVersionURL[]; #endif @@ -29,7 +29,7 @@ extern const char kChromeUIWebAppSettingsURL[]; extern const char kChromeUIWebAppSettingsHost[]; #endif -@@ -441,14 +441,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; +@@ -446,14 +446,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -46,7 +46,7 @@ extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIEnterpriseProfileWelcomeHost[]; -@@ -461,7 +461,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -467,7 +467,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif diff --git a/www/iridium/files/patch-chrome_renderer_chrome__render__frame__observer.cc b/www/iridium/files/patch-chrome_renderer_chrome__render__frame__observer.cc index d7cac2dce482c..bc0e35c9aeaab 100644 --- a/www/iridium/files/patch-chrome_renderer_chrome__render__frame__observer.cc +++ b/www/iridium/files/patch-chrome_renderer_chrome__render__frame__observer.cc @@ -1,6 +1,6 @@ ---- chrome/renderer/chrome_render_frame_observer.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/renderer/chrome_render_frame_observer.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/renderer/chrome_render_frame_observer.cc -@@ -342,7 +342,7 @@ void ChromeRenderFrameObserver::OnDestruct() { +@@ -344,7 +344,7 @@ void ChromeRenderFrameObserver::OnDestruct() { void ChromeRenderFrameObserver::DraggableRegionsChanged() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc index 4d48e78c02818..627c7f8b3789d 100644 --- a/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc +++ b/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc @@ -1,4 +1,4 @@ ---- chrome/services/printing/print_backend_service_impl.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/services/printing/print_backend_service_impl.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/services/printing/print_backend_service_impl.cc @@ -41,7 +41,7 @@ #include "printing/backend/cups_connection_pool.h" @@ -9,7 +9,7 @@ #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 { +@@ -68,7 +68,7 @@ namespace printing { namespace { @@ -18,7 +18,7 @@ void InstantiateLinuxUiDelegate() { // TODO(crbug.com/809738) Until a real UI can be used in a utility process, // need to use the stub version. -@@ -429,7 +429,7 @@ void PrintBackendServiceImpl::Init(const std::string& +@@ -437,7 +437,7 @@ void PrintBackendServiceImpl::Init(const std::string& // `InitCommon()`. InitializeProcessForPrinting(); print_backend_ = PrintBackend::CreateInstance(locale); @@ -27,7 +27,7 @@ // 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( +@@ -620,7 +620,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( crash_keys_ = std::make_unique( print_backend_->GetPrinterDriverInfo(*printer_name)); diff --git a/www/iridium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc b/www/iridium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc index 9c2190105ba58..0b814d329f358 100644 --- a/www/iridium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc +++ b/www/iridium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc @@ -1,6 +1,6 @@ ---- chrome/services/speech/audio_source_fetcher_impl.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/services/speech/audio_source_fetcher_impl.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/services/speech/audio_source_fetcher_impl.cc -@@ -69,7 +69,7 @@ void AudioSourceFetcherImpl::Start( +@@ -121,7 +121,7 @@ void AudioSourceFetcherImpl::Start( // TODO(crbug.com/1185978): Check implementation / sandbox policy on Mac and // Windows. diff --git a/www/iridium/files/patch-chrome_test_BUILD.gn b/www/iridium/files/patch-chrome_test_BUILD.gn index da496a52befcc..cdbcdcd89061f 100644 --- a/www/iridium/files/patch-chrome_test_BUILD.gn +++ b/www/iridium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- chrome/test/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ chrome/test/BUILD.gn -@@ -10087,7 +10087,7 @@ test("chrome_app_unittests") { +@@ -10141,7 +10141,7 @@ test("chrome_app_unittests") { "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", ] diff --git a/www/iridium/files/patch-chrome_test_interaction_interaction__test__util__browser.cc b/www/iridium/files/patch-chrome_test_interaction_interaction__test__util__browser.cc new file mode 100644 index 0000000000000..81cbd95009864 --- /dev/null +++ b/www/iridium/files/patch-chrome_test_interaction_interaction__test__util__browser.cc @@ -0,0 +1,11 @@ +--- chrome/test/interaction/interaction_test_util_browser.cc.orig 2023-01-17 19:19:00 UTC ++++ chrome/test/interaction/interaction_test_util_browser.cc +@@ -26,7 +26,7 @@ + #include "ui/base/interaction/interaction_test_util_mac.h" + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + #define SUPPORTS_PIXEL_TESTS 1 + #include "chrome/browser/ui/test/test_browser_ui.h" + #else diff --git a/www/iridium/files/patch-chrome_test_interaction_webui__interaction__test__util.cc b/www/iridium/files/patch-chrome_test_interaction_webui__interaction__test__util.cc deleted file mode 100644 index b34cf6b1b54b6..0000000000000 --- a/www/iridium/files/patch-chrome_test_interaction_webui__interaction__test__util.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/test/interaction/webui_interaction_test_util.cc.orig 2022-10-05 07:34:01 UTC -+++ chrome/test/interaction/webui_interaction_test_util.cc -@@ -54,7 +54,7 @@ class RenderFrameHost; - - namespace { - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - #define SUPPORTS_PIXEL_TESTS 1 - #else - #define SUPPORTS_PIXEL_TESTS 0 diff --git a/www/iridium/files/patch-chrome_updater_app_app__install.cc b/www/iridium/files/patch-chrome_updater_app_app__install.cc index 7c2cc90a9bb3d..18c7c367e6ef5 100644 --- a/www/iridium/files/patch-chrome_updater_app_app__install.cc +++ b/www/iridium/files/patch-chrome_updater_app_app__install.cc @@ -1,6 +1,6 @@ ---- chrome/updater/app/app_install.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/updater/app/app_install.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/updater/app/app_install.cc -@@ -215,7 +215,7 @@ void AppInstall::WakeCandidate() { +@@ -214,7 +214,7 @@ void AppInstall::WakeCandidate() { update_service_internal, base::WrapRefCounted(this))); } diff --git a/www/iridium/files/patch-chrome_updater_configurator.cc b/www/iridium/files/patch-chrome_updater_configurator.cc deleted file mode 100644 index 3033d51e65fce..0000000000000 --- a/www/iridium/files/patch-chrome_updater_configurator.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/updater/configurator.cc.orig 2022-10-05 07:34:01 UTC -+++ chrome/updater/configurator.cc -@@ -41,7 +41,7 @@ - #include "chrome/updater/win/net/network.h" - #elif BUILDFLAG(IS_MAC) - #include "chrome/updater/mac/net/network.h" --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "chrome/updater/linux/net/network.h" - #endif - diff --git a/www/iridium/files/patch-chrome_updater_device__management_dm__client.cc b/www/iridium/files/patch-chrome_updater_device__management_dm__client.cc deleted file mode 100644 index 87cbc152de550..0000000000000 --- a/www/iridium/files/patch-chrome_updater_device__management_dm__client.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/updater/device_management/dm_client.cc.orig 2022-12-01 10:35:46 UTC -+++ chrome/updater/device_management/dm_client.cc -@@ -37,7 +37,7 @@ - #include "chrome/updater/win/net/network.h" - #elif BUILDFLAG(IS_MAC) - #include "chrome/updater/mac/net/network.h" --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "chrome/updater/linux/net/network.h" - #endif - diff --git a/www/iridium/files/patch-chrome_updater_installer.cc b/www/iridium/files/patch-chrome_updater_installer.cc index b669c06085a6d..73801d0f93821 100644 --- a/www/iridium/files/patch-chrome_updater_installer.cc +++ b/www/iridium/files/patch-chrome_updater_installer.cc @@ -1,6 +1,6 @@ ---- chrome/updater/installer.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/updater/installer.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/updater/installer.cc -@@ -250,7 +250,7 @@ absl::optional Installer::GetCurrentIn +@@ -252,7 +252,7 @@ absl::optional Installer::GetCurrentIn return path->AppendASCII(pv_.GetString()); } diff --git a/www/iridium/files/patch-chrome_updater_updater.cc b/www/iridium/files/patch-chrome_updater_updater.cc index 94a765b7f0f6e..c2719ba076943 100644 --- a/www/iridium/files/patch-chrome_updater_updater.cc +++ b/www/iridium/files/patch-chrome_updater_updater.cc @@ -1,4 +1,4 @@ ---- chrome/updater/updater.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/updater/updater.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/updater/updater.cc @@ -44,7 +44,7 @@ #include "chrome/updater/win/win_util.h" @@ -7,5 +7,14 @@ -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/updater/app/server/linux/server.h" + #include "chrome/updater/linux/ipc_support.h" #endif +@@ -137,7 +137,7 @@ int HandleUpdaterCommands(UpdaterScope updater_scope, + CHECK(false) << "--crash-me was used."; + } +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // As long as this object is alive, all Mojo API surface relevant to IPC + // connections is usable, and message pipes which span a process boundary will + // continue to function. diff --git a/www/iridium/files/patch-chrome_updater_util.cc b/www/iridium/files/patch-chrome_updater_util.cc index 8feded08e87d2..3d971bccbeb74 100644 --- a/www/iridium/files/patch-chrome_updater_util.cc +++ b/www/iridium/files/patch-chrome_updater_util.cc @@ -1,6 +1,6 @@ ---- chrome/updater/util.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/updater/util.cc.orig 2023-01-17 19:19:00 UTC +++ chrome/updater/util.cc -@@ -37,7 +37,7 @@ +@@ -36,7 +36,7 @@ #include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" @@ -9,7 +9,7 @@ #include "chrome/updater/linux/linux_util.h" #elif BUILDFLAG(IS_MAC) #import "chrome/updater/mac/mac_util.h" -@@ -118,7 +118,7 @@ absl::optional GetBaseDataDirectory(Up +@@ -119,7 +119,7 @@ absl::optional GetBaseDataDirectory(Up app_data_dir = GetApplicationDataDirectory(scope); #elif BUILDFLAG(IS_MAC) app_data_dir = GetApplicationSupportDirectory(scope); diff --git a/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc index 0a38333e219f3..38803341637b3 100644 --- a/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2022-10-05 07:34:01 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2023-01-17 19:19:00 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -434,7 +434,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -433,7 +433,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { diff --git a/www/iridium/files/patch-components_autofill__assistant_browser_autofill__assistant__impl.cc b/www/iridium/files/patch-components_autofill__assistant_browser_autofill__assistant__impl.cc deleted file mode 100644 index 26ab0d3954902..0000000000000 --- a/www/iridium/files/patch-components_autofill__assistant_browser_autofill__assistant__impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/autofill_assistant/browser/autofill_assistant_impl.cc.orig 2022-12-06 08:09:13 UTC -+++ components/autofill_assistant/browser/autofill_assistant_impl.cc -@@ -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) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - client_context.set_platform_type(ClientContextProto::PLATFORM_TYPE_DESKTOP); - #endif - diff --git a/www/iridium/files/patch-components_autofill__assistant_browser_client__context.cc b/www/iridium/files/patch-components_autofill__assistant_browser_client__context.cc index 228356b560d40..8a90c0e649e99 100644 --- a/www/iridium/files/patch-components_autofill__assistant_browser_client__context.cc +++ b/www/iridium/files/patch-components_autofill__assistant_browser_client__context.cc @@ -1,11 +1,11 @@ ---- components/autofill_assistant/browser/client_context.cc.orig 2022-10-05 07:34:01 UTC +--- components/autofill_assistant/browser/client_context.cc.orig 2023-01-17 19:19:00 UTC +++ components/autofill_assistant/browser/client_context.cc -@@ -23,7 +23,7 @@ ClientContextImpl::ClientContextImpl(const Client* cli - proto_.set_platform_type(ClientContextProto::PLATFORM_TYPE_ANDROID); - #endif - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +@@ -109,7 +109,7 @@ ClientContextProto::PlatformType ClientContext::GetPla + #if BUILDFLAG(IS_ANDROID) + return ClientContextProto::PLATFORM_TYPE_ANDROID; + #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - proto_.set_platform_type(ClientContextProto::PLATFORM_TYPE_DESKTOP); - #endif - + return ClientContextProto::PLATFORM_TYPE_DESKTOP; + #else + return ClientContextProto::PLATFORM_TYPE_UNDEFINED; diff --git a/www/iridium/files/patch-components_autofill__assistant_browser_client__context__unittest.cc b/www/iridium/files/patch-components_autofill__assistant_browser_client__context__unittest.cc new file mode 100644 index 0000000000000..6a1b5ff48a7f7 --- /dev/null +++ b/www/iridium/files/patch-components_autofill__assistant_browser_client__context__unittest.cc @@ -0,0 +1,20 @@ +--- components/autofill_assistant/browser/client_context_unittest.cc.orig 2023-01-17 19:19:00 UTC ++++ components/autofill_assistant/browser/client_context_unittest.cc +@@ -75,7 +75,7 @@ TEST_F(ClientContextTest, Initialize) { + ClientContextProto::PLATFORM_TYPE_ANDROID); + #endif + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + EXPECT_THAT(actual_client_context.platform_type(), + ClientContextProto::PLATFORM_TYPE_DESKTOP); + #endif +@@ -256,7 +256,7 @@ TEST(GetPlatformType, ReturnsCorrectPlatform) { + ClientContextProto::PLATFORM_TYPE_ANDROID); + #endif + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + EXPECT_THAT(ClientContext::GetPlatformType(), + ClientContextProto::PLATFORM_TYPE_DESKTOP); + #endif diff --git a/www/iridium/files/patch-components_autofill__payments__strings.grdp b/www/iridium/files/patch-components_autofill__payments__strings.grdp index bc52554858788..f49b8fe5f9274 100644 --- a/www/iridium/files/patch-components_autofill__payments__strings.grdp +++ b/www/iridium/files/patch-components_autofill__payments__strings.grdp @@ -1,6 +1,6 @@ ---- components/autofill_payments_strings.grdp.orig 2022-10-05 07:34:01 UTC +--- components/autofill_payments_strings.grdp.orig 2023-01-17 19:19:00 UTC +++ components/autofill_payments_strings.grdp -@@ -127,7 +127,7 @@ +@@ -112,7 +112,7 @@ Save card diff --git a/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc index 4fc05e7dbb991..5f2707a9e77e2 100644 --- a/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc +++ b/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/personal_data_manager.cc.orig 2022-12-06 08:09:13 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2023-01-17 19:19:00 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -2053,7 +2053,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2079,7 +2079,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/iridium/files/patch-components_device__signals_test_signals__contract.cc b/www/iridium/files/patch-components_device__signals_test_signals__contract.cc index 509c3baf2bd39..cdf38baaa2d41 100644 --- a/www/iridium/files/patch-components_device__signals_test_signals__contract.cc +++ b/www/iridium/files/patch-components_device__signals_test_signals__contract.cc @@ -1,7 +1,7 @@ ---- components/device_signals/test/signals_contract.cc.orig 2022-12-06 08:09:13 UTC +--- components/device_signals/test/signals_contract.cc.orig 2023-01-17 19:19:00 UTC +++ components/device_signals/test/signals_contract.cc -@@ -164,7 +164,7 @@ GetSignalsContract() { - base::BindRepeating(VerifyUnset, names::kSecureBootEnabled); +@@ -190,7 +190,7 @@ GetSignalsContract() { + base::BindRepeating(VerifyUnset, names::kCrowdStrike); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc index 982fc8ec5beff..6c2867f76609f 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2022-12-06 08:09:13 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2023-01-17 19:19:00 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -35,7 +35,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe absl::optional GetClientSideFeatureConfig( @@ -9,7 +9,7 @@ if (kIPHPasswordsAccountStorageFeature.name == feature->name) { absl::optional config = FeatureConfig(); config->valid = true; -@@ -988,7 +988,8 @@ absl::optional GetClientSideFeatureConf +@@ -1029,7 +1029,8 @@ absl::optional GetClientSideFeatureConf #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc index 2aeb532694980..b0ea055415a14 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2022-12-06 08:09:13 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2023-01-17 19:19:00 UTC +++ components/feature_engagement/public/feature_constants.cc @@ -24,7 +24,7 @@ BASE_FEATURE(kUseClientConfigIPH, BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ BASE_FEATURE(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -418,7 +418,8 @@ BASE_FEATURE(kIPHOverflowMenuTipFeature, +@@ -424,7 +424,8 @@ BASE_FEATURE(kIPHOverflowMenuTipFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h index e8254649ba4ab..6dac1e272c3b9 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2022-12-06 08:09:13 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2023-01-17 19:19:00 UTC +++ components/feature_engagement/public/feature_constants.h @@ -32,7 +32,7 @@ BASE_DECLARE_FEATURE(kIPHDummyFeature); BASE_DECLARE_FEATURE(kEnableIPH); @@ -9,7 +9,7 @@ BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature); BASE_DECLARE_FEATURE(kIPHDesktopSharedHighlightingFeature); BASE_DECLARE_FEATURE(kIPHDesktopTabGroupsNewGroupFeature); -@@ -183,7 +183,8 @@ BASE_DECLARE_FEATURE(kIPHOverflowMenuTipFeature); +@@ -185,7 +185,8 @@ BASE_DECLARE_FEATURE(kIPHOverflowMenuTipFeature); #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc b/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc index 5be580dd7edcd..aabb1fc931c44 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2022-12-06 08:09:13 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2023-01-17 19:19:00 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -120,7 +120,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -122,7 +122,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, -@@ -152,7 +152,8 @@ const base::Feature* const kAllFeatures[] = { +@@ -154,7 +154,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/iridium/files/patch-components_feature__engagement_public_feature__list.h b/www/iridium/files/patch-components_feature__engagement_public_feature__list.h index 7021a2785e5ba..a2490b5f30338 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__list.h +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_list.h.orig 2022-12-06 08:09:13 UTC +--- components/feature_engagement/public/feature_list.h.orig 2023-01-17 19:19:00 UTC +++ components/feature_engagement/public/feature_list.h -@@ -218,7 +218,7 @@ DEFINE_VARIATION_PARAM(kIPHOverflowMenuTipFeature, "IP +@@ -222,7 +222,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"); -@@ -264,7 +264,8 @@ DEFINE_VARIATION_PARAM(kIPHPriceTrackingInSidePanelFea +@@ -268,7 +268,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) || -@@ -369,7 +370,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -375,7 +376,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), -@@ -402,7 +403,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -408,7 +409,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/iridium/files/patch-components_metrics_metrics__log.cc b/www/iridium/files/patch-components_metrics_metrics__log.cc index 2c46ab9cdd300..f6302d1fb9b3a 100644 --- a/www/iridium/files/patch-components_metrics_metrics__log.cc +++ b/www/iridium/files/patch-components_metrics_metrics__log.cc @@ -1,6 +1,6 @@ ---- components/metrics/metrics_log.cc.orig 2022-12-06 08:09:13 UTC +--- components/metrics/metrics_log.cc.orig 2023-01-17 19:19:00 UTC +++ components/metrics/metrics_log.cc -@@ -54,7 +54,7 @@ +@@ -53,7 +53,7 @@ #include "base/win/current_module.h" #endif @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #endif -@@ -144,7 +144,7 @@ void RecordCurrentTime( +@@ -123,7 +123,7 @@ void RecordCurrentTime( } } @@ -18,7 +18,7 @@ metrics::SystemProfileProto::OS::XdgSessionType ToProtoSessionType( base::nix::SessionType session_type) { switch (session_type) { -@@ -415,7 +415,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -375,7 +375,7 @@ void MetricsLog::RecordCoreSystemProfile( // OperatingSystemVersion refers to the ChromeOS release version. #if BUILDFLAG(IS_CHROMEOS_ASH) os->set_kernel_version(base::SysInfo::KernelVersion()); @@ -27,7 +27,7 @@ // Linux operating system version is copied over into kernel version to be // consistent. os->set_kernel_version(base::SysInfo::OperatingSystemVersion()); -@@ -432,7 +432,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -392,7 +392,7 @@ void MetricsLog::RecordCoreSystemProfile( os->set_build_number(base::SysInfo::GetIOSBuildNumber()); #endif diff --git a/www/iridium/files/patch-components_os__crypt_os__crypt.h b/www/iridium/files/patch-components_os__crypt_os__crypt.h index 1135351db1964..6b1b9c5f12b86 100644 --- a/www/iridium/files/patch-components_os__crypt_os__crypt.h +++ b/www/iridium/files/patch-components_os__crypt_os__crypt.h @@ -1,6 +1,6 @@ ---- components/os_crypt/os_crypt.h.orig 2022-10-05 07:34:01 UTC +--- components/os_crypt/os_crypt.h.orig 2023-01-17 19:19:00 UTC +++ components/os_crypt/os_crypt.h -@@ -15,7 +15,7 @@ +@@ -14,7 +14,7 @@ #include "build/build_config.h" #include "build/chromecast_buildflags.h" @@ -9,7 +9,7 @@ class KeyStorageLinux; #endif // BUILDFLAG(IS_LINUX) -@@ -24,7 +24,7 @@ class PrefRegistrySimple; +@@ -23,7 +23,7 @@ class PrefRegistrySimple; class PrefService; #endif @@ -18,7 +18,7 @@ namespace crypto { class SymmetricKey; } -@@ -37,7 +37,7 @@ struct Config; +@@ -36,7 +36,7 @@ struct Config; // Temporary interface due to OSCrypt refactor. See OSCryptImpl for descriptions // of what each function does. namespace OSCrypt { @@ -27,7 +27,7 @@ COMPONENT_EXPORT(OS_CRYPT) void SetConfig(std::unique_ptr config); #endif // BUILDFLAG(IS_LINUX) -@@ -82,7 +82,7 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockKeyForTesting(b +@@ -81,7 +81,7 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockKeyForTesting(b COMPONENT_EXPORT(OS_CRYPT) void SetLegacyEncryptionForTesting(bool legacy); COMPONENT_EXPORT(OS_CRYPT) void ResetStateForTesting(); #endif // BUILDFLAG(IS_WIN) @@ -36,7 +36,7 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockKeyStorageForTesting( base::OnceCallback()> -@@ -109,7 +109,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { +@@ -108,7 +108,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { // Returns singleton instance of OSCryptImpl. static OSCryptImpl* GetInstance(); @@ -45,7 +45,7 @@ // Set the configuration of OSCryptImpl. // This method, or SetRawEncryptionKey(), must be called before using // EncryptString() and DecryptString(). -@@ -201,7 +201,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { +@@ -200,7 +200,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { void ResetStateForTesting(); #endif @@ -54,7 +54,7 @@ // For unit testing purposes, inject methods to be used. // |storage_provider_factory| provides the desired |KeyStorage| // implementation. If the provider returns |nullptr|, a hardcoded password -@@ -226,13 +226,13 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { +@@ -225,13 +225,13 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { crypto::SymmetricKey* GetEncryptionKey(); #endif // BUILDFLAG(IS_APPLE) diff --git a/www/iridium/files/patch-components_password__manager_core_browser_login__database__unittest.cc b/www/iridium/files/patch-components_password__manager_core_browser_login__database__unittest.cc index cc48acb32ac83..ab5bc06ff45f4 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_login__database__unittest.cc +++ b/www/iridium/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-12-06 08:09:13 UTC +--- components/password_manager/core/browser/login_database_unittest.cc.orig 2023-01-17 19:19:00 UTC +++ components/password_manager/core/browser/login_database_unittest.cc -@@ -2093,7 +2093,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd +@@ -2092,7 +2092,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd base::HistogramTester histogram_tester; ASSERT_TRUE(db.Init()); @@ -9,16 +9,16 @@ // Make sure that we can't get any logins when database is corrupted. // Disabling the checks in chromecast because encryption is unavailable. std::vector> result; -@@ -2119,7 +2119,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd +@@ -2118,7 +2118,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd #endif // Check histograms. -#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) +#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD) - histogram_tester.ExpectUniqueSample("PasswordManager.CleanedUpPasswords", 2, - 1); histogram_tester.ExpectUniqueSample( -@@ -2171,7 +2171,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL + "PasswordManager.DeleteUndecryptableLoginsReturnValue", + metrics_util::DeleteCorruptedPasswordsResult::kSuccessPasswordsDeleted, +@@ -2161,7 +2161,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL } #endif // BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc b/www/iridium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc index a5441b4e905a9..6168df1493bd5 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc +++ b/www/iridium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc @@ -1,15 +1,15 @@ ---- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2022-12-06 08:09:13 UTC +--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2023-01-17 19:19:00 UTC +++ components/password_manager/core/browser/sync/password_sync_bridge.cc -@@ -187,7 +187,7 @@ bool ShouldRecoverPasswordsDuringMerge() { +@@ -185,7 +185,7 @@ bool IsCredentialPhished(const sync_pb::PasswordSpecif + // merge. + bool ShouldRecoverPasswordsDuringMerge() { // Delete the local undecryptable copy when this is MacOS only. - #if BUILDFLAG(IS_MAC) +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return true; --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return base::FeatureList::IsEnabled( - features::kSyncUndecryptablePasswordsLinux); #else -@@ -196,7 +196,7 @@ bool ShouldRecoverPasswordsDuringMerge() { + return false; +@@ -193,7 +193,7 @@ bool ShouldRecoverPasswordsDuringMerge() { } bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() { diff --git a/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.cc b/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.cc index 5e7543666717c..9aaa20c9329d2 100644 --- a/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.cc +++ b/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/common/password_manager_features.cc.orig 2022-12-06 08:09:13 UTC +--- components/password_manager/core/common/password_manager_features.cc.orig 2023-01-17 19:19:00 UTC +++ components/password_manager/core/common/password_manager_features.cc -@@ -91,7 +91,7 @@ BASE_FEATURE(kFillOnAccountSelect, +@@ -86,7 +86,7 @@ BASE_FEATURE(kFillOnAccountSelect, "fill-on-account-select", base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ // When enabled, initial sync will be forced during startup if the password // store has encryption service failures. BASE_FEATURE(kForceInitialSyncWhenDecryptionFails, -@@ -222,7 +222,7 @@ BASE_FEATURE(kPasswordStrengthIndicator, +@@ -235,7 +235,7 @@ BASE_FEATURE(kPasswordStrengthIndicator, "PasswordStrengthIndicator", base::FEATURE_DISABLED_BY_DEFAULT); @@ -18,12 +18,3 @@ // Displays at least the decryptable and never saved logins in the password // manager 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. - BASE_FEATURE(kSyncUndecryptablePasswordsLinux, diff --git a/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.h b/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.h index cc5165f87d3d1..97576f6dc734b 100644 --- a/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.h +++ b/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.h @@ -1,6 +1,6 @@ ---- components/password_manager/core/common/password_manager_features.h.orig 2022-12-06 08:09:13 UTC +--- components/password_manager/core/common/password_manager_features.h.orig 2023-01-17 19:19:00 UTC +++ components/password_manager/core/common/password_manager_features.h -@@ -38,7 +38,7 @@ BASE_DECLARE_FEATURE(kEnablePasswordGenerationForClear +@@ -37,7 +37,7 @@ BASE_DECLARE_FEATURE(kEnablePasswordGenerationForClear BASE_DECLARE_FEATURE(kEnablePasswordManagerWithinFencedFrame); BASE_DECLARE_FEATURE(kFillingAcrossAffiliatedWebsites); BASE_DECLARE_FEATURE(kFillOnAccountSelect); @@ -9,16 +9,12 @@ BASE_DECLARE_FEATURE(kForceInitialSyncWhenDecryptionFails); #endif BASE_DECLARE_FEATURE(kInferConfirmationPasswordField); -@@ -65,10 +65,10 @@ BASE_DECLARE_FEATURE(kPasswordScriptsFetching); - BASE_DECLARE_FEATURE(kPasswordsGrouping); - BASE_DECLARE_FEATURE(kPasswordStrengthIndicator); - BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid); +@@ -68,7 +68,7 @@ BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid); + #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) // Desktop + BASE_DECLARE_FEATURE(kRevampedPasswordManagementBubble); + #endif -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kSkipUndecryptablePasswords); #endif --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - BASE_DECLARE_FEATURE(kSyncUndecryptablePasswordsLinux); - #endif #if BUILDFLAG(IS_ANDROID) diff --git a/www/iridium/files/patch-components_policy_resources_policy__templates.json b/www/iridium/files/patch-components_policy_resources_policy__templates.json deleted file mode 100644 index 656e065f9535c..0000000000000 --- a/www/iridium/files/patch-components_policy_resources_policy__templates.json +++ /dev/null @@ -1,200 +0,0 @@ ---- components/policy/resources/policy_templates.json.orig 2022-12-06 08:09:13 UTC -+++ components/policy/resources/policy_templates.json -@@ -1454,7 +1454,7 @@ - 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, -- 'supported_on': ['chrome.win7:11-', 'chrome.mac:11-', 'chrome.linux:11-'], -+ 'supported_on': ['chrome.win7:11-', 'chrome.mac:11-', 'chrome.linux:11-', 'chrome.openbsd:11-', 'chrome.freebsd:11-'], - 'future_on': ['fuchsia'], - 'features': { - 'dynamic_refresh': True, -@@ -2604,7 +2604,7 @@ - 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, -- 'supported_on': ['chrome.linux:25-', 'chrome.mac:25-'], -+ 'supported_on': ['chrome.linux:25-', 'chrome.mac:25-', 'chrome.openbsd:25-', 'chrome.freebsd:25-'], - 'features': { - 'dynamic_refresh': True, - 'per_profile': False, -@@ -4455,7 +4455,7 @@ - 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, -- 'supported_on': ['chrome.win:57-', 'chrome.mac:88-', 'chrome.linux:88-'], -+ 'supported_on': ['chrome.win:57-', 'chrome.mac:88-', 'chrome.linux:88-', 'chrome.openbsd:88-', 'chrome.freebsd:88-'], - 'future_on': ['fuchsia'], - 'features': { - 'dynamic_refresh': False, -@@ -4485,7 +4485,7 @@ - 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], - 'type': 'string', - 'schema': { 'type': 'string' }, -- 'supported_on': ['chrome.win:57-', 'chrome.mac:88-', 'chrome.linux:88-'], -+ 'supported_on': ['chrome.win:57-', 'chrome.mac:88-', 'chrome.linux:88-', 'chrome.openbsd:88-', 'chrome.freebsd:88-'], - 'features': { - 'dynamic_refresh': False, - 'per_profile': False, -@@ -5469,7 +5469,7 @@ - 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, -- 'supported_on': ['chrome.linux:74-','chrome.mac:74-','chrome_os:74-'], -+ 'supported_on': ['chrome.linux:74-','chrome.mac:74-','chrome_os:74-','chrome.openbsd:74-','chrome.freebsd:74-'], - 'features': { - 'dynamic_refresh': True, - 'per_profile': False, -@@ -5531,7 +5531,7 @@ - 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], - 'type': 'string', - 'schema': { 'type': 'string' }, -- 'supported_on': ['chrome.linux:9-'], -+ 'supported_on': ['chrome.linux:9-','chrome.openbsd:9-','chrome.freebsd:9-'], - 'features': { - 'dynamic_refresh': False, - 'per_profile': False, -@@ -5598,7 +5598,7 @@ - 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, -- 'supported_on': ['chrome.linux:63-','chrome.mac:63-','chrome_os:63-','android:63-','webview_android:63-'], -+ 'supported_on': ['chrome.linux:63-','chrome.mac:63-','chrome_os:63-','android:63-','webview_android:63-','chrome.openbsd:63-','chrome.freebsd:63-'], - 'features': { - 'dynamic_refresh': True, - 'per_profile': False, -@@ -11250,7 +11250,7 @@ - 'owners': ['file://net/cert/OWNERS', 'rsleevi@chromium.org'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, -- 'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-'], -+ 'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-', 'chrome.openbsd:30-', 'chrome.freebsd:30-'], - 'future_on': ['fuchsia'], - 'features': { - 'dynamic_refresh': True, -@@ -11375,7 +11375,7 @@ - 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, -- 'supported_on': ['chrome_os:77-83', 'chrome.linux:79-83', 'chrome.mac:83-106'], -+ 'supported_on': ['chrome_os:77-83', 'chrome.linux:79-83', 'chrome.mac:83-106', 'chrome.openbsd:79-83', 'chrome.freebsd:79-83'], - 'deprecated': True, - 'features': { - 'dynamic_refresh': False, -@@ -13901,7 +13901,7 @@ - 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, -- 'supported_on': ['chrome.win:19-', 'chrome.linux:19-'], -+ 'supported_on': ['chrome.win:19-', 'chrome.linux:19-', 'chrome.openbsd:19-', 'chrome.freebsd:19-'], - 'features': { - 'can_be_recommended': True, - 'dynamic_refresh': True, -@@ -14970,7 +14970,7 @@ - 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, -- 'supported_on': ['chrome.win:31-', 'chrome.linux:31-', 'chrome_os:31-'], -+ 'supported_on': ['chrome.win:31-', 'chrome.linux:31-', 'chrome_os:31-', 'chrome.openbsd:31-', 'chrome.freebsd:31-'], - 'future_on': ['fuchsia'], - 'features': { - 'dynamic_refresh': True, -@@ -18548,7 +18548,7 @@ - 'deprecated': True, - 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.win:64-', 'chrome.mac:66-', 'android:65-'], -- 'future_on': ['chrome.linux'], -+ 'future_on': ['chrome.linux','chrome.openbsd','chrome.freebsd'], - 'features': { - 'dynamic_refresh': False, - 'per_profile': False, -@@ -23132,7 +23132,7 @@ - 'items': { 'type': 'string' } - }, - # Spell checking is provided by macOS, so can't be controlled on Mac. -- 'supported_on': ['chrome.win:65-', 'chrome.linux:65-', 'chrome_os:65-'], -+ 'supported_on': ['chrome.win:65-', 'chrome.linux:65-', 'chrome_os:65-', 'chrome.openbsd:65-', 'chrome.freebsd:65-'], - 'features': { - 'can_be_recommended': False, - 'dynamic_refresh': True, -@@ -23163,7 +23163,7 @@ - 'items': { 'type': 'string' } - }, - # Spell checking is provided by macOS, so can't be controlled on Mac. -- 'supported_on': ['chrome.win:75-100', 'chrome.linux:75-100', 'chrome_os:75-100'], -+ 'supported_on': ['chrome.win:75-100', 'chrome.linux:75-100', 'chrome_os:75-100', 'chrome.openbsd:75-100', 'chrome.freebsd:75-100'], - 'deprecated': True, - 'features': { - 'can_be_recommended': False, -@@ -23197,7 +23197,7 @@ - 'items': { 'type': 'string' } - }, - # Spell checking is provided by macOS, so can't be controlled on Mac. -- 'supported_on': ['chrome.win:86-', 'chrome.linux:86-', 'chrome_os:86-'], -+ 'supported_on': ['chrome.win:86-', 'chrome.linux:86-', 'chrome_os:86-', 'chrome.openbsd:86-', 'chrome.freebsd:86-'], - 'features': { - 'can_be_recommended': False, - 'dynamic_refresh': True, -@@ -24076,7 +24076,7 @@ - 'owners': ['fbeaufort@chromium.org', 'beccahughes@chromium.org'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, -- 'supported_on': ['chrome.win:66-', 'chrome.linux:66-', 'chrome.mac:66-', 'chrome_os:66-'], -+ 'supported_on': ['chrome.win:66-', 'chrome.linux:66-', 'chrome.mac:66-', 'chrome_os:66-', 'chrome.openbsd:66-', 'chrome.freebsd:66-'], - 'future_on': ['fuchsia'], - 'features': { - 'dynamic_refresh': True, -@@ -29297,7 +29297,7 @@ - 'owners': ['file://services/audio/OWNERS', 'dalecurtis@chromium.org'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, -- 'supported_on': ['chrome.win:79-', 'chrome.linux:79-', 'chrome.mac:79-'], -+ 'supported_on': ['chrome.win:79-', 'chrome.linux:79-', 'chrome.mac:79-', 'chrome.openbsd:79-', 'chrome.freebsd:79-'], - 'features': { - 'dynamic_refresh': False, - 'per_profile': False, -@@ -30795,7 +30795,7 @@ If this policy is left unset, privacy screen is disabl - 'owners': ['file://chrome/browser/notifications/OWNERS', 'knollr@chromium.org'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, -- 'supported_on': ['chrome.linux:83-100'], -+ 'supported_on': ['chrome.linux:83-100','chrome.openbsd:83-100','chrome.freebsd:83-100'], - 'features': { - 'dynamic_refresh': True, - 'per_profile': True, -@@ -30819,7 +30819,7 @@ If set to False, $1Google - 'owners': ['file://chrome/browser/notifications/OWNERS'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, -- 'supported_on': ['chrome.linux:90-'], -+ 'supported_on': ['chrome.linux:90-','chrome.openbsd:90-','chrome.freebsd:90-'], - 'features': { - 'dynamic_refresh': True, - 'per_profile': True, -@@ -32044,7 +32044,7 @@ If you disable this policy, web page scrolling to spec - 'owners': ['asumaneev@google.com'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, -- 'supported_on': ['chrome.linux:91-92', 'chrome_os:91-'], -+ 'supported_on': ['chrome.linux:91-92', 'chrome_os:91-', 'chrome.openbsd:91-', 'chrome.freebsd:91-'], - 'features': { - 'dynamic_refresh': True, - 'per_profile': False, -@@ -33402,7 +33402,7 @@ This is the same behavior as permissions{ -@@ -59,6 +60,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi +@@ -52,6 +53,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi sandbox::syscall_broker::COMMAND_OPEN}), permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), options); instance->EngageNamespaceSandboxIfPossible(); diff --git a/www/iridium/files/patch-components_viz_host_host__display__client.cc b/www/iridium/files/patch-components_viz_host_host__display__client.cc index 10830854828aa..df70b6bbcaac8 100644 --- a/www/iridium/files/patch-components_viz_host_host__display__client.cc +++ b/www/iridium/files/patch-components_viz_host_host__display__client.cc @@ -1,6 +1,6 @@ ---- components/viz/host/host_display_client.cc.orig 2022-03-28 18:11:04 UTC +--- components/viz/host/host_display_client.cc.orig 2023-01-17 19:19:00 UTC +++ components/viz/host/host_display_client.cc -@@ -61,7 +61,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater( +@@ -66,7 +66,7 @@ void HostDisplayClient::AddChildWindowToBrowser( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-components_viz_host_host__display__client.h b/www/iridium/files/patch-components_viz_host_host__display__client.h index 146b22e797a70..58e2dd7bfa6e9 100644 --- a/www/iridium/files/patch-components_viz_host_host__display__client.h +++ b/www/iridium/files/patch-components_viz_host_host__display__client.h @@ -1,6 +1,6 @@ ---- components/viz/host/host_display_client.h.orig 2022-03-28 18:11:04 UTC +--- components/viz/host/host_display_client.h.orig 2023-01-17 19:19:00 UTC +++ components/viz/host/host_display_client.h -@@ -48,7 +48,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom +@@ -54,7 +54,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc index fe27daf07c093..4fff1930289a2 100644 --- a/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc +++ b/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2022-12-06 08:09:13 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2023-01-17 19:19:00 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1161,7 +1161,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1174,7 +1174,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetDeviceQueue() ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, ycbcr_info); @@ -9,7 +9,7 @@ // 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 +@@ -1193,7 +1193,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor return GrBackendFormat::MakeMtl(ToMTLPixelFormat(resource_format)); #endif } else { diff --git a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h index 516b4215a475e..ce7d621eb0f41 100644 --- a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h +++ b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -1,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2022-04-01 07:48:30 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2023-01-17 19:19:00 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -196,7 +196,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl +@@ -197,7 +197,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-components_viz_test_fake__display__client.cc b/www/iridium/files/patch-components_viz_test_fake__display__client.cc index 35c25c72bd7f5..977fb3a78b433 100644 --- a/www/iridium/files/patch-components_viz_test_fake__display__client.cc +++ b/www/iridium/files/patch-components_viz_test_fake__display__client.cc @@ -1,7 +1,7 @@ ---- components/viz/test/fake_display_client.cc.orig 2022-03-28 18:11:04 UTC +--- components/viz/test/fake_display_client.cc.orig 2023-01-17 19:19:00 UTC +++ components/viz/test/fake_display_client.cc -@@ -25,7 +25,7 @@ void FakeDisplayClient::CreateLayeredWindowUpdater( - mojo::PendingReceiver receiver) {} +@@ -27,7 +27,7 @@ void FakeDisplayClient::AddChildWindowToBrowser( + gpu::SurfaceHandle child_window) {} #endif -#if BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-components_viz_test_fake__display__client.h b/www/iridium/files/patch-components_viz_test_fake__display__client.h index 2b4eb4f178f2f..c547a2f4066b4 100644 --- a/www/iridium/files/patch-components_viz_test_fake__display__client.h +++ b/www/iridium/files/patch-components_viz_test_fake__display__client.h @@ -1,7 +1,7 @@ ---- components/viz/test/fake_display_client.h.orig 2022-03-28 18:11:04 UTC +--- components/viz/test/fake_display_client.h.orig 2023-01-17 19:19:00 UTC +++ components/viz/test/fake_display_client.h -@@ -34,7 +34,7 @@ class FakeDisplayClient : public mojom::DisplayClient - mojo::PendingReceiver receiver) override; +@@ -35,7 +35,7 @@ class FakeDisplayClient : public mojom::DisplayClient + void AddChildWindowToBrowser(gpu::SurfaceHandle child_window) override; #endif -#if BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-components_viz_test_mock__display__client.h b/www/iridium/files/patch-components_viz_test_mock__display__client.h index a468962b9b194..c3258e3d778a7 100644 --- a/www/iridium/files/patch-components_viz_test_mock__display__client.h +++ b/www/iridium/files/patch-components_viz_test_mock__display__client.h @@ -1,6 +1,6 @@ ---- components/viz/test/mock_display_client.h.orig 2022-03-28 18:11:04 UTC +--- components/viz/test/mock_display_client.h.orig 2023-01-17 19:19:00 UTC +++ components/viz/test/mock_display_client.h -@@ -44,7 +44,7 @@ class MockDisplayClient : public mojom::DisplayClient +@@ -45,7 +45,7 @@ class MockDisplayClient : public mojom::DisplayClient #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-content_app_content__main__runner__impl.cc b/www/iridium/files/patch-content_app_content__main__runner__impl.cc index c461e0776968f..99bb9f3203b69 100644 --- a/www/iridium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/iridium/files/patch-content_app_content__main__runner__impl.cc @@ -1,7 +1,7 @@ ---- content/app/content_main_runner_impl.cc.orig 2022-12-06 08:09:13 UTC +--- content/app/content_main_runner_impl.cc.orig 2023-01-17 19:19:00 UTC +++ content/app/content_main_runner_impl.cc @@ -135,13 +135,13 @@ - #include "base/posix/global_descriptors.h" + #include "content/browser/posix_file_descriptor_info_impl.h" #include "content/public/common/content_descriptors.h" -#if !BUILDFLAG(IS_MAC) @@ -27,7 +27,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -382,7 +386,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -361,7 +365,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 -@@ -418,7 +422,7 @@ void PreloadLibraryCdms() { +@@ -397,7 +401,7 @@ void PreloadLibraryCdms() { } #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS) @@ -45,7 +45,7 @@ void PreSandboxInit() { // Pre-acquire resources needed by BoringSSL. See // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md -@@ -441,6 +445,11 @@ void PreSandboxInit() { +@@ -420,6 +424,11 @@ void PreSandboxInit() { } #endif @@ -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. -@@ -623,7 +632,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* +@@ -602,7 +611,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -66,7 +66,7 @@ PreSandboxInit(); #endif -@@ -817,11 +826,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -796,11 +805,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -80,7 +80,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1007,6 +1015,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -982,6 +990,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam } #endif @@ -97,7 +97,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE_HANDLE) -@@ -1070,7 +1088,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1045,7 +1063,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 -@@ -1103,6 +1121,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1078,6 +1096,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); diff --git a/www/iridium/files/patch-content_browser_BUILD.gn b/www/iridium/files/patch-content_browser_BUILD.gn index fd803112bdb9a..79a6a368c982c 100644 --- a/www/iridium/files/patch-content_browser_BUILD.gn +++ b/www/iridium/files/patch-content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- content/browser/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- content/browser/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ content/browser/BUILD.gn -@@ -2491,6 +2491,13 @@ source_set("browser") { +@@ -2338,6 +2338,13 @@ source_set("browser") { ] } @@ -12,5 +12,5 @@ + } + if (is_chromeos) { - deps += [ "//components/value_store:value_store" ] sources += [ + "handwriting/handwriting_recognition_service_impl_cros.cc", diff --git a/www/iridium/files/patch-content_browser_audio_audio__service.cc b/www/iridium/files/patch-content_browser_audio_audio__service.cc new file mode 100644 index 0000000000000..d02b97e56c07f --- /dev/null +++ b/www/iridium/files/patch-content_browser_audio_audio__service.cc @@ -0,0 +1,20 @@ +--- content/browser/audio/audio_service.cc.orig 2023-01-17 19:19:00 UTC ++++ content/browser/audio/audio_service.cc +@@ -33,7 +33,7 @@ + #if BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS) + #include "ui/display/util/edid_parser.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/display/display_util.h" + #endif // BUILDFLAG(IS_LINUX) + +@@ -213,7 +213,7 @@ audio::mojom::AudioService& GetAudioService() { + ->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&ScanEdidBitstreams), + base::BindOnce(&LaunchAudioService, std::move(receiver))); +-#elif BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS) && BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + LaunchAudioService( + std::move(receiver), + ConvertEdidBitstreams(display::DisplayUtil::GetAudioFormats())); diff --git a/www/iridium/files/patch-content_browser_browser__url__handler__impl.cc b/www/iridium/files/patch-content_browser_browser__url__handler__impl.cc index 50c2143f42cad..9351d23ad1dfe 100644 --- a/www/iridium/files/patch-content_browser_browser__url__handler__impl.cc +++ b/www/iridium/files/patch-content_browser_browser__url__handler__impl.cc @@ -1,4 +1,4 @@ ---- content/browser/browser_url_handler_impl.cc.orig 2022-10-05 07:34:01 UTC +--- content/browser/browser_url_handler_impl.cc.orig 2023-01-17 19:19:00 UTC +++ content/browser/browser_url_handler_impl.cc @@ -12,6 +12,7 @@ #include "content/browser/webui/web_ui_impl.h" @@ -8,14 +8,14 @@ #include "content/public/common/url_constants.h" #include "content/public/common/url_utils.h" #include "third_party/blink/public/common/chrome_debug_urls.h" -@@ -286,6 +287,10 @@ static void gfxlog_request2(const std::string &caller, +@@ -277,6 +278,10 @@ namespace iridium { - void gfxlog_request(const char *caller, const GURL &url) + static void gfxlog_request2(const std::string &caller, const GURL &url) { -+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); -+ if (!command_line->HasSwitch(switches::kTrk)) -+ return; ++ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); ++ if (!command_line->HasSwitch(switches::kTrk)) ++ return; + - textlog_request(caller, url); - if (url.scheme() != url::kTraceScheme && !url.is_trq()) + auto browser = chrome::FindLastActive(); + if (browser == nullptr) return; diff --git a/www/iridium/files/patch-content_browser_devtools_protocol_system__info__handler.cc b/www/iridium/files/patch-content_browser_devtools_protocol_system__info__handler.cc index efd6c202c9b2f..35e2ce5c0c06a 100644 --- a/www/iridium/files/patch-content_browser_devtools_protocol_system__info__handler.cc +++ b/www/iridium/files/patch-content_browser_devtools_protocol_system__info__handler.cc @@ -1,11 +1,11 @@ ---- content/browser/devtools/protocol/system_info_handler.cc.orig 2022-03-28 18:11:04 UTC +--- content/browser/devtools/protocol/system_info_handler.cc.orig 2023-01-17 19:19:00 UTC +++ content/browser/devtools/protocol/system_info_handler.cc -@@ -50,7 +50,7 @@ std::unique_ptr GfxSizeToSystemInfoS +@@ -49,7 +49,7 @@ std::unique_ptr GfxSizeToSystemInfoS + // 1046598, and 1153667. // Windows builds need more time -- see Issue 873112 and 1004472. // Mac builds need more time - see Issue angleproject:6182. - #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !defined(NDEBUG)) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || defined(USE_OZONE) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) +-#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !defined(NDEBUG)) || \ ++#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && !defined(NDEBUG)) || \ + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_OZONE) static constexpr int kGPUInfoWatchdogTimeoutMultiplierOS = 3; #else - static constexpr int kGPUInfoWatchdogTimeoutMultiplierOS = 1; diff --git a/www/iridium/files/patch-content_browser_download_download__manager__impl.cc b/www/iridium/files/patch-content_browser_download_download__manager__impl.cc deleted file mode 100644 index b175e161aca90..0000000000000 --- a/www/iridium/files/patch-content_browser_download_download__manager__impl.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- content/browser/download/download_manager_impl.cc.orig 2022-12-01 10:35:46 UTC -+++ content/browser/download/download_manager_impl.cc -@@ -92,7 +92,7 @@ - #include "third_party/blink/public/common/storage_key/storage_key.h" - #include "url/origin.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "base/nix/xdg_util.h" - #endif - -@@ -219,7 +219,7 @@ class DownloadItemFactoryImpl : public download::Downl - } - }; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - base::FilePath GetTemporaryDownloadDirectory() { - std::unique_ptr env(base::Environment::Create()); - return base::nix::GetXDGDirectory(env.get(), "XDG_DATA_HOME", ".local/share"); -@@ -655,7 +655,7 @@ bool DownloadManagerImpl::InterceptDownload( - - base::FilePath DownloadManagerImpl::GetDefaultDownloadDirectory() { - base::FilePath default_download_directory; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // TODO(thomasanderson,crbug.com/784010): Remove this when all Linux - // distros with versions of GTK lower than 3.14.7 are no longer - // supported. This should happen when support for Ubuntu Trusty and diff --git a/www/iridium/files/patch-content_browser_gpu_compositor__util.cc b/www/iridium/files/patch-content_browser_gpu_compositor__util.cc index 0f125cc35a6be..ea75e04d21998 100644 --- a/www/iridium/files/patch-content_browser_gpu_compositor__util.cc +++ b/www/iridium/files/patch-content_browser_gpu_compositor__util.cc @@ -1,4 +1,4 @@ ---- content/browser/gpu/compositor_util.cc.orig 2022-10-05 07:34:01 UTC +--- content/browser/gpu/compositor_util.cc.orig 2023-01-17 19:19:00 UTC +++ content/browser/gpu/compositor_util.cc @@ -148,7 +148,7 @@ const GpuFeatureData GetGpuFeatureData( {"video_decode", @@ -6,10 +6,10 @@ gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE), -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - !base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux), - #else - command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode), -@@ -160,7 +160,7 @@ const GpuFeatureData GetGpuFeatureData( + !base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) || + #endif // BUILDFLAG(IS_LINUX) + command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode), +@@ -159,7 +159,7 @@ const GpuFeatureData GetGpuFeatureData( {"video_encode", SafeGetFeatureStatus(gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE), diff --git a/www/iridium/files/patch-content_browser_network__service__instance__impl.cc b/www/iridium/files/patch-content_browser_network__service__instance__impl.cc new file mode 100644 index 0000000000000..75037f0c41ee0 --- /dev/null +++ b/www/iridium/files/patch-content_browser_network__service__instance__impl.cc @@ -0,0 +1,20 @@ +--- content/browser/network_service_instance_impl.cc.orig 2023-01-17 19:19:00 UTC ++++ content/browser/network_service_instance_impl.cc +@@ -75,7 +75,7 @@ + #include "content/browser/network/network_service_process_tracker_win.h" + #endif + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "content/browser/system_dns_resolution/system_dns_resolver.h" + #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h" + #endif +@@ -403,7 +403,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS + } + #endif // BUILDFLAG(IS_POSIX) + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled( + network::features::kOutOfProcessSystemDnsResolution) && + IsOutOfProcessNetworkService() && diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index 95da62772bfdd..c39ba954ddb01 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/iridium/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-12-06 08:09:13 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-01-17 19:19:00 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -213,7 +213,7 @@ +@@ -215,7 +215,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -1137,7 +1137,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1139,7 +1139,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits::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 +@@ -1226,7 +1226,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } @@ -27,7 +27,7 @@ if (auto font_receiver = receiver.As()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -2119,7 +2119,7 @@ void RenderProcessHostImpl::ReinitializeLogging( +@@ -2129,7 +2129,7 @@ void RenderProcessHostImpl::ReinitializeLogging( } #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -36,7 +36,7 @@ void RenderProcessHostImpl::CreateStableVideoDecoder( mojo::PendingReceiver receiver) { if (!stable_video_decoder_factory_remote_.is_bound()) { -@@ -3269,6 +3269,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3284,6 +3284,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, @@ -45,7 +45,7 @@ switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, switches::kDisableWebGLImageChromium, -@@ -4742,7 +4744,7 @@ void RenderProcessHostImpl::ResetIPC() { +@@ -4757,7 +4759,7 @@ void RenderProcessHostImpl::ResetIPC() { coordinator_connector_receiver_.reset(); tracing_registration_.reset(); diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h index d8358dd695ea9..6b72fbbaf8920 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2022-12-06 08:09:13 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2023-01-17 19:19:00 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -83,7 +83,7 @@ +@@ -84,7 +84,7 @@ #include "content/public/browser/android/child_process_importance.h" #endif @@ -9,7 +9,7 @@ #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -480,7 +480,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -484,7 +484,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) -@@ -679,7 +679,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -684,7 +684,7 @@ class CONTENT_EXPORT RenderProcessHostImpl mojo::PendingReceiver receiver) override; @@ -27,7 +27,7 @@ void CreateStableVideoDecoder( mojo::PendingReceiver receiver) override; -@@ -1134,7 +1134,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -1139,7 +1139,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // RenderProcessHost. This is destroyed early in ResetIPC() method. std::unique_ptr permission_service_context_; diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index 17bf6d66bc265..6a4ab0c17c29a 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2022-12-06 08:09:13 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-01-17 19:19:00 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -118,7 +118,7 @@ #include "ui/gfx/gdi_util.h" @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector& ui_ime_text_spans) { -@@ -2415,7 +2415,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2421,7 +2421,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2592,7 +2592,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2598,7 +2598,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h index 256ac1f7a369f..df3daa2695b18 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h +++ b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2022-10-05 07:34:01 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2023-01-17 19:19:00 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.h -@@ -245,7 +245,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -244,7 +244,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc b/www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc index 4cf63f2dc47dd..ed5439a245f00 100644 --- a/www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc +++ b/www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc @@ -1,11 +1,11 @@ ---- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2022-10-05 07:34:01 UTC +--- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2023-01-17 19:19:00 UTC +++ content/browser/scheduler/responsiveness/jank_monitor_impl.cc @@ -334,7 +334,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask // in context menus, among others). Simply ignore the mismatches for now. // See https://crbug.com/929813 for the details of why the mismatch // happens. --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && defined(USE_OZONE) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) && \ + BUILDFLAG(IS_OZONE) task_execution_metadata_.clear(); #endif - return; diff --git a/www/iridium/files/patch-content_browser_utility__sandbox__delegate.cc b/www/iridium/files/patch-content_browser_utility__sandbox__delegate.cc index d6acfe6350cb4..0e413dc7b0eea 100644 --- a/www/iridium/files/patch-content_browser_utility__sandbox__delegate.cc +++ b/www/iridium/files/patch-content_browser_utility__sandbox__delegate.cc @@ -1,6 +1,6 @@ ---- content/browser/utility_sandbox_delegate.cc.orig 2022-12-01 10:35:46 UTC +--- content/browser/utility_sandbox_delegate.cc.orig 2023-01-17 19:19:00 UTC +++ content/browser/utility_sandbox_delegate.cc -@@ -63,10 +63,10 @@ UtilitySandboxedProcessLauncherDelegate:: +@@ -63,13 +63,13 @@ UtilitySandboxedProcessLauncherDelegate:: #if BUILDFLAG(ENABLE_PPAPI) sandbox_type_ == sandbox::mojom::Sandbox::kPpapi || #endif @@ -12,8 +12,12 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding || + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -109,7 +109,7 @@ ZygoteHandle UtilitySandboxedProcessLauncherDelegate:: +@@ -112,10 +112,10 @@ ZygoteHandle UtilitySandboxedProcessLauncherDelegate:: // unsandboxed zygote and then apply their actual sandboxes in the forked // process upon startup. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork || @@ -21,4 +25,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding || + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura.cc index 66b1f0d65f3b6..0615c22600823 100644 --- a/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura.cc +++ b/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura.cc @@ -1,6 +1,6 @@ ---- content/browser/web_contents/web_contents_view_aura.cc.orig 2022-12-01 10:35:46 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2023-01-17 19:19:00 UTC +++ content/browser/web_contents/web_contents_view_aura.cc -@@ -176,7 +176,7 @@ class WebDragSourceAura : public content::WebContentsO +@@ -178,7 +178,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr window_; }; @@ -9,7 +9,7 @@ // Fill out the OSExchangeData with a file contents, synthesizing a name if // necessary. void PrepareDragForFileContents(const DropData& drop_data, -@@ -259,7 +259,7 @@ void PrepareDragData(const DropData& drop_data, +@@ -261,7 +261,7 @@ void PrepareDragData(const DropData& drop_data, if (!drop_data.download_metadata.empty()) PrepareDragForDownload(drop_data, provider, web_contents); #endif @@ -18,7 +18,7 @@ // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over // a shortcut so we add it first. -@@ -1365,7 +1365,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1368,7 +1368,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* // Linux window managers like to handle raise-on-click themselves. If we // raise-on-click manually, this may override user settings that prevent // focus-stealing. diff --git a/www/iridium/files/patch-content_common_BUILD.gn b/www/iridium/files/patch-content_common_BUILD.gn index 56d272ae488ec..7fca76c6cb8bc 100644 --- a/www/iridium/files/patch-content_common_BUILD.gn +++ b/www/iridium/files/patch-content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/common/BUILD.gn.orig 2022-12-01 10:35:46 UTC +--- content/common/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ content/common/BUILD.gn -@@ -430,6 +430,9 @@ if (is_linux || is_chromeos) { +@@ -433,6 +433,9 @@ if (is_linux || is_chromeos) { public = [ "set_process_title_linux.h" ] sources = [ "set_process_title_linux.cc" ] deps = [ "//base" ] diff --git a/www/iridium/files/patch-content_gpu_gpu__main.cc b/www/iridium/files/patch-content_gpu_gpu__main.cc index 61f2a9752e19c..835e7ae186f5a 100644 --- a/www/iridium/files/patch-content_gpu_gpu__main.cc +++ b/www/iridium/files/patch-content_gpu_gpu__main.cc @@ -1,4 +1,4 @@ ---- content/gpu/gpu_main.cc.orig 2022-12-06 08:09:13 UTC +--- content/gpu/gpu_main.cc.orig 2023-01-17 19:19:00 UTC +++ content/gpu/gpu_main.cc @@ -87,7 +87,7 @@ #include "sandbox/win/src/sandbox.h" @@ -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" -@@ -109,7 +109,7 @@ namespace content { +@@ -108,7 +108,7 @@ namespace content { namespace { @@ -18,7 +18,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -171,7 +171,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -170,7 +170,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_); -@@ -268,7 +268,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -267,7 +267,7 @@ int GpuMain(MainFunctionParams parameters) { std::make_unique( 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 -@@ -403,7 +403,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -402,7 +402,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { diff --git a/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc b/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc index 90ff8bc2a152c..e464deb524342 100644 --- a/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc +++ b/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc @@ -1,7 +1,7 @@ ---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2022-12-06 08:09:13 UTC +--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2023-01-17 19:19:00 UTC +++ content/gpu/gpu_sandbox_hook_linux.cc @@ -126,6 +126,7 @@ void AddStandardChromeOsPermissions( - permissions->push_back(BrokerFilePermission::ReadOnly(kAngleGlesPath)); + } } +#if !defined(OS_BSD) diff --git a/www/iridium/files/patch-content_public_browser_render__process__host.h b/www/iridium/files/patch-content_public_browser_render__process__host.h index afd1b63ed24a6..e0b542ab3e1d1 100644 --- a/www/iridium/files/patch-content_public_browser_render__process__host.h +++ b/www/iridium/files/patch-content_public_browser_render__process__host.h @@ -1,6 +1,6 @@ ---- content/public/browser/render_process_host.h.orig 2022-12-06 08:09:13 UTC +--- content/public/browser/render_process_host.h.orig 2023-01-17 19:19:00 UTC +++ content/public/browser/render_process_host.h -@@ -53,7 +53,7 @@ +@@ -54,7 +54,7 @@ #include "content/public/browser/android/child_process_importance.h" #endif @@ -9,7 +9,7 @@ #include "media/mojo/mojom/stable/stable_video_decoder.mojom-forward.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -618,7 +618,7 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::S +@@ -629,7 +629,7 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::S const blink::StorageKey& storage_key, mojo::PendingReceiver receiver) = 0; diff --git a/www/iridium/files/patch-content_public_common_content__features.cc b/www/iridium/files/patch-content_public_common_content__features.cc index 6189a7951cd03..1aac07e76cd9d 100644 --- a/www/iridium/files/patch-content_public_common_content__features.cc +++ b/www/iridium/files/patch-content_public_common_content__features.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_features.cc.orig 2022-12-06 08:09:13 UTC +--- content/public/common/content_features.cc.orig 2023-01-17 19:19:00 UTC +++ content/public/common/content_features.cc -@@ -46,7 +46,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, +@@ -41,7 +41,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, "AudioServiceOutOfProcess", // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -58,7 +58,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, +@@ -53,7 +53,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, // kAudioServiceOutOfProcess feature is enabled. BASE_FEATURE(kAudioServiceSandbox, "AudioServiceSandbox", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1228,7 +1228,7 @@ BASE_FEATURE(kWebAssemblyCodeProtection, +@@ -1251,7 +1251,7 @@ BASE_FEATURE(kWebAssemblyCodeProtection, "WebAssemblyCodeProtection", base::FEATURE_DISABLED_BY_DEFAULT); @@ -27,7 +27,7 @@ // Use memory protection keys in userspace (PKU) (if available) to protect code // JITed for WebAssembly. Fall back to traditional memory protection if // WebAssemblyCodeProtection is also enabled. -@@ -1270,7 +1270,7 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1287,7 +1287,7 @@ BASE_FEATURE(kWebAssemblyTiering, BASE_FEATURE(kWebAssemblyTrapHandler, "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -36,7 +36,7 @@ defined(ARCH_CPU_X86_64)) || \ (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -1345,7 +1345,11 @@ BASE_FEATURE(kWebUIReportOnlyTrustedTypes, +@@ -1362,7 +1362,11 @@ BASE_FEATURE(kWebUIReportOnlyTrustedTypes, // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb diff --git a/www/iridium/files/patch-content_public_common_content__features.h b/www/iridium/files/patch-content_public_common_content__features.h index dccfae4ce7122..5a655f330d142 100644 --- a/www/iridium/files/patch-content_public_common_content__features.h +++ b/www/iridium/files/patch-content_public_common_content__features.h @@ -1,7 +1,7 @@ ---- content/public/common/content_features.h.orig 2022-12-06 08:09:13 UTC +--- content/public/common/content_features.h.orig 2023-01-17 19:19:00 UTC +++ content/public/common/content_features.h -@@ -272,7 +272,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kV8VmFuture); - CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAppWindowControlsOverlay); +@@ -272,7 +272,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kVideoPlaybackQual + CONTENT_EXPORT BASE_DECLARE_FEATURE(kV8VmFuture); CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyBaseline); CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebAssemblyCodeProtection); -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) diff --git a/www/iridium/files/patch-content_public_test_mock__render__process__host.h b/www/iridium/files/patch-content_public_test_mock__render__process__host.h index 17d7691e13581..bfebbb35a1546 100644 --- a/www/iridium/files/patch-content_public_test_mock__render__process__host.h +++ b/www/iridium/files/patch-content_public_test_mock__render__process__host.h @@ -1,6 +1,6 @@ ---- content/public/test/mock_render_process_host.h.orig 2022-12-01 10:35:46 UTC +--- content/public/test/mock_render_process_host.h.orig 2023-01-17 19:19:00 UTC +++ content/public/test/mock_render_process_host.h -@@ -263,7 +263,7 @@ class MockRenderProcessHost : public RenderProcessHost +@@ -267,7 +267,7 @@ class MockRenderProcessHost : public RenderProcessHost const blink::StorageKey& storage_key, mojo::PendingReceiver receiver) override {} diff --git a/www/iridium/files/patch-content_public_test_mock__render__thread.cc b/www/iridium/files/patch-content_public_test_mock__render__thread.cc index a71433ef0a25e..4e3000f340780 100644 --- a/www/iridium/files/patch-content_public_test_mock__render__thread.cc +++ b/www/iridium/files/patch-content_public_test_mock__render__thread.cc @@ -1,6 +1,6 @@ ---- content/public/test/mock_render_thread.cc.orig 2022-12-06 08:09:13 UTC +--- content/public/test/mock_render_thread.cc.orig 2023-01-17 19:19:00 UTC +++ content/public/test/mock_render_thread.cc -@@ -64,7 +64,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend +@@ -65,7 +65,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend std::move(callback).Run(false); } diff --git a/www/iridium/files/patch-content_renderer_render__process__impl.cc b/www/iridium/files/patch-content_renderer_render__process__impl.cc index 8ba7c92b3c5dc..20f882f95957c 100644 --- a/www/iridium/files/patch-content_renderer_render__process__impl.cc +++ b/www/iridium/files/patch-content_renderer_render__process__impl.cc @@ -1,4 +1,4 @@ ---- content/renderer/render_process_impl.cc.orig 2022-12-06 08:09:13 UTC +--- content/renderer/render_process_impl.cc.orig 2023-01-17 19:19:00 UTC +++ content/renderer/render_process_impl.cc @@ -46,7 +46,7 @@ #if BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ SetV8FlagIfFeature(features::kWebAssemblyCodeProtectionPku, "--wasm-memory-protection-keys"); SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtectionPku, -@@ -228,7 +228,7 @@ RenderProcessImpl::RenderProcessImpl() +@@ -224,7 +224,7 @@ RenderProcessImpl::RenderProcessImpl() SetV8FlagIfNotFeature(features::kWebAssemblyDynamicTiering, "--no-wasm-dynamic-tiering"); diff --git a/www/iridium/files/patch-content_renderer_render__thread__impl.cc b/www/iridium/files/patch-content_renderer_render__thread__impl.cc index 75d9d5af09021..521bb9d20d5ce 100644 --- a/www/iridium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/iridium/files/patch-content_renderer_render__thread__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_thread_impl.cc.orig 2022-12-06 08:09:13 UTC +--- content/renderer/render_thread_impl.cc.orig 2023-01-17 19:19:00 UTC +++ content/renderer/render_thread_impl.cc -@@ -193,7 +193,7 @@ +@@ -194,7 +194,7 @@ #if BUILDFLAG(IS_MAC) #include @@ -9,7 +9,7 @@ #include #endif -@@ -658,7 +658,7 @@ void RenderThreadImpl::Init() { +@@ -665,7 +665,7 @@ void RenderThreadImpl::Init() { base::DiscardableMemoryAllocator::SetInstance( discardable_memory_allocator_.get()); @@ -18,16 +18,16 @@ render_message_filter()->SetThreadType( ChildProcess::current()->io_thread_id(), base::ThreadType::kCompositing); #endif -@@ -1029,7 +1029,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1043,7 +1043,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: + kGpuStreamPriorityMedia); const bool enable_video_decode_accelerator = - -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && - #else + #endif // BUILDFLAG(IS_LINUX) !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1040,7 +1040,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1053,7 +1053,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: const bool enable_video_encode_accelerator = diff --git a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc index c11efcc4a32f9..626f35929c264 100644 --- a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2022-12-06 08:09:13 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2023-01-17 19:19:00 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -110,7 +110,7 @@ +@@ -112,7 +112,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 -@@ -180,7 +180,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -182,7 +182,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; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -190,7 +190,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -192,7 +192,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -27,7 +27,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique(); -@@ -261,7 +261,7 @@ RendererBlinkPlatformImpl::WrapURLLoaderFactory( +@@ -263,7 +263,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()) { -@@ -272,7 +272,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -274,7 +274,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl #endif blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h index 0e9b985921818..bcba62e2e8f7e 100644 --- a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2022-12-06 08:09:13 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2023-01-17 19:19:00 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -29,7 +29,7 @@ +@@ -30,7 +30,7 @@ #include "third_party/blink/public/common/user_agent/user_agent_metadata.h" #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -171,7 +171,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -172,7 +172,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi const blink::WebURL& top_document_web_url) override; gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; blink::WebString ConvertIDNToUnicode(const blink::WebString& host) override; @@ -18,7 +18,7 @@ void SetThreadType(base::PlatformThreadId thread_id, base::ThreadType) override; #endif -@@ -237,7 +237,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -240,7 +240,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 sandbox_support_; #endif -@@ -257,7 +257,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -260,7 +260,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/iridium/files/patch-content_shell_BUILD.gn b/www/iridium/files/patch-content_shell_BUILD.gn index 0c661e1be3533..d42d9aa1da8f4 100644 --- a/www/iridium/files/patch-content_shell_BUILD.gn +++ b/www/iridium/files/patch-content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- content/shell/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- content/shell/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ content/shell/BUILD.gn -@@ -903,7 +903,7 @@ group("content_shell_crash_test") { +@@ -901,7 +901,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/iridium/files/patch-content_shell_utility_shell__content__utility__client.cc b/www/iridium/files/patch-content_shell_utility_shell__content__utility__client.cc index 5e4b7b70f9bb1..c84155dff55fc 100644 --- a/www/iridium/files/patch-content_shell_utility_shell__content__utility__client.cc +++ b/www/iridium/files/patch-content_shell_utility_shell__content__utility__client.cc @@ -1,6 +1,6 @@ ---- content/shell/utility/shell_content_utility_client.cc.orig 2022-12-01 10:35:46 UTC +--- content/shell/utility/shell_content_utility_client.cc.orig 2023-01-17 19:19:00 UTC +++ content/shell/utility/shell_content_utility_client.cc -@@ -33,7 +33,7 @@ +@@ -34,7 +34,7 @@ #include "sandbox/policy/sandbox.h" #include "services/test/echo/echo_service.h" @@ -9,7 +9,7 @@ #include "content/test/sandbox_status_service.h" #endif -@@ -146,7 +146,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrow +@@ -155,7 +155,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrow binders->Add( base::BindRepeating(&PowerMonitorTestImpl::MakeSelfOwnedReceiver), base::ThreadTaskRunnerHandle::Get()); diff --git a/www/iridium/files/patch-content_test_BUILD.gn b/www/iridium/files/patch-content_test_BUILD.gn index f640b46bc235b..c519fdb2f6cec 100644 --- a/www/iridium/files/patch-content_test_BUILD.gn +++ b/www/iridium/files/patch-content_test_BUILD.gn @@ -1,6 +1,6 @@ ---- content/test/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- content/test/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ content/test/BUILD.gn -@@ -2089,7 +2089,7 @@ static_library("run_all_unittests") { +@@ -2038,7 +2038,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -9,7 +9,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -3071,7 +3071,7 @@ test("content_unittests") { +@@ -3031,7 +3031,7 @@ test("content_unittests") { deps += [ "//third_party/boringssl" ] } diff --git a/www/iridium/files/patch-content_utility_services.cc b/www/iridium/files/patch-content_utility_services.cc index 39156fa5e6946..9896bf30e92c6 100644 --- a/www/iridium/files/patch-content_utility_services.cc +++ b/www/iridium/files/patch-content_utility_services.cc @@ -1,6 +1,6 @@ ---- content/utility/services.cc.orig 2022-12-06 08:09:13 UTC +--- content/utility/services.cc.orig 2023-01-17 19:19:00 UTC +++ content/utility/services.cc -@@ -66,7 +66,7 @@ +@@ -64,7 +64,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" -@@ -88,7 +88,7 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -86,7 +86,7 @@ extern sandbox::TargetServices* g_utility_target_servi #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -18,7 +18,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) #include "media/mojo/services/stable_video_decoder_factory_service.h" // nogncheck #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && -@@ -211,7 +211,7 @@ auto RunAudio(mojo::PendingReceiver -@@ -380,7 +380,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -365,7 +365,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) diff --git a/www/iridium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc b/www/iridium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc index c604fbcf941fb..a551228dc86ef 100644 --- a/www/iridium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc +++ b/www/iridium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc @@ -1,17 +1,17 @@ ---- content/utility/speech/speech_recognition_sandbox_hook_linux.cc.orig 2022-03-28 18:11:04 UTC +--- content/utility/speech/speech_recognition_sandbox_hook_linux.cc.orig 2023-01-17 19:19:00 UTC +++ content/utility/speech/speech_recognition_sandbox_hook_linux.cc @@ -12,11 +12,14 @@ #include "sandbox/linux/syscall_broker/broker_command.h" #include "sandbox/linux/syscall_broker/broker_file_permission.h" -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) using sandbox::syscall_broker::BrokerFilePermission; using sandbox::syscall_broker::MakeBrokerCommandSet; +#endif namespace speech { -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) namespace { // Gets the file permissions required by the Speech On-Device API (SODA). @@ -23,8 +23,8 @@ bool SpeechRecognitionPreSandboxHook( sandbox::policy::SandboxLinux::Options options) { -+#if !defined(OS_BSD) - #if BUILDFLAG(ENABLE_SODA) ++#if !BUILDFLAG(IS_BSD) + #if BUILDFLAG(ENABLE_SODA_INTEGRATION_TESTS) base::FilePath test_binary_path = GetSodaTestBinaryPath(); DVLOG(0) << "SODA test binary path: " << test_binary_path.value().c_str(); @@ -77,6 +82,7 @@ bool SpeechRecognitionPreSandboxHook( diff --git a/www/iridium/files/patch-content_utility_utility__main.cc b/www/iridium/files/patch-content_utility_utility__main.cc index b35764c6058c8..9016789e1faee 100644 --- a/www/iridium/files/patch-content_utility_utility__main.cc +++ b/www/iridium/files/patch-content_utility_utility__main.cc @@ -1,12 +1,15 @@ ---- content/utility/utility_main.cc.orig 2022-12-06 08:09:13 UTC +--- content/utility/utility_main.cc.orig 2023-01-17 19:19:00 UTC +++ content/utility/utility_main.cc -@@ -31,17 +31,19 @@ +@@ -31,7 +31,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" #include "third_party/icu/source/i18n/unicode/timezone.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "content/utility/speech/speech_recognition_sandbox_hook_linux.h" + #include "gpu/config/gpu_info_collector.h" + #include "media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h" +@@ -42,15 +42,21 @@ #if BUILDFLAG(ENABLE_PRINTING) #include "printing/sandbox/print_backend_sandbox_hook_linux.h" #endif @@ -19,11 +22,7 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - #include "gpu/config/gpu_info_collector.h" #include "media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h" - -@@ -50,6 +52,10 @@ - #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_BSD) @@ -31,9 +30,31 @@ +#endif + #if BUILDFLAG(IS_CHROMEOS_ASH) - #include "ash/services/ime/ime_sandbox_hook.h" #include "chromeos/ash/components/assistant/buildflags.h" -@@ -130,7 +136,7 @@ int UtilityMain(MainFunctionParams parameters) { + #include "chromeos/ash/services/ime/ime_sandbox_hook.h" +@@ -62,7 +68,7 @@ + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + + #if (BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))) + #include "components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h" // nogncheck + #endif + +@@ -83,10 +89,10 @@ namespace content { + + namespace { + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox sandbox_type) { + const bool obtain_gpu_info = +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding || + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) + sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding; +@@ -156,7 +162,7 @@ int UtilityMain(MainFunctionParams parameters) { } } @@ -42,7 +63,7 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -158,7 +164,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -184,7 +190,7 @@ int UtilityMain(MainFunctionParams parameters) { pre_sandbox_hook = base::BindOnce(&screen_ai::ScreenAIPreSandboxHook); break; #endif @@ -51,7 +72,7 @@ case sandbox::mojom::Sandbox::kHardwareVideoDecoding: pre_sandbox_hook = base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); -@@ -181,10 +187,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -211,6 +217,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -59,12 +80,7 @@ if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { sandbox::policy::SandboxLinux::Options sandbox_options; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - if (sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding) { - // The kHardwareVideoDecoding sandbox needs to know the GPU type in order - // to select the right policy. -@@ -197,6 +204,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -219,6 +226,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } diff --git a/www/iridium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc b/www/iridium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc similarity index 56% rename from www/iridium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc rename to www/iridium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc index 141f92bd1351b..1441ac0402b1a 100644 --- a/www/iridium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc +++ b/www/iridium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc @@ -1,6 +1,6 @@ ---- extensions/browser/browser_context_keyed_service_factories.cc.orig 2022-10-05 07:34:01 UTC -+++ extensions/browser/browser_context_keyed_service_factories.cc -@@ -89,7 +89,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() +--- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2023-01-17 19:19:00 UTC ++++ extensions/browser/api/api_browser_context_keyed_service_factories.cc +@@ -71,7 +71,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt IdleManagerFactory::GetInstance(); ManagementAPI::GetFactoryInstance(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ diff --git a/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc index e46b7f3cae729..56f766c8c08fc 100644 --- a/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc +++ b/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2022-12-06 08:09:13 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2023-01-17 19:19:00 UTC +++ extensions/browser/api/messaging/message_service.cc -@@ -74,7 +74,7 @@ namespace { +@@ -70,7 +70,7 @@ namespace { const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -438,7 +438,7 @@ void MessageService::OpenChannelToNativeApp( +@@ -411,7 +411,7 @@ void MessageService::OpenChannelToNativeApp( return; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-extensions_browser_extension__prefs.cc b/www/iridium/files/patch-extensions_browser_extension__prefs.cc index b67d7b1e21df1..cbe9b205dc0f6 100644 --- a/www/iridium/files/patch-extensions_browser_extension__prefs.cc +++ b/www/iridium/files/patch-extensions_browser_extension__prefs.cc @@ -1,6 +1,6 @@ ---- extensions/browser/extension_prefs.cc.orig 2022-12-06 08:09:13 UTC +--- extensions/browser/extension_prefs.cc.orig 2023-01-17 19:19:00 UTC +++ extensions/browser/extension_prefs.cc -@@ -2287,7 +2287,7 @@ void ExtensionPrefs::RegisterProfilePrefs( +@@ -2273,7 +2273,7 @@ void ExtensionPrefs::RegisterProfilePrefs( registry->RegisterDictionaryPref(kInstallSignature); registry->RegisterListPref(kExternalUninstalls); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -8,4 +8,4 @@ + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(pref_names::kChromeAppsEnabled, false); #endif - registry->RegisterBooleanPref(pref_names::kU2fSecurityKeyApiEnabled, false); + diff --git a/www/iridium/files/patch-extensions_browser_pref__names.cc b/www/iridium/files/patch-extensions_browser_pref__names.cc index d6d038cf57653..eb2b035e92d9a 100644 --- a/www/iridium/files/patch-extensions_browser_pref__names.cc +++ b/www/iridium/files/patch-extensions_browser_pref__names.cc @@ -1,4 +1,4 @@ ---- extensions/browser/pref_names.cc.orig 2022-10-05 07:34:01 UTC +--- extensions/browser/pref_names.cc.orig 2023-01-17 19:19:00 UTC +++ extensions/browser/pref_names.cc @@ -48,7 +48,7 @@ const char kStorageGarbageCollect[] = "extensions.stor const char kDeletedComponentExtensions[] = @@ -8,4 +8,4 @@ + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) extern const char kChromeAppsEnabled[] = "extensions.chrome_apps_enabled"; #endif - const char kU2fSecurityKeyApiEnabled[] = + diff --git a/www/iridium/files/patch-extensions_common_api___permission__features.json b/www/iridium/files/patch-extensions_common_api___permission__features.json index 073bc64f001ee..a8d8d57209cfa 100644 --- a/www/iridium/files/patch-extensions_common_api___permission__features.json +++ b/www/iridium/files/patch-extensions_common_api___permission__features.json @@ -1,4 +1,4 @@ ---- extensions/common/api/_permission_features.json.orig 2022-10-05 07:34:01 UTC +--- extensions/common/api/_permission_features.json.orig 2023-01-17 19:19:00 UTC +++ extensions/common/api/_permission_features.json @@ -134,7 +134,7 @@ { @@ -9,7 +9,7 @@ "allowlist": [ "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169 "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169 -@@ -433,7 +433,7 @@ +@@ -429,7 +429,7 @@ }, { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], @@ -18,7 +18,7 @@ "allowlist": [ "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 -@@ -475,7 +475,7 @@ +@@ -471,7 +471,7 @@ "networkingPrivate": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], diff --git a/www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc index 90e956bceb121..ca9412e08229e 100644 --- a/www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc +++ b/www/iridium/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-12-06 08:09:13 UTC +--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2023-01-17 19:19:00 UTC +++ gpu/command_buffer/common/gpu_memory_buffer_support.cc -@@ -144,7 +144,7 @@ uint32_t GetPlatformSpecificTextureTarget() { +@@ -173,7 +173,7 @@ uint32_t GetPlatformSpecificTextureTarget() { #if BUILDFLAG(IS_MAC) return macos_specific_texture_target; #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || \ @@ -9,10 +9,10 @@ return GL_TEXTURE_EXTERNAL_OES; #elif BUILDFLAG(IS_FUCHSIA) return GL_TEXTURE_2D; -@@ -176,7 +176,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu +@@ -205,7 +205,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu gfx::BufferFormat format, gfx::BufferPlane plane) { - #if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ + #if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Always use GL_TEXTURE_2D as the target for RGB textures. diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc index 3a82007317cbe..27c3d14c629d0 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2022-12-06 08:09:13 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-01-17 19:19:00 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc @@ -32,7 +32,7 @@ #include "ui/gl/gl_version_info.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" #endif -@@ -570,7 +570,7 @@ std::unique_ptr ExternalVkIma +@@ -572,7 +572,7 @@ std::unique_ptr ExternalVkIma MemoryTypeTracker* tracker, WGPUDevice wgpuDevice, WGPUBackendType backend_type) { diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc index a470da7e05914..5d77829d7ccfd 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc @@ -1,11 +1,11 @@ ---- gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc.orig 2022-12-06 08:09:13 UTC +--- gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc.orig 2023-01-17 19:19:00 UTC +++ gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc -@@ -345,7 +345,7 @@ void GLTextureImageBacking::InitializeGLTexture( +@@ -346,7 +346,7 @@ void GLTextureImageBacking::InitializeGLTexture( } void GLTextureImageBacking::CreateEGLImage() { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) SharedContextState* shared_context_state = factory()->GetSharedContextState(); ui::ScopedMakeCurrent smc(shared_context_state->context(), shared_context_state->surface()); diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc index a5552a77af73a..89cc29a57810e 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc @@ -1,11 +1,11 @@ ---- gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc.orig 2022-12-06 08:09:13 UTC +--- gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc.orig 2023-01-17 19:19:00 UTC +++ gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc -@@ -164,7 +164,7 @@ bool GLTextureImageBackingFactory::IsSupported( +@@ -165,7 +165,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) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) if (use_webgpu_adapter_ != WebGPUAdapterName::kCompat) { return false; } diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc index 2c0b5c6f38f8f..88458a02032ba 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc +++ b/www/iridium/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-12-06 08:09:13 UTC +--- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc.orig 2023-01-17 19:19:00 UTC +++ gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc -@@ -238,7 +238,7 @@ class WrappedSkImage : public ClearTrackingSharedImage +@@ -237,7 +237,7 @@ class WrappedSkImage : public ClearTrackingSharedImage : GrMipMapped::kNo; const std::string label = "WrappedSkImageBackingFactory_Initialize" + CreateLabelForSharedImageUsage(usage()); diff --git a/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc index 0c522ab85e38c..280901c26b448 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2022-12-06 08:09:13 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-01-17 19:19:00 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1208,7 +1208,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1213,7 +1213,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( if (gr_context_type_ != GrContextType::kVulkan && use_webgpu_adapter_ != WebGPUAdapterName::kCompat) { diff --git a/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc b/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc index ac40d214f9930..dd063441ee2d5 100644 --- a/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc +++ b/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc @@ -1,11 +1,11 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2022-03-28 18:11:04 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2023-01-17 19:19:00 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.cc @@ -21,7 +21,7 @@ #include "ui/ozone/public/ozone_platform.h" #endif --#if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" #endif @@ -13,8 +13,8 @@ return gfx::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::ANDROID_HARDWARE_BUFFER; --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) return gfx::NATIVE_PIXMAP; #elif BUILDFLAG(IS_WIN) return gfx::DXGI_SHARED_HANDLE; diff --git a/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h b/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h index 2aa2694a5f9b9..6fbcf6e23e88d 100644 --- a/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h +++ b/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h @@ -1,11 +1,11 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2022-10-05 07:34:01 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2023-01-17 19:19:00 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.h @@ -18,7 +18,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) namespace gfx { class ClientNativePixmapFactory; } diff --git a/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h b/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h index 5fd73442bffa9..d1cd332fed752 100644 --- a/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h +++ b/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h @@ -1,7 +1,7 @@ ---- headless/lib/browser/headless_content_browser_client.h.orig 2022-03-28 18:11:04 UTC +--- headless/lib/browser/headless_content_browser_client.h.orig 2023-01-17 19:19:00 UTC +++ headless/lib/browser/headless_content_browser_client.h -@@ -47,7 +47,7 @@ class HeadlessContentBrowserClient : public content::C - override; +@@ -45,7 +45,7 @@ class HeadlessContentBrowserClient : public content::C + CreateDevToolsManagerDelegate() override; content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings( content::BrowserContext* context) override; -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-ipc_ipc__channel__mojo.cc b/www/iridium/files/patch-ipc_ipc__channel__mojo.cc index 275b817438ad4..301235ac4f114 100644 --- a/www/iridium/files/patch-ipc_ipc__channel__mojo.cc +++ b/www/iridium/files/patch-ipc_ipc__channel__mojo.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_channel_mojo.cc.orig 2022-03-28 18:11:04 UTC +--- ipc/ipc_channel_mojo.cc.orig 2023-01-17 19:19:00 UTC +++ ipc/ipc_channel_mojo.cc -@@ -112,7 +112,7 @@ class ThreadSafeChannelProxy : public mojo::ThreadSafe +@@ -113,7 +113,7 @@ class ThreadSafeChannelProxy : public mojo::ThreadSafe }; base::ProcessId GetSelfPID() { diff --git a/www/iridium/files/patch-media_BUILD.gn b/www/iridium/files/patch-media_BUILD.gn index ab6a31fd6875a..58b78b1ec6389 100644 --- a/www/iridium/files/patch-media_BUILD.gn +++ b/www/iridium/files/patch-media_BUILD.gn @@ -1,6 +1,6 @@ ---- media/BUILD.gn.orig 2022-12-01 10:35:46 UTC +--- media/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ media/BUILD.gn -@@ -78,6 +78,9 @@ config("media_config") { +@@ -82,6 +82,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } diff --git a/www/iridium/files/patch-media_audio_BUILD.gn b/www/iridium/files/patch-media_audio_BUILD.gn index d05bf7fd6ce39..6d9f003639f91 100644 --- a/www/iridium/files/patch-media_audio_BUILD.gn +++ b/www/iridium/files/patch-media_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- media/audio/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- media/audio/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ media/audio/BUILD.gn -@@ -259,9 +259,20 @@ source_set("audio") { +@@ -248,9 +248,20 @@ source_set("audio") { ] } diff --git a/www/iridium/files/patch-media_base_media__switches.cc b/www/iridium/files/patch-media_base_media__switches.cc index 2d2fcee9135c5..5ff9c6f4dde30 100644 --- a/www/iridium/files/patch-media_base_media__switches.cc +++ b/www/iridium/files/patch-media_base_media__switches.cc @@ -1,6 +1,6 @@ ---- media/base/media_switches.cc.orig 2022-12-06 08:09:13 UTC +--- media/base/media_switches.cc.orig 2023-01-17 19:19:00 UTC +++ media/base/media_switches.cc -@@ -10,7 +10,7 @@ +@@ -12,7 +12,7 @@ #include "components/system_media_controls/linux/buildflags/buildflags.h" #include "media/media_buildflags.h" @@ -9,7 +9,7 @@ #include "base/cpu.h" #endif -@@ -485,7 +485,7 @@ BASE_FEATURE(kGav1VideoDecoder, +@@ -494,7 +494,7 @@ BASE_FEATURE(kGav1VideoDecoder, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -526,7 +526,7 @@ constexpr base::FeatureParam GetDefaultLayo +@@ -306,7 +306,7 @@ static absl::optional GetDefaultLayo return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); } @@ -27,7 +27,7 @@ // This class allows us to embed a vector into a scoped_refptr, and // thus to have several VideoFrames share the same set of DMABUF FDs. class VideoFrame::DmabufHolder -@@ -625,7 +625,7 @@ scoped_refptr VideoFrame::WrapExternalGpuM +@@ -646,7 +646,7 @@ scoped_refptr 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() || -@@ -671,7 +671,7 @@ scoped_refptr VideoFrame::WrapExternalGpuM +@@ -692,7 +692,7 @@ scoped_refptr VideoFrame::WrapExternalGpuM return frame; } @@ -45,7 +45,7 @@ // static scoped_refptr VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -888,7 +888,7 @@ scoped_refptr VideoFrame::WrapVideoFrame( +@@ -910,7 +910,7 @@ scoped_refptr 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_; -@@ -1275,7 +1275,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( +@@ -1301,7 +1301,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( : mailbox_holders_[texture_index]; } @@ -63,7 +63,7 @@ const std::vector& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1387,7 +1387,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1413,7 +1413,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/iridium/files/patch-media_base_video__frame.h b/www/iridium/files/patch-media_base_video__frame.h index dc1425bbdb7b3..9a2865eab4583 100644 --- a/www/iridium/files/patch-media_base_video__frame.h +++ b/www/iridium/files/patch-media_base_video__frame.h @@ -1,6 +1,6 @@ ---- media/base/video_frame.h.orig 2022-12-06 08:09:13 UTC +--- media/base/video_frame.h.orig 2023-01-17 19:19:00 UTC +++ media/base/video_frame.h -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ #include "base/mac/scoped_cftyperef.h" #endif // BUILDFLAG(IS_MAC) @@ -9,7 +9,7 @@ #include "base/files/scoped_file.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -84,7 +84,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -86,7 +86,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer. STORAGE_SHMEM = 4, // Backed by read-only shared memory. @@ -18,7 +18,7 @@ // TODO(mcasas): Consider turning this type into STORAGE_NATIVE // based on the idea of using this same enum value for both DMA // buffers on Linux and CVPixelBuffers on Mac (which currently use -@@ -279,7 +279,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -281,7 +281,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb, base::TimeDelta timestamp); @@ -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 -@@ -548,7 +548,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -550,7 +550,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 -@@ -755,7 +755,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -763,7 +763,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER. std::unique_ptr gpu_memory_buffer_; diff --git a/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc index e210d5b562ab8..b361c8b74ff65 100644 --- a/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc +++ b/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2022-12-06 08:09:13 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-01-17 19:19:00 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -767,7 +767,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -768,7 +768,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()); -@@ -789,7 +789,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -790,7 +790,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( #error "Unsupported platform" #endif diff --git a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc new file mode 100644 index 0000000000000..e74ba7f9e93c3 --- /dev/null +++ b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc @@ -0,0 +1,30 @@ +--- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc.orig 2023-01-17 19:19:00 UTC ++++ media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc +@@ -18,12 +18,15 @@ + #include "media/gpu/v4l2/v4l2_device.h" + #endif + ++#if !BUILDFLAG(IS_BSD) + using sandbox::syscall_broker::BrokerFilePermission; ++#endif + + namespace media { + + bool HardwareVideoEncodingPreSandboxHook( + sandbox::policy::SandboxLinux::Options options) { ++#if !BUILDFLAG(IS_BSD) + sandbox::syscall_broker::BrokerCommandSet command_set; + std::vector permissions; + +@@ -125,8 +128,8 @@ bool HardwareVideoEncodingPreSandboxHook( + #endif // defined(__aarch64__) + } + #endif +- ++#endif + return true; + } + +-} // namespace media +\ No newline at end of file ++} // namespace media diff --git a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h new file mode 100644 index 0000000000000..6c975cf27eeda --- /dev/null +++ b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h @@ -0,0 +1,23 @@ +--- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h.orig 2023-01-17 19:19:00 UTC ++++ media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h +@@ -5,7 +5,13 @@ + #ifndef MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_ENCODING_SANDBOX_HOOK_LINUX_H_ + #define MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_ENCODING_SANDBOX_HOOK_LINUX_H_ + ++#include "build/build_config.h" ++ ++#if BUILDFLAG(IS_BSD) ++#include "sandbox/policy/openbsd/sandbox_openbsd.h" ++#else + #include "sandbox/policy/linux/sandbox_linux.h" ++#endif + + namespace media { + +@@ -14,4 +20,4 @@ bool HardwareVideoEncodingPreSandboxHook( + + } // namespace media + +-#endif // MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_ENCODING_SANDBOX_HOOK_LINUX_H_ +\ No newline at end of file ++#endif // MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_ENCODING_SANDBOX_HOOK_LINUX_H_ diff --git a/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc b/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc index a9d584cd6a5ed..0924ac7a29fee 100644 --- a/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc +++ b/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc @@ -1,11 +1,11 @@ ---- media/gpu/vaapi/vaapi_wrapper.cc.orig 2022-12-06 08:09:13 UTC +--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2023-01-17 19:19:00 UTC +++ media/gpu/vaapi/vaapi_wrapper.cc @@ -740,7 +740,7 @@ VADisplayState::VADisplayState() bool VADisplayState::Initialize() { base::AutoLock auto_lock(va_lock_); --#if defined(USE_OZONE) && BUILDFLAG(IS_LINUX) -+#if defined(USE_OZONE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) +-#if BUILDFLAG(IS_OZONE) && BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_OZONE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) // TODO(crbug.com/1116701): add vaapi support for other Ozone platforms on // Linux. See comment in OzonePlatform::PlatformProperties::supports_vaapi // for more details. This will also require revisiting everything that's diff --git a/www/iridium/files/patch-media_media__options.gni b/www/iridium/files/patch-media_media__options.gni index 410a6a987393a..97f33964ac120 100644 --- a/www/iridium/files/patch-media_media__options.gni +++ b/www/iridium/files/patch-media_media__options.gni @@ -1,6 +1,6 @@ ---- media/media_options.gni.orig 2022-12-01 10:35:46 UTC +--- media/media_options.gni.orig 2023-01-17 19:19:00 UTC +++ media/media_options.gni -@@ -167,12 +167,15 @@ declare_args() { +@@ -160,12 +160,15 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false @@ -17,7 +17,7 @@ (!is_castos || (target_cpu == "x86" || target_cpu == "x64") || is_cast_audio_only)) { use_alsa = true -@@ -188,6 +191,10 @@ declare_args() { +@@ -181,6 +184,10 @@ declare_args() { if (!use_cras && !is_castos && !is_asan && !is_tsan) { use_pulseaudio = true } diff --git a/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index 06c869b17ac0b..f0931aaa0e162 100644 --- a/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/iridium/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-12-06 08:09:13 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2023-01-17 19:19:00 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -732,7 +732,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -735,7 +735,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 -@@ -1160,7 +1160,7 @@ scoped_refptr GpuMemoryBufferVideoFramePoo +@@ -1164,7 +1164,7 @@ scoped_refptr GpuMemoryBufferVideoFramePoo is_webgpu_compatible = (gpu_memory_buffer != nullptr); #endif @@ -18,7 +18,7 @@ is_webgpu_compatible = (gpu_memory_buffer != nullptr); if (is_webgpu_compatible) { is_webgpu_compatible &= -@@ -1179,7 +1179,7 @@ scoped_refptr GpuMemoryBufferVideoFramePoo +@@ -1183,7 +1183,7 @@ scoped_refptr GpuMemoryBufferVideoFramePoo gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | gpu::SHARED_IMAGE_USAGE_SCANOUT; diff --git a/www/iridium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/iridium/files/patch-media_video_video__encode__accelerator__adapter.cc index c2a780f453dc1..db60aace997a7 100644 --- a/www/iridium/files/patch-media_video_video__encode__accelerator__adapter.cc +++ b/www/iridium/files/patch-media_video_video__encode__accelerator__adapter.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter.cc.orig 2022-12-01 10:35:46 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2023-01-17 19:19:00 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -130,7 +130,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( +@@ -135,7 +135,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( if (is_rgb) config.input_format = PIXEL_FORMAT_I420; @@ -9,7 +9,7 @@ if (format != PIXEL_FORMAT_I420 || !VideoFrame::IsStorageTypeMappable(storage_type)) { // ChromeOS/Linux hardware video encoders supports I420 on-memory -@@ -441,7 +441,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -453,7 +453,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal SetUpVeaConfig(profile_, options_, format, first_frame->storage_type(), supported_rc_modes_); diff --git a/www/iridium/files/patch-media_video_video__encode__accelerator__adapter__test.cc b/www/iridium/files/patch-media_video_video__encode__accelerator__adapter__test.cc index 085f1cc91c31c..05b97077ba46f 100644 --- a/www/iridium/files/patch-media_video_video__encode__accelerator__adapter__test.cc +++ b/www/iridium/files/patch-media_video_video__encode__accelerator__adapter__test.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter_test.cc.orig 2022-12-01 10:35:46 UTC +--- media/video/video_encode_accelerator_adapter_test.cc.orig 2023-01-17 19:19:00 UTC +++ media/video/video_encode_accelerator_adapter_test.cc -@@ -435,7 +435,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes +@@ -444,7 +444,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes CreateGreenFrame(large_size, pixel_format, base::Milliseconds(2)); VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420; diff --git a/www/iridium/files/patch-media_webrtc_audio__processor.cc b/www/iridium/files/patch-media_webrtc_audio__processor.cc index a7508abd3d052..ba25c41cdbcf8 100644 --- a/www/iridium/files/patch-media_webrtc_audio__processor.cc +++ b/www/iridium/files/patch-media_webrtc_audio__processor.cc @@ -1,6 +1,6 @@ ---- media/webrtc/audio_processor.cc.orig 2022-12-06 08:09:13 UTC +--- media/webrtc/audio_processor.cc.orig 2023-01-17 19:19:00 UTC +++ media/webrtc/audio_processor.cc -@@ -487,7 +487,7 @@ absl::optional AudioProcessor::ProcessData( +@@ -488,7 +488,7 @@ absl::optional 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/iridium/files/patch-media_webrtc_helpers.cc b/www/iridium/files/patch-media_webrtc_helpers.cc new file mode 100644 index 0000000000000..13700baf6ece2 --- /dev/null +++ b/www/iridium/files/patch-media_webrtc_helpers.cc @@ -0,0 +1,19 @@ +--- media/webrtc/helpers.cc.orig 2023-01-17 19:19:00 UTC ++++ media/webrtc/helpers.cc +@@ -17,14 +17,14 @@ + namespace media { + namespace { + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + constexpr bool kUseHybridAgc = true; + #else + constexpr bool kUseHybridAgc = false; + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + constexpr bool kUseClippingController = true; + #else + constexpr bool kUseClippingController = false; diff --git a/www/iridium/files/patch-media_webrtc_webrtc__features.cc b/www/iridium/files/patch-media_webrtc_webrtc__features.cc deleted file mode 100644 index eed6f395002cc..0000000000000 --- a/www/iridium/files/patch-media_webrtc_webrtc__features.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- media/webrtc/webrtc_features.cc.orig 2022-10-05 07:34:01 UTC -+++ media/webrtc/webrtc_features.cc -@@ -9,7 +9,7 @@ - - namespace features { - namespace { --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - constexpr base::FeatureState kWebRtcHybridAgcState = - base::FEATURE_ENABLED_BY_DEFAULT; - #else -@@ -19,7 +19,7 @@ constexpr base::FeatureState kWebRtcHybridAgcState = - } // namespace - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - constexpr base::FeatureState kWebRtcAnalogAgcClippingControlState = - base::FEATURE_ENABLED_BY_DEFAULT; - #else diff --git a/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni index b37c6b7cccc8c..fb5320bf50604 100644 --- a/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni +++ b/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni @@ -1,6 +1,6 @@ ---- mojo/public/tools/bindings/mojom.gni.orig 2022-10-05 07:34:01 UTC +--- mojo/public/tools/bindings/mojom.gni.orig 2023-01-17 19:19:00 UTC +++ mojo/public/tools/bindings/mojom.gni -@@ -694,6 +694,16 @@ template("mojom") { +@@ -699,6 +699,16 @@ template("mojom") { enabled_features += [ "is_win" ] } @@ -16,4 +16,4 @@ + action(parser_target_name) { script = mojom_parser_script - inputs = mojom_parser_sources + [ build_metadata_filename ] + inputs = mojom_parser_sources + ply_sources + [ build_metadata_filename ] diff --git a/www/iridium/files/patch-net_BUILD.gn b/www/iridium/files/patch-net_BUILD.gn index 9ac317b81a233..625b38ff06811 100644 --- a/www/iridium/files/patch-net_BUILD.gn +++ b/www/iridium/files/patch-net_BUILD.gn @@ -1,4 +1,4 @@ ---- net/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- net/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ net/BUILD.gn @@ -103,7 +103,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1207,6 +1207,15 @@ component("net") { +@@ -1209,6 +1209,15 @@ component("net") { deps += [ "//third_party/xdg_shared_mime_info" ] } @@ -43,7 +43,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -4386,7 +4395,7 @@ test("net_unittests") { +@@ -4642,7 +4651,7 @@ test("net_unittests") { ] } @@ -52,7 +52,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -4462,6 +4471,10 @@ test("net_unittests") { +@@ -4717,6 +4726,10 @@ test("net_unittests") { "//url:buildflags", ] @@ -63,7 +63,7 @@ if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -4529,7 +4542,7 @@ test("net_unittests") { +@@ -4784,7 +4797,7 @@ test("net_unittests") { ] } @@ -72,7 +72,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -4669,7 +4682,7 @@ test("net_unittests") { +@@ -4906,7 +4919,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/iridium/files/patch-net_base_network__change__notifier.cc b/www/iridium/files/patch-net_base_network__change__notifier.cc index 23e9bf273ff53..bd400e5ec4524 100644 --- a/www/iridium/files/patch-net_base_network__change__notifier.cc +++ b/www/iridium/files/patch-net_base_network__change__notifier.cc @@ -1,4 +1,4 @@ ---- net/base/network_change_notifier.cc.orig 2022-12-06 08:09:13 UTC +--- net/base/network_change_notifier.cc.orig 2023-01-17 19:19:00 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" -@@ -321,6 +321,9 @@ std::unique_ptr NetworkChangeNo +@@ -326,6 +326,9 @@ std::unique_ptr NetworkChangeNo #elif BUILDFLAG(IS_FUCHSIA) return std::make_unique( /*require_wlan=*/false); diff --git a/www/iridium/files/patch-net_dns_BUILD.gn b/www/iridium/files/patch-net_dns_BUILD.gn index bf2638a706d45..47affa69416e0 100644 --- a/www/iridium/files/patch-net_dns_BUILD.gn +++ b/www/iridium/files/patch-net_dns_BUILD.gn @@ -1,6 +1,6 @@ ---- net/dns/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- net/dns/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ net/dns/BUILD.gn -@@ -116,7 +116,7 @@ source_set("dns") { +@@ -122,7 +122,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", -@@ -157,6 +157,7 @@ source_set("dns") { +@@ -163,6 +163,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +17,7 @@ ] allow_circular_includes_from = [ -@@ -418,9 +419,9 @@ source_set("tests") { +@@ -425,9 +426,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/www/iridium/files/patch-net_dns_host__resolver__system__task.cc b/www/iridium/files/patch-net_dns_host__resolver__system__task.cc index 5ee5735ae545d..7ec5105c37e5d 100644 --- a/www/iridium/files/patch-net_dns_host__resolver__system__task.cc +++ b/www/iridium/files/patch-net_dns_host__resolver__system__task.cc @@ -1,6 +1,6 @@ ---- net/dns/host_resolver_system_task.cc.orig 2022-12-06 08:09:13 UTC +--- net/dns/host_resolver_system_task.cc.orig 2023-01-17 19:19:00 UTC +++ net/dns/host_resolver_system_task.cc -@@ -310,8 +310,8 @@ void HostResolverSystemTask::OnLookupComplete(const ui +@@ -351,8 +351,8 @@ void HostResolverSystemTask::OnLookupComplete(const ui } void EnsureSystemHostResolverCallReady() { @@ -11,7 +11,7 @@ EnsureDnsReloaderInit(); #elif BUILDFLAG(IS_WIN) EnsureWinsockInit(); -@@ -397,7 +397,7 @@ int SystemHostResolverCall(const std::string& host, +@@ -438,7 +438,7 @@ int SystemHostResolverCall(const std::string& host, base::BlockingType::WILL_BLOCK); #if BUILDFLAG(IS_POSIX) && \ diff --git a/www/iridium/files/patch-net_http_http__network__session.cc b/www/iridium/files/patch-net_http_http__network__session.cc index d7107c94f14c1..23efc33b4324e 100644 --- a/www/iridium/files/patch-net_http_http__network__session.cc +++ b/www/iridium/files/patch-net_http_http__network__session.cc @@ -1,6 +1,6 @@ ---- net/http/http_network_session.cc.orig 2022-03-28 18:11:04 UTC +--- net/http/http_network_session.cc.orig 2023-01-17 19:19:00 UTC +++ net/http/http_network_session.cc -@@ -20,7 +20,9 @@ +@@ -19,7 +19,9 @@ #include "build/build_config.h" #include "net/base/features.h" #include "net/dns/host_resolver.h" diff --git a/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc index 4e79210c2b165..01657b2266fe5 100644 --- a/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc +++ b/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc @@ -1,4 +1,4 @@ ---- net/proxy_resolution/proxy_config_service_linux.cc.orig 2022-12-01 10:35:46 UTC +--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2023-01-17 19:19:00 UTC +++ net/proxy_resolution/proxy_config_service_linux.cc @@ -6,7 +6,9 @@ @@ -10,7 +10,7 @@ #include #include -@@ -502,6 +504,7 @@ bool SettingGetterImplGSettings::CheckVersion( +@@ -504,6 +506,7 @@ bool SettingGetterImplGSettings::CheckVersion( } #endif // defined(USE_GIO) @@ -18,7 +18,7 @@ // Converts |value| from a decimal string to an int. If there was a failure // parsing, returns |default_value|. int StringToIntOrDefault(base::StringPiece value, int default_value) { -@@ -1030,6 +1033,7 @@ class SettingGetterImplKDE : public ProxyConfigService +@@ -1032,6 +1035,7 @@ class SettingGetterImplKDE : public ProxyConfigService // events on. scoped_refptr file_task_runner_; }; @@ -26,7 +26,7 @@ } // namespace -@@ -1246,9 +1250,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( +@@ -1248,9 +1252,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( case base::nix::DESKTOP_ENVIRONMENT_KDE3: case base::nix::DESKTOP_ENVIRONMENT_KDE4: case base::nix::DESKTOP_ENVIRONMENT_KDE5: diff --git a/www/iridium/files/patch-net_url__request_url__request.cc b/www/iridium/files/patch-net_url__request_url__request.cc index bdb5688d5e19f..969b09b3446a1 100644 --- a/www/iridium/files/patch-net_url__request_url__request.cc +++ b/www/iridium/files/patch-net_url__request_url__request.cc @@ -1,4 +1,4 @@ ---- net/url_request/url_request.cc.orig 2022-10-05 07:34:01 UTC +--- net/url_request/url_request.cc.orig 2023-01-17 19:19:00 UTC +++ net/url_request/url_request.cc @@ -13,6 +13,7 @@ #include "base/bind.h" @@ -16,7 +16,7 @@ #include "net/base/auth.h" #include "net/base/load_flags.h" #include "net/base/load_timing_info.h" -@@ -57,7 +59,10 @@ namespace iridium { +@@ -54,7 +56,10 @@ namespace iridium { void textlog_request(const char *caller, const GURL &url) { diff --git a/www/iridium/files/patch-net_url__request_url__request__context.cc b/www/iridium/files/patch-net_url__request_url__request__context.cc index 44692d94c95ad..2237de65f8c1f 100644 --- a/www/iridium/files/patch-net_url__request_url__request__context.cc +++ b/www/iridium/files/patch-net_url__request_url__request__context.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context.cc.orig 2022-12-01 10:35:46 UTC +--- net/url_request/url_request_context.cc.orig 2023-01-17 19:19:00 UTC +++ net/url_request/url_request_context.cc -@@ -110,7 +110,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge +@@ -109,7 +109,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ diff --git a/www/iridium/files/patch-net_url__request_url__request__context.h b/www/iridium/files/patch-net_url__request_url__request__context.h index 1960963853974..1a76db08d0a4b 100644 --- a/www/iridium/files/patch-net_url__request_url__request__context.h +++ b/www/iridium/files/patch-net_url__request_url__request__context.h @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context.h.orig 2022-12-01 10:35:46 UTC +--- net/url_request/url_request_context.h.orig 2023-01-17 19:19:00 UTC +++ net/url_request/url_request_context.h -@@ -87,7 +87,7 @@ class NET_EXPORT URLRequestContext final { +@@ -86,7 +86,7 @@ class NET_EXPORT URLRequestContext final { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ diff --git a/www/iridium/files/patch-printing_print__settings.cc b/www/iridium/files/patch-printing_print__settings.cc index 8405573295fd2..d641f7cefbb15 100644 --- a/www/iridium/files/patch-printing_print__settings.cc +++ b/www/iridium/files/patch-printing_print__settings.cc @@ -1,4 +1,4 @@ ---- printing/print_settings.cc.orig 2022-10-05 07:34:01 UTC +--- printing/print_settings.cc.orig 2023-01-17 19:19:00 UTC +++ printing/print_settings.cc @@ -272,7 +272,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet #endif @@ -9,7 +9,7 @@ for (const auto& item : settings.advanced_settings_) advanced_settings_.emplace(item.first, item.second.Clone()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -312,7 +312,7 @@ void PrintSettings::Clear() { +@@ -313,7 +313,7 @@ void PrintSettings::Clear() { #endif is_modifiable_ = true; pages_per_sheet_ = 1; diff --git a/www/iridium/files/patch-printing_print__settings.h b/www/iridium/files/patch-printing_print__settings.h index f0a285ff98bf5..329e724dd30dc 100644 --- a/www/iridium/files/patch-printing_print__settings.h +++ b/www/iridium/files/patch-printing_print__settings.h @@ -1,4 +1,4 @@ ---- printing/print_settings.h.orig 2022-03-28 18:11:04 UTC +--- printing/print_settings.h.orig 2023-01-17 19:19:00 UTC +++ printing/print_settings.h @@ -18,7 +18,7 @@ #include "ui/gfx/geometry/rect.h" @@ -27,7 +27,7 @@ AdvancedSettings& advanced_settings() { return advanced_settings_; } const AdvancedSettings& advanced_settings() const { return advanced_settings_; -@@ -322,7 +322,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -327,7 +327,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { // Number of pages per sheet. int pages_per_sheet_; diff --git a/www/iridium/files/patch-remoting_host_chromoting__host.cc b/www/iridium/files/patch-remoting_host_chromoting__host.cc index 148f37f4d9bb3..aca045db6b188 100644 --- a/www/iridium/files/patch-remoting_host_chromoting__host.cc +++ b/www/iridium/files/patch-remoting_host_chromoting__host.cc @@ -1,11 +1,11 @@ ---- remoting/host/chromoting_host.cc.orig 2022-03-28 18:11:04 UTC +--- remoting/host/chromoting_host.cc.orig 2023-01-17 19:19:00 UTC +++ remoting/host/chromoting_host.cc -@@ -124,7 +124,7 @@ void ChromotingHost::StartChromotingHostServices() { +@@ -125,7 +125,7 @@ void ChromotingHost::StartChromotingHostServices() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(!ipc_server_); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - ipc_server_ = std::make_unique>( - GetChromotingHostServicesServerName(), this); - ipc_server_->StartServer(); + ipc_server_ = std::make_unique< + named_mojo_ipc_server::NamedMojoIpcServer>( + GetChromotingHostServicesServerName(), this, diff --git a/www/iridium/files/patch-remoting_host_ipc__constants.cc b/www/iridium/files/patch-remoting_host_ipc__constants.cc index d8b000221c96e..c15b2240511fb 100644 --- a/www/iridium/files/patch-remoting_host_ipc__constants.cc +++ b/www/iridium/files/patch-remoting_host_ipc__constants.cc @@ -1,4 +1,4 @@ ---- remoting/host/ipc_constants.cc.orig 2022-12-01 10:35:46 UTC +--- remoting/host/ipc_constants.cc.orig 2023-01-17 19:19:00 UTC +++ remoting/host/ipc_constants.cc @@ -17,7 +17,7 @@ namespace remoting { @@ -9,12 +9,12 @@ #if !defined(NDEBUG) // Use a different IPC name for debug builds so that we can run the host -@@ -65,7 +65,7 @@ const mojo::NamedPlatformChannel::ServerName& - GetChromotingHostServicesServerName() { +@@ -66,7 +66,7 @@ GetChromotingHostServicesServerName() { static const base::NoDestructor - server_name(WorkingDirectoryIndependentServerNameFromUTF8( + server_name( + named_mojo_ipc_server::WorkingDirectoryIndependentServerNameFromUTF8( -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Linux host creates the socket file in /tmp, and it won't be deleted - // until reboot, so we put username in the path in case the user - // switches the host owner. + // Linux host creates the socket file in /tmp, and it won't be + // deleted until reboot, so we put username in the path in case + // the user switches the host owner. diff --git a/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc b/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc index b6d8ad6a5cc9e..a217bfbf38478 100644 --- a/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc +++ b/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc @@ -1,15 +1,15 @@ ---- remoting/host/me2me_desktop_environment.cc.orig 2022-12-06 08:09:13 UTC +--- remoting/host/me2me_desktop_environment.cc.orig 2023-01-17 19:19:00 UTC +++ remoting/host/me2me_desktop_environment.cc @@ -124,7 +124,7 @@ std::string Me2MeDesktopEnvironment::GetCapabilities() capabilities += protocol::kRemoteWebAuthnCapability; } --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) && defined(REMOTING_USE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) capabilities += " "; capabilities += protocol::kMultiStreamCapability; -@@ -183,7 +183,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( +@@ -180,7 +180,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/iridium/files/patch-sandbox_linux_services_libc__interceptor.cc b/www/iridium/files/patch-sandbox_linux_services_libc__interceptor.cc index 30a421a3bf965..87b1090d0b4da 100644 --- a/www/iridium/files/patch-sandbox_linux_services_libc__interceptor.cc +++ b/www/iridium/files/patch-sandbox_linux_services_libc__interceptor.cc @@ -1,4 +1,4 @@ ---- sandbox/linux/services/libc_interceptor.cc.orig 2022-12-06 08:09:13 UTC +--- sandbox/linux/services/libc_interceptor.cc.orig 2023-01-17 19:19:00 UTC +++ sandbox/linux/services/libc_interceptor.cc @@ -12,7 +12,9 @@ #include @@ -10,7 +10,7 @@ #include #include #include -@@ -161,7 +163,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, +@@ -167,7 +169,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/iridium/files/patch-sandbox_policy_BUILD.gn b/www/iridium/files/patch-sandbox_policy_BUILD.gn index 6d5fff575b4f5..16e2f20bcbe3a 100644 --- a/www/iridium/files/patch-sandbox_policy_BUILD.gn +++ b/www/iridium/files/patch-sandbox_policy_BUILD.gn @@ -1,4 +1,4 @@ ---- sandbox/policy/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- sandbox/policy/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ sandbox/policy/BUILD.gn @@ -35,7 +35,7 @@ component("policy") { "//sandbox/policy/mojom", @@ -9,7 +9,7 @@ sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", -@@ -94,6 +94,27 @@ component("policy") { +@@ -101,6 +101,27 @@ component("policy") { "//sandbox/linux:sandbox_services", "//sandbox/linux:seccomp_bpf", "//sandbox/linux:suid_sandbox_client", diff --git a/www/iridium/files/patch-sandbox_policy_sandbox__type.cc b/www/iridium/files/patch-sandbox_policy_sandbox__type.cc index 7f078ceecb40a..f936fda487c3c 100644 --- a/www/iridium/files/patch-sandbox_policy_sandbox__type.cc +++ b/www/iridium/files/patch-sandbox_policy_sandbox__type.cc @@ -1,4 +1,4 @@ ---- sandbox/policy/sandbox_type.cc.orig 2022-12-06 08:09:13 UTC +--- sandbox/policy/sandbox_type.cc.orig 2023-01-17 19:19:00 UTC +++ sandbox/policy/sandbox_type.cc @@ -38,7 +38,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { #endif @@ -18,7 +18,16 @@ case Sandbox::kHardwareVideoDecoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -126,7 +126,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -71,7 +71,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { + case Sandbox::kLibassistant: + #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT) + #endif // // BUILDFLAG(IS_CHROMEOS_ASH) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) | BUILDFLAG(IS_BSD) + case Sandbox::kZygoteIntermediateSandbox: + case Sandbox::kHardwareVideoEncoding: + #endif +@@ -127,7 +127,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi #endif case Sandbox::kPrintCompositor: case Sandbox::kAudio: @@ -27,7 +36,7 @@ case Sandbox::kVideoCapture: #endif #if BUILDFLAG(IS_WIN) -@@ -137,7 +137,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -138,10 +138,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kMediaFoundationCdm: case Sandbox::kWindowsSystemProxyResolver: #endif // BUILDFLAG(IS_WIN) @@ -35,8 +44,30 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) case Sandbox::kHardwareVideoDecoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + case Sandbox::kHardwareVideoEncoding: + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -256,7 +256,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -169,7 +169,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi + case Sandbox::kNaClLoader: + break; + #endif // BUILDFLAG(IS_MAC) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + case Sandbox::kZygoteIntermediateSandbox: + break; + #endif +@@ -216,7 +216,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( + if (process_type == switches::kNaClBrokerProcess) + return Sandbox::kNoSandbox; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Intermediate process gains a sandbox later. + if (process_type == switches::kZygoteProcessType) + return Sandbox::kZygoteIntermediateSandbox; +@@ -260,7 +260,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb return switches::kUtilitySandbox; case Sandbox::kAudio: return switches::kAudioSandbox; @@ -45,7 +76,7 @@ case Sandbox::kVideoCapture: return switches::kVideoCaptureSandbox; #endif -@@ -286,7 +286,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -290,11 +290,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb case Sandbox::kMirroring: return switches::kMirroringSandbox; #endif @@ -54,7 +85,21 @@ case Sandbox::kHardwareVideoDecoding: return switches::kHardwareVideoDecodingSandbox; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -374,11 +374,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + case Sandbox::kHardwareVideoEncoding: + return switches::kHardwareVideoEncodingSandbox; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -314,7 +314,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb + #if BUILDFLAG(IS_MAC) + case Sandbox::kNaClLoader: + #endif // BUILDFLAG(IS_MAC) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + case Sandbox::kZygoteIntermediateSandbox: + #endif + NOTREACHED(); +@@ -382,11 +382,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( if (sandbox_string == switches::kScreenAISandbox) return Sandbox::kScreenAI; #endif diff --git a/www/iridium/files/patch-sandbox_policy_switches.cc b/www/iridium/files/patch-sandbox_policy_switches.cc index 980397d2e4d17..6a6aa7c0e16dc 100644 --- a/www/iridium/files/patch-sandbox_policy_switches.cc +++ b/www/iridium/files/patch-sandbox_policy_switches.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/switches.cc.orig 2022-10-05 07:34:01 UTC +--- sandbox/policy/switches.cc.orig 2023-01-17 19:19:00 UTC +++ sandbox/policy/switches.cc -@@ -54,7 +54,7 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro +@@ -54,10 +54,10 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro const char kMirroringSandbox[] = "mirroring"; #endif // BUILDFLAG(IS_MAC) @@ -8,8 +8,12 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) const char kHardwareVideoDecodingSandbox[] = "hardware_video_decoding"; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + const char kHardwareVideoEncodingSandbox[] = "hardware_video_encoding"; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -101,7 +101,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f +@@ -104,7 +104,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f // Meant to be used as a browser-level switch for testing purposes only. const char kNoSandbox[] = "no-sandbox"; diff --git a/www/iridium/files/patch-sandbox_policy_switches.h b/www/iridium/files/patch-sandbox_policy_switches.h index b36f19c01e019..7eab35d375d1c 100644 --- a/www/iridium/files/patch-sandbox_policy_switches.h +++ b/www/iridium/files/patch-sandbox_policy_switches.h @@ -1,6 +1,6 @@ ---- sandbox/policy/switches.h.orig 2022-10-05 07:34:01 UTC +--- sandbox/policy/switches.h.orig 2023-01-17 19:19:00 UTC +++ sandbox/policy/switches.h -@@ -56,7 +56,7 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem +@@ -56,10 +56,10 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem SANDBOX_POLICY_EXPORT extern const char kMirroringSandbox[]; #endif // BUILDFLAG(IS_MAC) @@ -8,8 +8,12 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) SANDBOX_POLICY_EXPORT extern const char kHardwareVideoDecodingSandbox[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + SANDBOX_POLICY_EXPORT extern const char kHardwareVideoEncodingSandbox[]; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -78,7 +78,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid +@@ -81,7 +81,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[]; SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[]; SANDBOX_POLICY_EXPORT extern const char kNoSandbox[]; diff --git a/www/iridium/files/patch-services_network_BUILD.gn b/www/iridium/files/patch-services_network_BUILD.gn index a781669b8ee98..e880b93cff08a 100644 --- a/www/iridium/files/patch-services_network_BUILD.gn +++ b/www/iridium/files/patch-services_network_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- services/network/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ services/network/BUILD.gn -@@ -331,7 +331,6 @@ if (is_linux || is_chromeos) { +@@ -336,7 +336,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", diff --git a/www/iridium/files/patch-services_network_network__service.cc b/www/iridium/files/patch-services_network_network__service.cc index fe688ced04ff8..e096dc6fb97d3 100644 --- a/www/iridium/files/patch-services_network_network__service.cc +++ b/www/iridium/files/patch-services_network_network__service.cc @@ -1,6 +1,6 @@ ---- services/network/network_service.cc.orig 2022-10-05 07:34:01 UTC +--- services/network/network_service.cc.orig 2023-01-17 19:19:00 UTC +++ services/network/network_service.cc -@@ -83,7 +83,7 @@ +@@ -88,7 +88,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif diff --git a/www/iridium/files/patch-third__party_angle_BUILD.gn b/www/iridium/files/patch-third__party_angle_BUILD.gn index 7a2208c06e248..35f3ec732901a 100644 --- a/www/iridium/files/patch-third__party_angle_BUILD.gn +++ b/www/iridium/files/patch-third__party_angle_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- third_party/angle/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ third_party/angle/BUILD.gn -@@ -265,7 +265,6 @@ config("extra_warnings") { +@@ -276,7 +276,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,7 +8,7 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -443,7 +442,7 @@ angle_static_library("angle_common") { +@@ -459,7 +458,7 @@ angle_static_library("angle_common") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -574,6 +573,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -601,6 +600,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] @@ -27,7 +27,7 @@ } if (angle_use_wayland && angle_has_build) { -@@ -1094,12 +1096,12 @@ if (angle_use_wayland) { +@@ -1104,12 +1106,12 @@ if (angle_use_wayland) { "wayland-client", "wayland-egl", ] diff --git a/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp index ac3f15bce097f..319b3aa233b1b 100644 --- a/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2022-12-01 10:35:46 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2023-01-17 19:19:00 UTC +++ third_party/angle/src/libANGLE/Display.cpp -@@ -54,7 +54,7 @@ +@@ -55,7 +55,7 @@ # include "libANGLE/renderer/gl/wgl/DisplayWGL.h" # elif defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_IOS) # include "libANGLE/renderer/gl/apple/DisplayApple_api.h" @@ -9,7 +9,7 @@ # include "libANGLE/renderer/gl/egl/DisplayEGL.h" # if defined(ANGLE_USE_GBM) # include "libANGLE/renderer/gl/egl/gbm/DisplayGbm.h" -@@ -331,7 +331,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -346,7 +346,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateDisplayCGLOrEAGL(state); break; @@ -18,7 +18,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -374,7 +374,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -389,7 +389,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di #if defined(ANGLE_ENABLE_OPENGL) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayWGL(state); @@ -27,7 +27,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0 || platformType == EGL_PLATFORM_VULKAN_DISPLAY_MODE_HEADLESS_ANGLE) -@@ -425,7 +425,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -440,7 +440,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateVulkanWin32Display(state); } break; @@ -36,7 +36,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable()) { -@@ -2011,7 +2011,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2042,7 +2042,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/iridium/files/patch-third__party_angle_util_BUILD.gn b/www/iridium/files/patch-third__party_angle_util_BUILD.gn index 5a906eab2704a..92edece38949c 100644 --- a/www/iridium/files/patch-third__party_angle_util_BUILD.gn +++ b/www/iridium/files/patch-third__party_angle_util_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/util/BUILD.gn.orig 2022-10-05 07:34:01 UTC +--- third_party/angle/util/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ third_party/angle/util/BUILD.gn -@@ -246,7 +246,7 @@ foreach(is_shared_library, +@@ -271,7 +271,7 @@ foreach(is_shared_library, ] libs = [] diff --git a/www/iridium/files/patch-third__party_blink_common_features.cc b/www/iridium/files/patch-third__party_blink_common_features.cc new file mode 100644 index 0000000000000..d77c7e3e4f7d2 --- /dev/null +++ b/www/iridium/files/patch-third__party_blink_common_features.cc @@ -0,0 +1,14 @@ +--- third_party/blink/common/features.cc.orig 2023-01-17 19:19:00 UTC ++++ third_party/blink/common/features.cc +@@ -1757,9 +1757,10 @@ BASE_FEATURE(kSplitUserMediaQueues, + "SplitUserMediaQueues", + base::FEATURE_DISABLED_BY_DEFAULT); + ++// XXX https://crbug.com/1382032 + BASE_FEATURE(kTextCodecCJKEnabled, + "TextCodecCJKEnabled", +- base::FEATURE_ENABLED_BY_DEFAULT); ++ base::FEATURE_DISABLED_BY_DEFAULT); + + } // namespace features + } // namespace blink diff --git a/www/iridium/files/patch-third__party_blink_public_platform_platform.h b/www/iridium/files/patch-third__party_blink_public_platform_platform.h index 9997fa9daf485..2ec222b275a5c 100644 --- a/www/iridium/files/patch-third__party_blink_public_platform_platform.h +++ b/www/iridium/files/patch-third__party_blink_public_platform_platform.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/platform/platform.h.orig 2022-12-06 08:09:13 UTC +--- third_party/blink/public/platform/platform.h.orig 2023-01-17 19:19:00 UTC +++ third_party/blink/public/platform/platform.h -@@ -349,7 +349,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -351,7 +351,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; } diff --git a/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc index 7e56871e29c41..04b20647680a3 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2022-12-06 08:09:13 UTC +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2023-01-17 19:19:00 UTC +++ third_party/blink/renderer/controller/blink_initializer.cc @@ -73,12 +73,12 @@ #include "third_party/blink/renderer/controller/oom_intervention_impl.h" @@ -15,16 +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 -@@ -173,7 +173,7 @@ void InitializeCommon(Platform* platform, mojo::Binder - #endif - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ -- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring. - if (UserLevelMemoryPressureSignalGenerator::Enabled()) - UserLevelMemoryPressureSignalGenerator::Instance(); -@@ -244,7 +244,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder +@@ -226,7 +226,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder main_thread_task_runner); #endif @@ -33,3 +24,12 @@ binders.Add( ConvertToBaseRepeatingCallback( CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)), +@@ -259,7 +259,7 @@ void BlinkInitializer::RegisterMemoryWatchers() { + #endif + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring. + UserLevelMemoryPressureSignalGenerator::Initialize(main_thread_task_runner); + diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc index 875d04a69059e..52408ec727788 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc +++ b/www/iridium/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-12-06 08:09:13 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2023-01-17 19:19:00 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6414,7 +6414,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6449,7 +6449,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"); -@@ -6811,7 +6811,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc +@@ -6846,7 +6846,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) { RunTest("composited_selection_bounds_large_selection_noscroll.html"); } diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index e321695d28d4a..e120abf616254 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2022-12-06 08:09:13 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2023-01-17 19:19:00 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc @@ -68,7 +68,7 @@ #include "ui/display/screen_info.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -367,7 +367,7 @@ void LayoutView::UpdateLayout() { +@@ -370,7 +370,7 @@ void LayoutView::UpdateLayout() { DCHECK(!layout_state_); LayoutState root_layout_state(*this); diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc index c1780f8fa9b40..427bc0b6d6e8f 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/iridium/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-12-06 08:09:13 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2023-01-17 19:19:00 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -112,7 +112,7 @@ namespace blink { +@@ -113,7 +113,7 @@ namespace blink { namespace { diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni b/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni new file mode 100644 index 0000000000000..a6544b7fa8573 --- /dev/null +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni @@ -0,0 +1,9 @@ +--- third_party/blink/renderer/modules/ml/webnn/features.gni.orig 2023-01-17 19:19:00 UTC ++++ third_party/blink/renderer/modules/ml/webnn/features.gni +@@ -7,5 +7,5 @@ declare_args() { + # This enables building WebNN with XNNPACK. Currently only available for + # Linux or Windows on x64 that aligns with build_tflite_with_xnnpack. + # See third_party/tflite/features.gni +- build_webnn_with_xnnpack = (is_win || is_linux) && current_cpu == "x64" ++ build_webnn_with_xnnpack = !is_bsd && (is_win || is_linux) && current_cpu == "x64" + } diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc new file mode 100644 index 0000000000000..731134e8c1bd2 --- /dev/null +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc @@ -0,0 +1,11 @@ +--- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2023-01-17 19:19:00 UTC ++++ third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc +@@ -114,7 +114,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount + + ~SharedXnnpackContext() { + base::AutoLock auto_lock(SharedXnnpackContextLock()); +-#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) + // For Linux and ChromeOS, cpuinfo needs to parse /proc/cpuinfo to + // initialize in pre sandbox stage. Calling xnn_deinitialize() here will + // deinitialize cpuinfo within sandbox and cannot access /proc/cpuinfo diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc index 36f3ea652a81a..48b80dc020a70 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2022-10-05 07:34:01 UTC +--- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2023-01-17 19:19:00 UTC +++ third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc -@@ -379,7 +379,7 @@ class AudioWorkletThreadPriorityTest +@@ -380,7 +380,7 @@ class AudioWorkletThreadPriorityTest // TODO(crbug.com/1022888): The worklet thread priority is always NORMAL // on OS_LINUX and OS_CHROMEOS regardless of the thread priority setting. diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index fa6b3dad58c37..c67753c96f962 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc +++ b/www/iridium/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-12-06 08:09:13 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2023-01-17 19:19:00 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6152,7 +6152,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6155,7 +6155,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc index 0447e436ffe12..b1caf2338f0ba 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc +++ b/www/iridium/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-12-06 08:09:13 UTC +--- third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig 2023-01-17 19:19:00 UTC +++ third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc -@@ -101,7 +101,7 @@ bool WebGLWebCodecsVideoFrame::Supported(WebGLRenderin +@@ -102,7 +102,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/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn index 52943949f7912..18f711a819077 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/BUILD.gn.orig 2022-12-01 10:35:46 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -1899,7 +1899,7 @@ static_library("test_support") { +@@ -1898,7 +1898,7 @@ static_library("test_support") { ] # fuzzed_data_provider may not work with a custom toolchain. diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc index 175a87835910c..fe69b70d71475 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2022-12-06 08:09:13 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2023-01-17 19:19:00 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc @@ -347,7 +347,7 @@ void VideoFrameSubmitter::OnBeginFrame( continue; auto& feedback = timing_details.find(frame_token)->value.presentation_feedback; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // TODO: On Linux failure flag is unreliable, and perfectly rendered frames // are reported as failures all the time. bool presentation_failure = false; diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc new file mode 100644 index 0000000000000..79b8a8ccef49d --- /dev/null +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc @@ -0,0 +1,18 @@ +--- third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc.orig 2023-01-17 19:19:00 UTC ++++ third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc +@@ -24,6 +24,7 @@ PartitionAllocMemoryDumpProvider* PartitionAllocMemory + bool PartitionAllocMemoryDumpProvider::OnMemoryDump( + const base::trace_event::MemoryDumpArgs& args, + base::trace_event::ProcessMemoryDump* memory_dump) { ++#if !BUILDFLAG(IS_BSD) + using base::trace_event::MemoryDumpLevelOfDetail; + + MemoryDumpLevelOfDetail level_of_detail = args.level_of_detail; +@@ -49,6 +50,7 @@ bool PartitionAllocMemoryDumpProvider::OnMemoryDump( + "size", "bytes", partition_stats_dumper.total_active_bytes()); + memory_dump->AddOwnershipEdge(allocated_objects_dump->guid(), + partitions_dump->guid()); ++#endif + + return true; + } diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/iridium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 index 65c4caba165ac..7db30ada11002 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 @@ -1,15 +1,6 @@ ---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2022-12-06 08:09:13 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-01-17 19:19:00 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -36,7 +36,7 @@ - // shipped stable can have its runtime flag removed soon after. - status: { - valid_values: ["stable", "experimental", "test"], -- valid_keys: ["Android", "Win", "ChromeOS_Ash", "ChromeOS_Lacros", "Mac", "Linux"] -+ valid_keys: ["Android", "Win", "ChromeOS_Ash", "ChromeOS_Lacros", "Mac", "Linux", "OpenBSD", "FreeBSD"] - }, - - // "implied_by" or "depends_on" specifies relationship to other features: -@@ -1205,7 +1205,7 @@ +@@ -1255,7 +1255,7 @@ depends_on: ["FileSystemAccessLocal"], status: {"Android": "test", "default": "stable"}, origin_trial_feature_name: "FileHandling", @@ -18,16 +9,7 @@ base_feature: "FileHandlingAPI", }, { -@@ -2671,7 +2671,7 @@ - { - name: "U2FSecurityKeyAPI", - origin_trial_feature_name: "U2FSecurityKeyAPI", -- origin_trial_os: ["win", "mac", "linux", "chromeos"], -+ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], - origin_trial_type: "deprecation", - }, - { -@@ -2686,7 +2686,7 @@ +@@ -2802,7 +2802,7 @@ { name: "UnrestrictedSharedArrayBuffer", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -36,7 +18,7 @@ }, { name: "URLPatternCompareComponent", -@@ -2706,7 +2706,7 @@ +@@ -2822,7 +2822,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 +27,7 @@ base_feature: "ReduceUserAgent", }, { -@@ -2834,12 +2834,12 @@ +@@ -2984,12 +2984,12 @@ name: "WebAppUrlHandling", status: "experimental", origin_trial_feature_name: "WebAppUrlHandling", @@ -59,4 +41,4 @@ + origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], status: "stable", }, - { + // WebAuth is disabled on Android versions prior to N (7.0) due to lack of diff --git a/www/iridium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn b/www/iridium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn index f52300c4612a3..7c309655f4b9a 100644 --- a/www/iridium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn +++ b/www/iridium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/client/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- third_party/crashpad/crashpad/client/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ third_party/crashpad/crashpad/client/BUILD.gn -@@ -130,6 +130,13 @@ static_library("common") { +@@ -131,6 +131,13 @@ static_library("common") { if (crashpad_is_win) { sources += [ "crash_report_database_win.cc" ] } diff --git a/www/iridium/files/patch-third__party_libsync_src_sync.c b/www/iridium/files/patch-third__party_libsync_src_sync.c index 5af51f2057693..d3e88306a9980 100644 --- a/www/iridium/files/patch-third__party_libsync_src_sync.c +++ b/www/iridium/files/patch-third__party_libsync_src_sync.c @@ -1,16 +1,18 @@ ---- third_party/libsync/src/sync.c.orig 2022-03-28 18:11:04 UTC +--- third_party/libsync/src/sync.c.orig 2023-01-17 19:19:00 UTC +++ third_party/libsync/src/sync.c -@@ -17,7 +17,9 @@ +@@ -17,7 +17,11 @@ */ #include -+#if !defined(__OpenBSD__) ++#if defined(__OpenBSD__) ++#include ++#else #include +#endif #include #include #include -@@ -29,6 +31,12 @@ +@@ -29,6 +33,12 @@ #include diff --git a/www/iridium/files/patch-third__party_libxml_linux_config.h b/www/iridium/files/patch-third__party_libxml_linux_config.h index 40d880b2657a4..7121778bd536c 100644 --- a/www/iridium/files/patch-third__party_libxml_linux_config.h +++ b/www/iridium/files/patch-third__party_libxml_linux_config.h @@ -1,6 +1,6 @@ ---- third_party/libxml/linux/config.h.orig 2022-04-01 07:48:30 UTC +--- third_party/libxml/linux/config.h.orig 2023-01-17 19:19:00 UTC +++ third_party/libxml/linux/config.h -@@ -81,6 +81,9 @@ +@@ -72,6 +72,9 @@ /* Define to 1 if you have the `putenv' function. */ #define HAVE_PUTENV 1 diff --git a/www/iridium/files/patch-third__party_nasm_BUILD.gn b/www/iridium/files/patch-third__party_nasm_BUILD.gn index 082364655f8d4..55ef6aa4b8806 100644 --- a/www/iridium/files/patch-third__party_nasm_BUILD.gn +++ b/www/iridium/files/patch-third__party_nasm_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/nasm/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- third_party/nasm/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ third_party/nasm/BUILD.gn -@@ -59,6 +59,13 @@ config("nasm_config") { +@@ -63,6 +63,13 @@ config("nasm_config") { defines = [ "HAVE_CONFIG_H" ] diff --git a/www/iridium/files/patch-third__party_nasm_config_config-linux.h b/www/iridium/files/patch-third__party_nasm_config_config-linux.h index 299b2bb3bbc17..6cc968331f4ed 100644 --- a/www/iridium/files/patch-third__party_nasm_config_config-linux.h +++ b/www/iridium/files/patch-third__party_nasm_config_config-linux.h @@ -1,14 +1,5 @@ ---- third_party/nasm/config/config-linux.h.orig 2022-03-28 18:11:04 UTC +--- third_party/nasm/config/config-linux.h.orig 2023-01-17 19:19:00 UTC +++ third_party/nasm/config/config-linux.h -@@ -139,7 +139,7 @@ - #define HAVE_ACCESS 1 - - /* Define to 1 if you have the `canonicalize_file_name' function. */ --#define HAVE_CANONICALIZE_FILE_NAME 1 -+/* #undef HAVE_CANONICALIZE_FILE_NAME */ - - /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */ - /* #undef HAVE_CPU_TO_LE16 */ @@ -160,7 +160,7 @@ /* Define to 1 if you have the declaration of `strlcpy', and to 0 if you diff --git a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h index b94dd691fab35..e7f9cb7ee4688 100644 --- a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h +++ b/www/iridium/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-12-06 08:09:13 UTC +--- third_party/perfetto/include/perfetto/base/thread_utils.h.orig 2023-01-17 19:19:00 UTC +++ third_party/perfetto/include/perfetto/base/thread_utils.h -@@ -35,6 +35,7 @@ __declspec(dllimport) unsigned long __stdcall GetCurre +@@ -34,6 +34,7 @@ __declspec(dllimport) unsigned long __stdcall GetCurre #include #include #include @@ -8,7 +8,7 @@ #else #include #endif -@@ -46,6 +47,11 @@ namespace base { +@@ -45,6 +46,11 @@ namespace base { using PlatformThreadId = pid_t; inline PlatformThreadId GetThreadId() { return gettid(); diff --git a/www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc index 883782156bf27..4e9c684cff7c9 100644 --- a/www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc +++ b/www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2022-10-05 07:34:01 UTC +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2023-01-17 19:19:00 UTC +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -3037,7 +3037,8 @@ bool TracingServiceImpl::SnapshotClocks( +@@ -3039,7 +3039,8 @@ bool TracingServiceImpl::SnapshotClocks( #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \ !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ diff --git a/www/iridium/files/patch-third__party_skia_src_core_SkContainers.cpp b/www/iridium/files/patch-third__party_skia_src_core_SkContainers.cpp new file mode 100644 index 0000000000000..71d6fe083ce1d --- /dev/null +++ b/www/iridium/files/patch-third__party_skia_src_core_SkContainers.cpp @@ -0,0 +1,20 @@ +--- third_party/skia/src/core/SkContainers.cpp.orig 2023-01-17 19:19:00 UTC ++++ third_party/skia/src/core/SkContainers.cpp +@@ -13,7 +13,7 @@ + + #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) + #include +-#elif defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX) ++#elif defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX) && !defined(__OpenBSD__) + #include + #elif defined(SK_BUILD_FOR_WIN) + #include +@@ -37,7 +37,7 @@ SkSpan complete_size(void* ptr, size_t size + #elif defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 17 + completeSize = malloc_usable_size(ptr); + SkASSERT(completeSize >= size); +- #elif defined(SK_BUILD_FOR_UNIX) ++ #elif defined(SK_BUILD_FOR_UNIX) && !defined(__OpenBSD__) + completeSize = malloc_usable_size(ptr); + SkASSERT(completeSize >= size); + #elif defined(SK_BUILD_FOR_WIN) diff --git a/www/iridium/files/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc b/www/iridium/files/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc new file mode 100644 index 0000000000000..a4e6f00dcbc7e --- /dev/null +++ b/www/iridium/files/patch-third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc @@ -0,0 +1,11 @@ +--- third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc.orig 2023-01-17 19:19:00 UTC ++++ third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc +@@ -56,7 +56,7 @@ int main() { + FcFini(); + + // Check existence of intended fontconfig cache file. +- auto cache = fontconfig_caches + "/" + kCacheKey + "-le64.cache-7"; ++ auto cache = fontconfig_caches + "/" + kCacheKey + "-le64.cache-" + FC_CACHE_VERSION; + bool cache_exists = access(cache.c_str(), F_OK) == 0; + return !cache_exists; + } diff --git a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn index e9561a254bb2b..67a0d6fa1e8ab 100644 --- a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn +++ b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/vulkan-deps/vulkan-loader/src/BUILD.gn.orig 2022-10-05 07:34:01 UTC +--- third_party/vulkan-deps/vulkan-loader/src/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ third_party/vulkan-deps/vulkan-loader/src/BUILD.gn -@@ -60,7 +60,7 @@ config("vulkan_internal_config") { +@@ -59,7 +59,7 @@ config("vulkan_internal_config") { defines += [ "SYSCONFDIR=\"/etc\"", "FALLBACK_CONFIG_DIRS=\"/etc/xdg\"", diff --git a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h index 1d8796d14959c..0d8986e8931d1 100644 --- a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h +++ b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h @@ -1,6 +1,6 @@ ---- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2022-12-01 10:35:46 UTC +--- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2023-01-17 19:19:00 UTC +++ third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h -@@ -280,7 +280,15 @@ static inline char *loader_platform_executable_path(ch +@@ -294,7 +294,15 @@ static inline char *loader_platform_executable_path(ch return buffer; } diff --git a/www/iridium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h b/www/iridium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h index 0346b068a5676..4976c1dbc4f40 100644 --- a/www/iridium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h +++ b/www/iridium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h @@ -1,4 +1,4 @@ ---- third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.orig 2022-12-06 08:09:13 UTC +--- third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.orig 2023-01-17 20:31:46 UTC +++ third_party/vulkan_memory_allocator/include/vk_mem_alloc.h @@ -2503,7 +2503,7 @@ void *vma_aligned_alloc(size_t alignment, size_t size) diff --git a/www/iridium/files/patch-third__party_webrtc_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_BUILD.gn index 65dcfbf65392d..720e8fa727647 100644 --- a/www/iridium/files/patch-third__party_webrtc_BUILD.gn +++ b/www/iridium/files/patch-third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- third_party/webrtc/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ third_party/webrtc/BUILD.gn -@@ -205,6 +205,9 @@ config("common_inherited_config") { +@@ -208,6 +208,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/iridium/files/patch-third__party_webrtc__overrides_metronome__source.h b/www/iridium/files/patch-third__party_webrtc__overrides_metronome__source.h new file mode 100644 index 0000000000000..a285936f14064 --- /dev/null +++ b/www/iridium/files/patch-third__party_webrtc__overrides_metronome__source.h @@ -0,0 +1,10 @@ +--- third_party/webrtc_overrides/metronome_source.h.orig 2023-01-17 19:19:00 UTC ++++ third_party/webrtc_overrides/metronome_source.h +@@ -7,6 +7,7 @@ + + #include + #include ++#include + + #include "base/callback.h" + #include "base/memory/ref_counted.h" diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_rtc__base_BUILD.gn index 52657dd058bdb..a66baa8ba3c2b 100644 --- a/www/iridium/files/patch-third__party_webrtc_rtc__base_BUILD.gn +++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- third_party/webrtc/rtc_base/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ third_party/webrtc/rtc_base/BUILD.gn -@@ -1244,7 +1244,7 @@ rtc_library("rtc_base") { +@@ -1245,7 +1245,7 @@ rtc_library("rtc_base") { sources += [ "mac_ifaddrs_converter.cc" ] } diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc b/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc index 953c47a3e0613..e582e8a9e0d44 100644 --- a/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc +++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc @@ -1,15 +1,15 @@ ---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2022-12-01 10:35:46 UTC +--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2023-01-17 19:19:00 UTC +++ third_party/webrtc/rtc_base/physical_socket_server.cc -@@ -53,7 +53,7 @@ - #include "rtc_base/synchronization/mutex.h" +@@ -54,7 +54,7 @@ #include "rtc_base/time_utils.h" + #include "system_wrappers/include/field_trial.h" -#if defined(WEBRTC_LINUX) +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) #include #endif -@@ -72,7 +72,7 @@ typedef void* SockOptArg; +@@ -73,7 +73,7 @@ typedef void* SockOptArg; #endif // WEBRTC_POSIX @@ -18,7 +18,7 @@ int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; -@@ -300,7 +300,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) +@@ -308,7 +308,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) return -1; } if (opt == OPT_DONTFRAGMENT) { @@ -27,7 +27,7 @@ *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; #endif } else if (opt == OPT_DSCP) { -@@ -318,7 +318,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -326,7 +326,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { if (TranslateOption(opt, &slevel, &sopt) == -1) return -1; if (opt == OPT_DONTFRAGMENT) { @@ -36,7 +36,7 @@ value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; #endif } else if (opt == OPT_DSCP) { -@@ -346,7 +346,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -354,7 +354,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { int PhysicalSocket::Send(const void* pv, size_t cb) { int sent = DoSend( s_, reinterpret_cast(pv), static_cast(cb), @@ -45,7 +45,7 @@ // Suppress SIGPIPE. Without this, attempting to send on a socket whose // other end is closed will result in a SIGPIPE signal being raised to // our process, which by default will terminate the process, which we -@@ -375,7 +375,7 @@ int PhysicalSocket::SendTo(const void* buffer, +@@ -383,7 +383,7 @@ int PhysicalSocket::SendTo(const void* buffer, size_t len = addr.ToSockAddrStorage(&saddr); int sent = DoSendTo(s_, static_cast(buffer), static_cast(length), @@ -54,7 +54,7 @@ // Suppress SIGPIPE. See above for explanation. MSG_NOSIGNAL, #else -@@ -566,7 +566,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -641,7 +641,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; diff --git a/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py b/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py index 05a9a5a35a8de..ba15352ccb009 100644 --- a/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py +++ b/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py @@ -1,9 +1,9 @@ ---- tools/json_schema_compiler/feature_compiler.py.orig 2022-10-05 07:34:01 UTC +--- tools/json_schema_compiler/feature_compiler.py.orig 2023-01-17 19:19:00 UTC +++ tools/json_schema_compiler/feature_compiler.py @@ -268,6 +268,8 @@ FEATURE_GRAMMAR = ({ + 'linux': 'Feature::LINUX_PLATFORM', 'mac': 'Feature::MACOSX_PLATFORM', 'win': 'Feature::WIN_PLATFORM', - 'fuchsia': 'Feature::FUCHSIA_PLATFORM', + 'openbsd': 'Feature::LINUX_PLATFORM', + 'freebsd': 'Feature::LINUX_PLATFORM', } diff --git a/www/iridium/files/patch-tools_protoc__wrapper_protoc__wrapper.py b/www/iridium/files/patch-tools_protoc__wrapper_protoc__wrapper.py index 3834fe1183df2..09a7b5d04390f 100644 --- a/www/iridium/files/patch-tools_protoc__wrapper_protoc__wrapper.py +++ b/www/iridium/files/patch-tools_protoc__wrapper_protoc__wrapper.py @@ -1,14 +1,23 @@ ---- tools/protoc_wrapper/protoc_wrapper.py.orig 2022-03-28 18:11:04 UTC +--- tools/protoc_wrapper/protoc_wrapper.py.orig 2023-01-17 19:19:00 UTC +++ tools/protoc_wrapper/protoc_wrapper.py -@@ -190,7 +190,11 @@ def main(argv): - with open(options.descriptor_set_dependency_file, 'rb') as f: - dependency_file_data = f.read().decode('utf-8') +@@ -182,15 +182,19 @@ def main(argv): + if not options.exclude_imports: + protoc_cmd += ["--include_imports"] -- ret = subprocess.call(protoc_cmd) + nenv = os.environ.copy() + nenv["PATH"] = "${WRKOBJDIR}/bin:" + nenv["PATH"] + nenv["LD_LIBRARY_PATH"] = "${WRKSRC}/out/Release" + + dependency_file_data = None + if options.descriptor_set_out and options.descriptor_set_dependency_file: + protoc_cmd += ['--dependency_out', options.descriptor_set_dependency_file] +- ret = subprocess.call(protoc_cmd) ++ ret = subprocess.call(protoc_cmd, env=nenv) + + with open(options.descriptor_set_dependency_file, 'rb') as f: + dependency_file_data = f.read().decode('utf-8') + +- ret = subprocess.call(protoc_cmd) + ret = subprocess.call(protoc_cmd, env=nenv) if ret != 0: if ret <= -100: diff --git a/www/iridium/files/patch-ui_aura_client_drag__drop__client.h b/www/iridium/files/patch-ui_aura_client_drag__drop__client.h new file mode 100644 index 0000000000000..ad101eea28719 --- /dev/null +++ b/www/iridium/files/patch-ui_aura_client_drag__drop__client.h @@ -0,0 +1,11 @@ +--- ui/aura/client/drag_drop_client.h.orig 2023-01-17 19:19:00 UTC ++++ ui/aura/client/drag_drop_client.h +@@ -44,7 +44,7 @@ class AURA_EXPORT DragDropClient { + int allowed_operations, + ui::mojom::DragEventSource source) = 0; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Updates the drag image. An empty |image| may be used to hide a previously + // set non-empty drag image, and a non-empty |image| shows the drag image + // again if it was previously hidden. diff --git a/www/iridium/files/patch-ui_base_test_skia__gold__pixel__diff.cc b/www/iridium/files/patch-ui_base_test_skia__gold__pixel__diff.cc index fb4e885288520..74c78c80e3c25 100644 --- a/www/iridium/files/patch-ui_base_test_skia__gold__pixel__diff.cc +++ b/www/iridium/files/patch-ui_base_test_skia__gold__pixel__diff.cc @@ -1,6 +1,6 @@ ---- ui/base/test/skia_gold_pixel_diff.cc.orig 2022-12-01 10:35:46 UTC +--- ui/base/test/skia_gold_pixel_diff.cc.orig 2023-01-17 19:19:00 UTC +++ ui/base/test/skia_gold_pixel_diff.cc -@@ -142,7 +142,7 @@ std::string SkiaGoldPixelDiff::GetPlatform() { +@@ -151,7 +151,7 @@ std::string SkiaGoldPixelDiff::GetPlatform() { return "macOS"; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-ui_base_ui__base__features.cc b/www/iridium/files/patch-ui_base_ui__base__features.cc index 854b9ba6be409..6f1ab68ddd96a 100644 --- a/www/iridium/files/patch-ui_base_ui__base__features.cc +++ b/www/iridium/files/patch-ui_base_ui__base__features.cc @@ -1,4 +1,4 @@ ---- ui/base/ui_base_features.cc.orig 2022-12-06 08:09:13 UTC +--- ui/base/ui_base_features.cc.orig 2023-01-17 19:19:00 UTC +++ ui/base/ui_base_features.cc @@ -205,7 +205,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -310,7 +310,7 @@ bool IsForcedColorsEnabled() { +@@ -307,7 +307,7 @@ bool IsForcedColorsEnabled() { // milestones. BASE_FEATURE(kEyeDropper, "EyeDropper", diff --git a/www/iridium/files/patch-ui_base_x_x11__cursor__factory.cc b/www/iridium/files/patch-ui_base_x_x11__cursor__factory.cc index 4be37c769842e..c93511c6adfd3 100644 --- a/www/iridium/files/patch-ui_base_x_x11__cursor__factory.cc +++ b/www/iridium/files/patch-ui_base_x_x11__cursor__factory.cc @@ -1,6 +1,15 @@ ---- ui/base/x/x11_cursor_factory.cc.orig 2022-10-05 07:34:01 UTC +--- ui/base/x/x11_cursor_factory.cc.orig 2023-01-17 19:19:00 UTC +++ ui/base/x/x11_cursor_factory.cc -@@ -56,7 +56,7 @@ scoped_refptr X11CursorFactory::Create +@@ -13,7 +13,7 @@ + #include "ui/gfx/geometry/point.h" + #include "ui/gfx/x/connection.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #endif + +@@ -60,7 +60,7 @@ scoped_refptr X11CursorFactory::Create } void X11CursorFactory::ObserveThemeChanges() { diff --git a/www/iridium/files/patch-ui_base_x_x11__cursor__factory.h b/www/iridium/files/patch-ui_base_x_x11__cursor__factory.h index a9952606fd0e4..f00d129ee58be 100644 --- a/www/iridium/files/patch-ui_base_x_x11__cursor__factory.h +++ b/www/iridium/files/patch-ui_base_x_x11__cursor__factory.h @@ -1,12 +1,12 @@ ---- ui/base/x/x11_cursor_factory.h.orig 2022-10-05 07:34:01 UTC +--- ui/base/x/x11_cursor_factory.h.orig 2023-01-17 19:19:00 UTC +++ ui/base/x/x11_cursor_factory.h -@@ -16,7 +16,7 @@ - #include "ui/base/cursor/mojom/cursor_type.mojom-shared.h" - #include "ui/linux/cursor_theme_manager_observer.h" +@@ -20,7 +20,7 @@ namespace ui { + class X11Cursor; + class XCursorLoader; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/linux/linux_ui.h" + class LinuxUi; #endif @@ -59,7 +59,7 @@ class COMPONENT_EXPORT(UI_BASE_X) X11CursorFactory @@ -15,6 +15,6 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::ScopedObservation + cursor_theme_observation_{this}; + #endif diff --git a/www/iridium/files/patch-ui_color_color__id.h b/www/iridium/files/patch-ui_color_color__id.h index 510661e4cfb57..9de9a94ef73cd 100644 --- a/www/iridium/files/patch-ui_color_color__id.h +++ b/www/iridium/files/patch-ui_color_color__id.h @@ -1,6 +1,6 @@ ---- ui/color/color_id.h.orig 2022-12-06 08:09:13 UTC +--- ui/color/color_id.h.orig 2023-01-17 19:19:00 UTC +++ ui/color/color_id.h -@@ -351,7 +351,7 @@ +@@ -364,7 +364,7 @@ E_CPONLY(kColorNativeColor6) \ E_CPONLY(kColorNativeBaseColor) \ E_CPONLY(kColorNativeSecondaryColor) diff --git a/www/iridium/files/patch-ui_color_color__provider__utils.cc b/www/iridium/files/patch-ui_color_color__provider__utils.cc index 42099a1202bd6..3c0f244a780b4 100644 --- a/www/iridium/files/patch-ui_color_color__provider__utils.cc +++ b/www/iridium/files/patch-ui_color_color__provider__utils.cc @@ -1,6 +1,6 @@ ---- ui/color/color_provider_utils.cc.orig 2022-12-01 10:35:46 UTC +--- ui/color/color_provider_utils.cc.orig 2023-01-17 19:19:00 UTC +++ ui/color/color_provider_utils.cc -@@ -88,7 +88,7 @@ base::StringPiece SystemThemeName(ui::SystemTheme syst +@@ -103,7 +103,7 @@ base::StringPiece SystemThemeName(ui::SystemTheme syst switch (system_theme) { case ui::SystemTheme::kDefault: return "kDefault"; diff --git a/www/iridium/files/patch-ui_compositor_compositor.cc b/www/iridium/files/patch-ui_compositor_compositor.cc index 75246220030cf..e9a8d252987d7 100644 --- a/www/iridium/files/patch-ui_compositor_compositor.cc +++ b/www/iridium/files/patch-ui_compositor_compositor.cc @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.cc.orig 2022-12-06 08:09:13 UTC +--- ui/compositor/compositor.cc.orig 2023-01-17 19:19:00 UTC +++ ui/compositor/compositor.cc -@@ -868,7 +868,7 @@ void Compositor::OnResume() { +@@ -864,7 +864,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/iridium/files/patch-ui_compositor_compositor.h b/www/iridium/files/patch-ui_compositor_compositor.h index f45f8f010a230..6bfdc43837128 100644 --- a/www/iridium/files/patch-ui_compositor_compositor.h +++ b/www/iridium/files/patch-ui_compositor_compositor.h @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.h.orig 2022-12-06 08:09:13 UTC +--- ui/compositor/compositor.h.orig 2023-01-17 19:19:00 UTC +++ ui/compositor/compositor.h -@@ -420,7 +420,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe +@@ -430,7 +430,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/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc b/www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc index bfee2e6fd8548..032d2ae22c24d 100644 --- a/www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc +++ b/www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc @@ -1,6 +1,6 @@ ---- ui/events/devices/x11/device_data_manager_x11.cc.orig 2022-03-28 18:11:04 UTC +--- ui/events/devices/x11/device_data_manager_x11.cc.orig 2023-01-17 19:19:00 UTC +++ ui/events/devices/x11/device_data_manager_x11.cc -@@ -874,6 +874,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK +@@ -875,6 +875,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK } void DeviceDataManagerX11::DisableDevice(x11::Input::DeviceId deviceid) { diff --git a/www/iridium/files/patch-ui_events_event.cc b/www/iridium/files/patch-ui_events_event.cc index c65240dc21e18..a6d9e096a5b08 100644 --- a/www/iridium/files/patch-ui_events_event.cc +++ b/www/iridium/files/patch-ui_events_event.cc @@ -1,4 +1,4 @@ ---- ui/events/event.cc.orig 2022-12-06 08:09:13 UTC +--- ui/events/event.cc.orig 2023-01-17 19:19:00 UTC +++ ui/events/event.cc @@ -419,7 +419,7 @@ std::string LocatedEvent::ToString() const { MouseEvent::MouseEvent(const PlatformEvent& native_event) @@ -9,7 +9,16 @@ movement_(GetMouseMovementFromNative(native_event)), #endif pointer_details_(GetMousePointerDetailsFromNative(native_event)) { -@@ -918,7 +918,7 @@ void KeyEvent::InitializeNative() { +@@ -674,7 +674,7 @@ std::unique_ptr MouseWheelEvent::Clone() const + return std::make_unique(*this); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // This value matches Windows, Fuchsia WHEEL_DELTA, and (roughly) Firefox on + // Linux. + // static +@@ -923,7 +923,7 @@ void KeyEvent::InitializeNative() { if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent())) set_flags(flags() | EF_IS_REPEAT); diff --git a/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h index a4e94eda10ce8..3e63db984e577 100644 --- a/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h +++ b/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h @@ -1,11 +1,11 @@ ---- ui/gfx/gpu_memory_buffer.h.orig 2022-10-05 07:34:01 UTC +--- ui/gfx/gpu_memory_buffer.h.orig 2023-01-17 19:19:00 UTC +++ ui/gfx/gpu_memory_buffer.h @@ -15,7 +15,7 @@ #include "ui/gfx/geometry/rect.h" #include "ui/gfx/gfx_export.h" --#if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "ui/gfx/native_pixmap_handle.h" #elif BUILDFLAG(IS_MAC) #include "ui/gfx/mac/io_surface.h" diff --git a/www/iridium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc b/www/iridium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc index e1713fb2f6ee4..5407e58f8d99b 100644 --- a/www/iridium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc +++ b/www/iridium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc @@ -1,11 +1,11 @@ ---- ui/gfx/mojom/buffer_types_mojom_traits.cc.orig 2022-10-05 07:34:01 UTC +--- ui/gfx/mojom/buffer_types_mojom_traits.cc.orig 2023-01-17 19:19:00 UTC +++ ui/gfx/mojom/buffer_types_mojom_traits.cc @@ -33,7 +33,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle( std::move(handle.region)); case gfx::NATIVE_PIXMAP: --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle( std::move(handle.native_pixmap_handle)); #else @@ -13,8 +13,8 @@ out->type = gfx::SHARED_MEMORY_BUFFER; out->region = std::move(platform_handle->get_shared_memory_handle()); return true; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) case gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag:: kNativePixmapHandle: out->type = gfx::NATIVE_PIXMAP; diff --git a/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc b/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc index 6e37eece2594e..30cd811217546 100644 --- a/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc +++ b/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc @@ -1,11 +1,11 @@ ---- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig 2022-10-05 07:34:01 UTC +--- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig 2023-01-17 19:19:00 UTC +++ ui/gfx/mojom/native_handle_types_mojom_traits.cc @@ -8,11 +8,11 @@ namespace mojo { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) mojo::PlatformHandle StructTraits< gfx::mojom::NativePixmapPlaneDataView, gfx::NativePixmapPlane>::buffer_handle(gfx::NativePixmapPlane& plane) { @@ -23,7 +23,7 @@ if (!handle.is_fd()) return false; out->fd = handle.TakeFD(); -@@ -45,7 +45,7 @@ bool StructTraits< +@@ -54,7 +54,7 @@ bool StructTraits< gfx::mojom::NativePixmapHandleDataView, gfx::NativePixmapHandle>::Read(gfx::mojom::NativePixmapHandleDataView data, gfx::NativePixmapHandle* out) { diff --git a/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h b/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h index 91f01e782cd6c..3be3c9181590f 100644 --- a/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h +++ b/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h @@ -1,11 +1,11 @@ ---- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2022-10-05 07:34:01 UTC +--- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2023-01-17 19:19:00 UTC +++ ui/gfx/mojom/native_handle_types_mojom_traits.h @@ -15,7 +15,7 @@ #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/gfx/mojom/native_handle_types.mojom-shared.h" --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) #include "ui/gfx/native_pixmap_handle.h" #endif @@ -13,8 +13,8 @@ namespace mojo { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD) template <> struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED_MOJOM_TRAITS) StructTraits planes; diff --git a/www/iridium/files/patch-ui_gfx_switches.cc b/www/iridium/files/patch-ui_gfx_switches.cc index 7e88a5102ca6c..8f0b797f20ce7 100644 --- a/www/iridium/files/patch-ui_gfx_switches.cc +++ b/www/iridium/files/patch-ui_gfx_switches.cc @@ -1,6 +1,6 @@ ---- ui/gfx/switches.cc.orig 2022-03-28 18:11:04 UTC +--- ui/gfx/switches.cc.orig 2023-01-17 19:19:00 UTC +++ ui/gfx/switches.cc -@@ -26,7 +26,7 @@ const char kForcePrefersReducedMotion[] = "force-prefe +@@ -33,7 +33,7 @@ const char kForcePrefersReducedMotion[] = "force-prefe // Run in headless mode, i.e., without a UI or display server dependencies. const char kHeadless[] = "headless"; diff --git a/www/iridium/files/patch-ui_gfx_switches.h b/www/iridium/files/patch-ui_gfx_switches.h index 8c72b6c6cad93..95d89416e9865 100644 --- a/www/iridium/files/patch-ui_gfx_switches.h +++ b/www/iridium/files/patch-ui_gfx_switches.h @@ -1,6 +1,6 @@ ---- ui/gfx/switches.h.orig 2022-03-28 18:11:04 UTC +--- ui/gfx/switches.h.orig 2023-01-17 19:19:00 UTC +++ ui/gfx/switches.h -@@ -17,7 +17,7 @@ GFX_SWITCHES_EXPORT extern const char kEnableNativeGpu +@@ -18,7 +18,7 @@ GFX_SWITCHES_EXPORT extern const char kEnableNativeGpu GFX_SWITCHES_EXPORT extern const char kForcePrefersReducedMotion[]; GFX_SWITCHES_EXPORT extern const char kHeadless[]; diff --git a/www/iridium/files/patch-ui_gl_BUILD.gn b/www/iridium/files/patch-ui_gl_BUILD.gn index 0a40480180e99..e865308b3652f 100644 --- a/www/iridium/files/patch-ui_gl_BUILD.gn +++ b/www/iridium/files/patch-ui_gl_BUILD.gn @@ -1,4 +1,4 @@ ---- ui/gl/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- ui/gl/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ ui/gl/BUILD.gn @@ -166,8 +166,6 @@ component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] @@ -17,15 +17,15 @@ "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -416,7 +413,6 @@ component("gl") { +@@ -419,7 +416,6 @@ component("gl") { + data_deps += [ + "//third_party/angle:libEGL", + "//third_party/angle:libGLESv2", +- "//third_party/mesa_headers", + ] + if (enable_swiftshader) { data_deps += [ - "//third_party/angle:libEGL", - "//third_party/angle:libGLESv2", -- "//third_party/mesa_headers", - ] - if (enable_swiftshader) { - data_deps += [ -@@ -638,7 +634,6 @@ test("gl_unittests") { +@@ -639,7 +635,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", diff --git a/www/iridium/files/patch-ui_gl_generate__bindings.py b/www/iridium/files/patch-ui_gl_generate__bindings.py index b16dfa787bfdf..6e6b737bbb3a2 100644 --- a/www/iridium/files/patch-ui_gl_generate__bindings.py +++ b/www/iridium/files/patch-ui_gl_generate__bindings.py @@ -1,6 +1,6 @@ ---- ui/gl/generate_bindings.py.orig 2022-12-06 08:09:13 UTC +--- ui/gl/generate_bindings.py.orig 2023-01-17 19:19:00 UTC +++ ui/gl/generate_bindings.py -@@ -2934,6 +2934,9 @@ GLX_FUNCTIONS = [ +@@ -2971,6 +2971,9 @@ GLX_FUNCTIONS = [ 'arguments': 'Display* dpy, GLXDrawable drawable, int32_t* numerator, ' 'int32_t* denominator' }, diff --git a/www/iridium/files/patch-ui_gl_gl__features.cc b/www/iridium/files/patch-ui_gl_gl__features.cc deleted file mode 100644 index 103e156802627..0000000000000 --- a/www/iridium/files/patch-ui_gl_gl__features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/gl/gl_features.cc.orig 2022-12-06 08:09:13 UTC -+++ ui/gl/gl_features.cc -@@ -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 - #else - base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/iridium/files/patch-ui_gl_gl__features.h b/www/iridium/files/patch-ui_gl_gl__features.h new file mode 100644 index 0000000000000..02483acd311f0 --- /dev/null +++ b/www/iridium/files/patch-ui_gl_gl__features.h @@ -0,0 +1,11 @@ +--- ui/gl/gl_features.h.orig 2023-01-17 19:19:00 UTC ++++ ui/gl/gl_features.h +@@ -23,7 +23,7 @@ GL_EXPORT BASE_DECLARE_FEATURE(kAndroidFrameDeadline); + + #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) + #define PASSTHROUGH_COMMAND_DECODER_LAUNCHED + #else + // All features in alphabetical order. The features should be documented diff --git a/www/iridium/files/patch-ui_gl_gl__switches.cc b/www/iridium/files/patch-ui_gl_gl__switches.cc index c85effdb6e763..9af232c252726 100644 --- a/www/iridium/files/patch-ui_gl_gl__switches.cc +++ b/www/iridium/files/patch-ui_gl_gl__switches.cc @@ -1,4 +1,4 @@ ---- ui/gl/gl_switches.cc.orig 2022-12-06 08:09:13 UTC +--- ui/gl/gl_switches.cc.orig 2023-01-17 19:19:00 UTC +++ ui/gl/gl_switches.cc @@ -11,7 +11,7 @@ #include "base/android/build_info.h" @@ -9,7 +9,7 @@ #include #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck #endif -@@ -282,7 +282,7 @@ bool IsDefaultANGLEVulkan() { +@@ -290,7 +290,7 @@ bool IsDefaultANGLEVulkan() { base::android::SDK_VERSION_Q) return false; #endif // BUILDFLAG(IS_ANDROID) diff --git a/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc b/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc index 2f1d7a1c7f8e3..2912f77482b0b 100644 --- a/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc +++ b/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc @@ -1,6 +1,6 @@ ---- ui/gtk/printing/print_dialog_gtk.cc.orig 2022-12-06 08:09:13 UTC +--- ui/gtk/printing/print_dialog_gtk.cc.orig 2023-01-17 19:19:00 UTC +++ ui/gtk/printing/print_dialog_gtk.cc -@@ -400,7 +400,7 @@ void PrintDialogGtk::ShowDialog( +@@ -402,7 +402,7 @@ void PrintDialogGtk::ShowDialog( GtkPrintCapabilities cap = static_cast( GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET | GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | diff --git a/www/iridium/files/patch-ui_native__theme_native__theme__base.cc b/www/iridium/files/patch-ui_native__theme_native__theme__base.cc index 8cf2c89257247..c3a593a2a7170 100644 --- a/www/iridium/files/patch-ui_native__theme_native__theme__base.cc +++ b/www/iridium/files/patch-ui_native__theme_native__theme__base.cc @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme_base.cc.orig 2022-03-28 18:11:04 UTC +--- ui/native_theme/native_theme_base.cc.orig 2023-01-17 19:19:00 UTC +++ ui/native_theme/native_theme_base.cc -@@ -269,7 +269,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -272,7 +272,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, break; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb index 5929fcd530fd7..b88350b8301fe 100644 --- a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb +++ b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb @@ -1,4 +1,4 @@ ---- ui/strings/translations/app_locale_settings_zh-TW.xtb.orig 2022-10-05 07:34:01 UTC +--- ui/strings/translations/app_locale_settings_zh-TW.xtb.orig 2023-01-17 19:19:00 UTC +++ ui/strings/translations/app_locale_settings_zh-TW.xtb @@ -12,7 +12,7 @@ @@ -6,6 +6,6 @@ - + - Noto Sans CJK SC, WenQuanYi Zen Hei, sans-serif + Noto Sans CJK TC, WenQuanYi Zen Hei, sans-serif diff --git a/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc b/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc index 026d445a7b544..75a8b1ccb0c52 100644 --- a/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,4 +1,4 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2022-12-01 10:35:46 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2023-01-17 19:19:00 UTC +++ ui/views/controls/textfield/textfield.cc @@ -71,7 +71,7 @@ #include "base/win/win_util.h" @@ -18,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -707,7 +707,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -706,7 +706,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -27,7 +27,7 @@ auto* linux_ui = ui::LinuxUi::instance(); std::vector commands; if (!handled && linux_ui && -@@ -851,7 +851,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -850,7 +850,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -36,7 +36,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. auto* linux_ui = ui::LinuxUi::instance(); std::vector commands; -@@ -1721,7 +1721,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1720,7 +1720,7 @@ bool Textfield::ShouldDoLearning() { return false; } @@ -45,7 +45,7 @@ // TODO(https://crbug.com/952355): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2220,14 +2220,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2231,14 +2231,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } diff --git a/www/iridium/files/patch-ui_views_examples_widget__example.cc b/www/iridium/files/patch-ui_views_examples_widget__example.cc index 7dbd15dbfb321..621606db9509e 100644 --- a/www/iridium/files/patch-ui_views_examples_widget__example.cc +++ b/www/iridium/files/patch-ui_views_examples_widget__example.cc @@ -1,6 +1,6 @@ ---- ui/views/examples/widget_example.cc.orig 2022-10-05 07:34:01 UTC +--- ui/views/examples/widget_example.cc.orig 2023-01-17 19:19:00 UTC +++ ui/views/examples/widget_example.cc -@@ -50,7 +50,7 @@ void WidgetExample::CreateExampleView(View* container) +@@ -49,7 +49,7 @@ void WidgetExample::CreateExampleView(View* container) modal_button->SetCallback( base::BindRepeating(&WidgetExample::CreateDialogWidget, base::Unretained(this), modal_button, true)); diff --git a/www/iridium/files/patch-ui_views_focus_focus__manager.cc b/www/iridium/files/patch-ui_views_focus_focus__manager.cc index fec2e3a224766..9b40364b5fc91 100644 --- a/www/iridium/files/patch-ui_views_focus_focus__manager.cc +++ b/www/iridium/files/patch-ui_views_focus_focus__manager.cc @@ -1,6 +1,6 @@ ---- ui/views/focus/focus_manager.cc.orig 2022-12-06 08:09:13 UTC +--- ui/views/focus/focus_manager.cc.orig 2023-01-17 19:19:00 UTC +++ ui/views/focus/focus_manager.cc -@@ -622,7 +622,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -625,7 +625,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 -@@ -639,7 +639,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -642,7 +642,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/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc new file mode 100644 index 0000000000000..e8ae68288c8f5 --- /dev/null +++ b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc @@ -0,0 +1,11 @@ +--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2023-01-17 19:19:00 UTC ++++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc +@@ -194,7 +194,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd + return drag_operation_; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void DesktopDragDropClientOzone::UpdateDragImage(const gfx::ImageSkia& image, + const gfx::Vector2d& offset) { + DCHECK(drag_handler_); diff --git a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h index b19287b755140..55aca1cc7bbec 100644 --- a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h +++ b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig 2022-10-05 07:34:01 UTC +--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig 2023-01-17 19:19:00 UTC +++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h -@@ -68,7 +68,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone +@@ -66,7 +66,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone // The offset of |drag_widget_| relative to the mouse position. gfx::Vector2d offset; @@ -9,3 +9,12 @@ // The last received drag location. The drag widget is moved asynchronously // so its position is updated when the UI thread has time for that. When // the first change to the location happens, a call to UpdateDragWidget() +@@ -87,7 +87,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone + const gfx::Point& root_location, + int allowed_operations, + ui::mojom::DragEventSource source) override; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void UpdateDragImage(const gfx::ImageSkia& image, + const gfx::Vector2d& offset) override; + #endif diff --git a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index 7d6f7fcce1997..2b486af7d68cf 100644 --- a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,4 +1,4 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2022-12-06 08:09:13 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2023-01-17 19:19:00 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc @@ -41,7 +41,7 @@ #include "ui/wm/core/window_util.h" @@ -27,7 +27,7 @@ std::make_unique(window(), drag_handler); #else std::make_unique(window(), drag_handler); -@@ -1017,7 +1017,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis +@@ -1018,7 +1018,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/iridium/files/patch-ui_views_widget_widget.cc b/www/iridium/files/patch-ui_views_widget_widget.cc index 16bd09025e8f3..c8eb262a5ee74 100644 --- a/www/iridium/files/patch-ui_views_widget_widget.cc +++ b/www/iridium/files/patch-ui_views_widget_widget.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/widget.cc.orig 2022-12-06 08:09:13 UTC +--- ui/views/widget/widget.cc.orig 2023-01-17 19:19:00 UTC +++ ui/views/widget/widget.cc -@@ -50,7 +50,7 @@ +@@ -52,7 +52,7 @@ #include "ui/views/window/custom_frame_view.h" #include "ui/views/window/dialog_delegate.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -1871,7 +1871,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -1991,7 +1991,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const if (parent_) return parent_->GetNativeTheme(); diff --git a/www/iridium/files/patch-ui_views_widget_widget.h b/www/iridium/files/patch-ui_views_widget_widget.h index 9e5095a899d96..97b18cff54b81 100644 --- a/www/iridium/files/patch-ui_views_widget_widget.h +++ b/www/iridium/files/patch-ui_views_widget_widget.h @@ -1,6 +1,6 @@ ---- ui/views/widget/widget.h.orig 2022-12-01 10:35:46 UTC +--- ui/views/widget/widget.h.orig 2023-01-17 19:19:00 UTC +++ ui/views/widget/widget.h -@@ -402,7 +402,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid +@@ -408,7 +408,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid // If set, the widget was created in headless mode. bool headless_mode = false; diff --git a/www/iridium/files/patch-v8_BUILD.gn b/www/iridium/files/patch-v8_BUILD.gn index 2fd93fc5ddc2b..14c851a41358d 100644 --- a/www/iridium/files/patch-v8_BUILD.gn +++ b/www/iridium/files/patch-v8_BUILD.gn @@ -1,4 +1,4 @@ ---- v8/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- v8/BUILD.gn.orig 2023-01-17 19:19:00 UTC +++ v8/BUILD.gn @@ -1242,6 +1242,14 @@ config("toolchain") { } else if (target_os == "win") { @@ -15,7 +15,7 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -5481,7 +5489,7 @@ v8_component("v8_libbase") { +@@ -5500,7 +5508,7 @@ v8_component("v8_libbase") { } } @@ -24,7 +24,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -5492,6 +5500,18 @@ v8_component("v8_libbase") { +@@ -5511,6 +5519,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/iridium/files/patch-v8_src_api_api.cc b/www/iridium/files/patch-v8_src_api_api.cc index 29e5fb405847b..23bb6858a87d6 100644 --- a/www/iridium/files/patch-v8_src_api_api.cc +++ b/www/iridium/files/patch-v8_src_api_api.cc @@ -1,6 +1,6 @@ ---- v8/src/api/api.cc.orig 2022-12-06 08:09:13 UTC +--- v8/src/api/api.cc.orig 2023-01-17 19:19:00 UTC +++ v8/src/api/api.cc -@@ -140,7 +140,7 @@ +@@ -141,7 +141,7 @@ #include "src/wasm/wasm-serialization.h" #endif // V8_ENABLE_WEBASSEMBLY @@ -9,7 +9,7 @@ #include #if V8_ENABLE_WEBASSEMBLY -@@ -6206,7 +6206,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6210,7 +6210,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/iridium/files/patch-v8_src_flags_flags.cc b/www/iridium/files/patch-v8_src_flags_flags.cc new file mode 100644 index 0000000000000..853da2a1837ea --- /dev/null +++ b/www/iridium/files/patch-v8_src_flags_flags.cc @@ -0,0 +1,26 @@ +--- v8/src/flags/flags.cc.orig 2023-01-17 19:19:00 UTC ++++ v8/src/flags/flags.cc +@@ -31,7 +31,12 @@ + namespace v8::internal { + + // Define {v8_flags}, declared in flags.h. ++#if V8_OS_OPENBSD ++#include ++FlagValues v8_flags __attribute__((section(".openbsd.mutable"))); ++#else + FlagValues v8_flags; ++#endif + + // {v8_flags} needs to be aligned to a memory page, and the size needs to be a + // multiple of a page size. This is required for memory-protection of the memory +@@ -787,6 +792,10 @@ void FlagList::FreezeFlags() { + // Note that for string flags we only protect the pointer itself, but not the + // string storage. TODO(12887): Fix this. + base::OS::SetDataReadOnly(&v8_flags, sizeof(v8_flags)); ++#if V8_OS_OPENBSD ++ if (mimmutable(&v8_flags, sizeof(v8_flags)) == -1) ++ FATAL("unable to set immutability of v8_flags"); ++#endif + } + + // static diff --git a/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc b/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc index 2e77648094dbb..f81a0ec7dca12 100644 --- a/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc +++ b/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc @@ -1,6 +1,6 @@ ---- v8/src/trap-handler/handler-inside-posix.cc.orig 2022-03-28 18:11:04 UTC +--- v8/src/trap-handler/handler-inside-posix.cc.orig 2023-01-17 19:19:00 UTC +++ v8/src/trap-handler/handler-inside-posix.cc -@@ -53,6 +53,8 @@ namespace trap_handler { +@@ -55,6 +55,8 @@ namespace trap_handler { #define CONTEXT_REG(reg, REG) &uc->uc_mcontext->__ss.__##reg #elif V8_OS_FREEBSD #define CONTEXT_REG(reg, REG) &uc->uc_mcontext.mc_##reg @@ -9,7 +9,7 @@ #else #error "Unsupported platform." #endif -@@ -62,8 +64,12 @@ bool IsKernelGeneratedSignal(siginfo_t* info) { +@@ -64,8 +66,12 @@ bool IsKernelGeneratedSignal(siginfo_t* info) { // si_code at its default of 0 for signals that don’t originate in hardware. // The other conditions are only relevant for Linux. return info->si_code > 0 && info->si_code != SI_USER && diff --git a/www/iridium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h b/www/iridium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h index 27a58aacf9b66..380e09819ad10 100644 --- a/www/iridium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h +++ b/www/iridium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h @@ -1,6 +1,6 @@ ---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2022-12-01 10:35:46 UTC +--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2023-01-17 19:19:00 UTC +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h -@@ -432,7 +432,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst +@@ -448,7 +448,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst } void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr, @@ -9,7 +9,7 @@ LoadType type, uint32_t* protected_load_pc, bool /* is_load_mem */, bool i64_offset, bool needs_shift) { -@@ -512,7 +512,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis +@@ -528,7 +528,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis } void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, @@ -18,7 +18,7 @@ StoreType type, LiftoffRegList pinned, uint32_t* protected_store_pc, bool /* is_store_mem */, bool /* i64_offset */) { -@@ -581,7 +581,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist +@@ -597,7 +597,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist } void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr, @@ -27,7 +27,7 @@ LoadType type, LiftoffRegList /* pinned */) { if (type.value() != LoadType::kI64Load) { Load(dst, src_addr, offset_reg, offset_imm, type, nullptr, true); -@@ -600,7 +600,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, +@@ -616,7 +616,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, } void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg, @@ -36,7 +36,7 @@ StoreType type, LiftoffRegList pinned) { DCHECK_NE(offset_reg, no_reg); DCHECK_LE(offset_imm, std::numeric_limits::max()); -@@ -940,7 +940,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino +@@ -956,7 +956,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino } // namespace liftoff void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg, @@ -45,7 +45,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kAdd, dst_addr, offset_reg, -@@ -953,7 +953,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re +@@ -969,7 +969,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re } void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg, @@ -54,7 +54,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kSub, dst_addr, offset_reg, -@@ -965,7 +965,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re +@@ -981,7 +981,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re } void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg, @@ -63,7 +63,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kAnd, dst_addr, offset_reg, -@@ -978,7 +978,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re +@@ -994,7 +994,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re } void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg, @@ -72,7 +72,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kOr, dst_addr, offset_reg, offset_imm, -@@ -991,7 +991,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg +@@ -1007,7 +1007,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg } void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg, @@ -81,7 +81,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kXor, dst_addr, offset_reg, -@@ -1004,7 +1004,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re +@@ -1020,7 +1020,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re } void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg, @@ -90,7 +90,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { -@@ -1018,7 +1018,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add +@@ -1034,7 +1034,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add } void LiftoffAssembler::AtomicCompareExchange( diff --git a/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.cc b/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.cc index bad09e654521e..4fa19220d7996 100644 --- a/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.cc +++ b/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.cc @@ -1,6 +1,6 @@ ---- weblayer/browser/content_browser_client_impl.cc.orig 2022-10-05 07:34:01 UTC +--- weblayer/browser/content_browser_client_impl.cc.orig 2023-01-17 19:19:00 UTC +++ weblayer/browser/content_browser_client_impl.cc -@@ -156,7 +156,7 @@ +@@ -155,7 +155,7 @@ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ @@ -9,7 +9,7 @@ #include "content/public/common/content_descriptors.h" #endif -@@ -1010,7 +1010,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe +@@ -1004,7 +1004,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.h b/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.h index 63cc672b5171f..964f8c03ec722 100644 --- a/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.h +++ b/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.h @@ -1,6 +1,6 @@ ---- weblayer/browser/content_browser_client_impl.h.orig 2022-04-01 07:48:30 UTC +--- weblayer/browser/content_browser_client_impl.h.orig 2023-01-17 19:19:00 UTC +++ weblayer/browser/content_browser_client_impl.h -@@ -179,7 +179,7 @@ class ContentBrowserClientImpl : public content::Conte +@@ -177,7 +177,7 @@ class ContentBrowserClientImpl : public content::Conte // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \